diff --git a/runescape-client/src/main/java/AbstractArchive.java b/runescape-client/src/main/java/AbstractArchive.java index deffc52d5d..eb39e3c974 100644 --- a/runescape-client/src/main/java/AbstractArchive.java +++ b/runescape-client/src/main/java/AbstractArchive.java @@ -83,14 +83,14 @@ public abstract class AbstractArchive { boolean shallowFiles; static { - gzipDecompressor = new GZipDecompressor(); // L: 23 - field3843 = 0; // L: 27 + gzipDecompressor = new GZipDecompressor(); + field3843 = 0; } AbstractArchive(boolean var1, boolean var2) { - this.releaseGroups = var1; // L: 32 - this.shallowFiles = var2; // L: 33 - } // L: 34 + this.releaseGroups = var1; + this.shallowFiles = var2; + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -99,7 +99,7 @@ public abstract class AbstractArchive { ) @Export("loadRegionFromGroup") void loadRegionFromGroup(int var1) { - } // L: 123 + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -108,7 +108,7 @@ public abstract class AbstractArchive { ) @Export("loadGroup") void loadGroup(int var1) { - } // L: 209 + } @ObfuscatedName("n") @ObfuscatedSignature( @@ -117,7 +117,7 @@ public abstract class AbstractArchive { ) @Export("groupLoadPercent") int groupLoadPercent(int var1) { - return this.groups[var1] != null ? 100 : 0; // L: 179 180 + return this.groups[var1] != null ? 100 : 0; } @ObfuscatedName("aq") @@ -127,68 +127,68 @@ public abstract class AbstractArchive { ) @Export("decodeIndex") void decodeIndex(byte[] var1) { - int var3 = var1.length; // L: 38 - int var2 = Friend.method6298(var1, 0, var3); // L: 40 - this.hash = var2; // L: 42 - Buffer var4 = new Buffer(ViewportMouse.decompressBytes(var1)); // L: 43 - int var5 = var4.readUnsignedByte(); // L: 44 - if (var5 >= 5 && var5 <= 7) { // L: 45 - if (var5 >= 6) { // L: 46 - var4.readInt(); // L: 47 + int var3 = var1.length; + int var2 = Friend.method6298(var1, 0, var3); + this.hash = var2; + Buffer var4 = new Buffer(ViewportMouse.decompressBytes(var1)); + int var5 = var4.readUnsignedByte(); + if (var5 >= 5 && var5 <= 7) { + if (var5 >= 6) { + var4.readInt(); } - int var6 = var4.readUnsignedByte(); // L: 50 - if (var5 >= 7) { // L: 51 + int var6 = var4.readUnsignedByte(); + if (var5 >= 7) { this.groupCount = var4.method7561(); } else { - this.groupCount = var4.readUnsignedShort(); // L: 52 + this.groupCount = var4.readUnsignedShort(); } - int var7 = 0; // L: 53 - int var8 = -1; // L: 54 - this.groupIds = new int[this.groupCount]; // L: 55 + int var7 = 0; + int var8 = -1; + this.groupIds = new int[this.groupCount]; int var9; - if (var5 >= 7) { // L: 56 - for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 57 - this.groupIds[var9] = var7 += var4.method7561(); // L: 58 - if (this.groupIds[var9] > var8) { // L: 59 + if (var5 >= 7) { + for (var9 = 0; var9 < this.groupCount; ++var9) { + this.groupIds[var9] = var7 += var4.method7561(); + if (this.groupIds[var9] > var8) { var8 = this.groupIds[var9]; } } } else { - for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 63 - this.groupIds[var9] = var7 += var4.readUnsignedShort(); // L: 64 - if (this.groupIds[var9] > var8) { // L: 65 + for (var9 = 0; var9 < this.groupCount; ++var9) { + this.groupIds[var9] = var7 += var4.readUnsignedShort(); + if (this.groupIds[var9] > var8) { var8 = this.groupIds[var9]; } } } - this.groupCrcs = new int[var8 + 1]; // 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 + this.groupCrcs = new int[var8 + 1]; + this.groupVersions = new int[var8 + 1]; + this.fileCounts = new int[var8 + 1]; + this.fileIds = new int[var8 + 1][]; + this.groups = new Object[var8 + 1]; + this.files = new Object[var8 + 1][]; + if (var6 != 0) { + this.groupNameHashes = new int[var8 + 1]; - for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 76 + for (var9 = 0; var9 < this.groupCount; ++var9) { this.groupNameHashes[this.groupIds[var9]] = var4.readInt(); } - this.groupNameHashTable = new IntHashTable(this.groupNameHashes); // L: 77 + this.groupNameHashTable = new IntHashTable(this.groupNameHashes); } - for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 79 + for (var9 = 0; var9 < this.groupCount; ++var9) { this.groupCrcs[this.groupIds[var9]] = var4.readInt(); } - for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 80 + for (var9 = 0; var9 < this.groupCount; ++var9) { this.groupVersions[this.groupIds[var9]] = var4.readInt(); } - for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 81 + for (var9 = 0; var9 < this.groupCount; ++var9) { this.fileCounts[this.groupIds[var9]] = var4.readUnsignedShort(); } @@ -197,63 +197,63 @@ public abstract class AbstractArchive { 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 (var5 >= 7) { + for (var9 = 0; var9 < this.groupCount; ++var9) { + var10 = this.groupIds[var9]; + var11 = this.fileCounts[var10]; + var7 = 0; + var12 = -1; + this.fileIds[var10] = new int[var11]; - for (var13 = 0; var13 < var11; ++var13) { // L: 89 - var14 = this.fileIds[var10][var13] = var7 += var4.method7561(); // L: 90 - if (var14 > var12) { // L: 91 + for (var13 = 0; var13 < var11; ++var13) { + var14 = this.fileIds[var10][var13] = var7 += var4.method7561(); + if (var14 > var12) { var12 = var14; } } - this.files[var10] = new Object[var12 + 1]; // L: 93 + this.files[var10] = new Object[var12 + 1]; } } 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 (var9 = 0; var9 < this.groupCount; ++var9) { + var10 = this.groupIds[var9]; + var11 = this.fileCounts[var10]; + var7 = 0; + var12 = -1; + this.fileIds[var10] = new int[var11]; - for (var13 = 0; var13 < var11; ++var13) { // L: 103 - var14 = this.fileIds[var10][var13] = var7 += var4.readUnsignedShort(); // L: 104 - if (var14 > var12) { // L: 105 + for (var13 = 0; var13 < var11; ++var13) { + var14 = this.fileIds[var10][var13] = var7 += var4.readUnsignedShort(); + if (var14 > var12) { var12 = var14; } } - this.files[var10] = new Object[var12 + 1]; // L: 107 + this.files[var10] = new Object[var12 + 1]; } } - if (var6 != 0) { // L: 110 - this.fileNameHashes = new int[var8 + 1][]; // L: 111 - this.fileNameHashTables = new IntHashTable[var8 + 1]; // L: 112 + if (var6 != 0) { + this.fileNameHashes = new int[var8 + 1][]; + this.fileNameHashTables = new IntHashTable[var8 + 1]; - 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 (var9 = 0; var9 < this.groupCount; ++var9) { + var10 = this.groupIds[var9]; + var11 = this.fileCounts[var10]; + this.fileNameHashes[var10] = new int[this.files[var10].length]; - for (var12 = 0; var12 < var11; ++var12) { // L: 117 + for (var12 = 0; var12 < var11; ++var12) { this.fileNameHashes[var10][this.fileIds[var10][var12]] = var4.readInt(); } - this.fileNameHashTables[var10] = new IntHashTable(this.fileNameHashes[var10]); // L: 118 + this.fileNameHashTables[var10] = new IntHashTable(this.fileNameHashes[var10]); } } } else { throw new RuntimeException(""); } - } // L: 121 + } @ObfuscatedName("aw") @ObfuscatedSignature( @@ -262,7 +262,7 @@ public abstract class AbstractArchive { ) @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); } @ObfuscatedName("ay") @@ -272,24 +272,24 @@ public abstract class AbstractArchive { ) @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) { + if (this.files[var1][var2] == null) { + boolean var4 = this.buildFiles(var1, var3); + if (!var4) { + this.loadGroup(var1); + var4 = this.buildFiles(var1, var3); + if (!var4) { return null; } } } - byte[] var5 = GrandExchangeOfferOwnWorldComparator.method1147(this.files[var1][var2], false); // L: 139 + byte[] var5 = GrandExchangeOfferOwnWorldComparator.method1147(this.files[var1][var2], false); if (this.shallowFiles) { - this.files[var1][var2] = null; // L: 140 + this.files[var1][var2] = null; } - return var5; // L: 141 + return var5; } else { return null; } @@ -302,17 +302,17 @@ public abstract class AbstractArchive { ) @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) { // L: 146 + if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { + if (this.files[var1][var2] != null) { return true; - } else if (this.groups[var1] != null) { // L: 147 + } else if (this.groups[var1] != null) { return true; } else { - this.loadGroup(var1); // L: 148 - return this.groups[var1] != null; // L: 149 + this.loadGroup(var1); + return this.groups[var1] != null; } } else { - return false; // L: 150 + return false; } } @@ -322,12 +322,12 @@ public abstract class AbstractArchive { garbageValue = "-43" ) public boolean method5595(int var1) { - if (this.files.length == 1) { // L: 154 + if (this.files.length == 1) { return this.tryLoadFile(0, var1); } else if (this.files[var1].length == 1) { - return this.tryLoadFile(var1, 0); // L: 155 + return this.tryLoadFile(var1, 0); } else { - throw new RuntimeException(); // L: 156 + throw new RuntimeException(); } } @@ -338,11 +338,11 @@ public abstract class AbstractArchive { ) @Export("tryLoadGroup") public boolean tryLoadGroup(int var1) { - if (this.groups[var1] != null) { // L: 160 + if (this.groups[var1] != null) { return true; } else { - this.loadGroup(var1); // L: 161 - return this.groups[var1] != null; // L: 162 + this.loadGroup(var1); + return this.groups[var1] != null; } } @@ -353,19 +353,19 @@ public abstract class AbstractArchive { ) @Export("isFullyLoaded") public boolean isFullyLoaded() { - boolean var1 = true; // L: 167 + boolean var1 = true; - 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) { + int var3 = this.groupIds[var2]; + if (this.groups[var3] == null) { + this.loadGroup(var3); + if (this.groups[var3] == null) { var1 = false; } } } - return var1; // L: 175 + return var1; } @ObfuscatedName("bd") @@ -375,12 +375,12 @@ public abstract class AbstractArchive { ) @Export("takeFileFlat") public byte[] takeFileFlat(int var1) { - if (this.files.length == 1) { // L: 184 + if (this.files.length == 1) { return this.takeFile(0, var1); } else if (this.files[var1].length == 1) { - return this.takeFile(var1, 0); // L: 185 + return this.takeFile(var1, 0); } else { - throw new RuntimeException(); // L: 186 + throw new RuntimeException(); } } @@ -391,20 +391,20 @@ public abstract class AbstractArchive { ) @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) { + if (this.files[var1][var2] == null) { + boolean var3 = this.buildFiles(var1, (int[])null); + if (!var3) { + this.loadGroup(var1); + var3 = this.buildFiles(var1, (int[])null); + if (!var3) { return null; } } } - byte[] var4 = GrandExchangeOfferOwnWorldComparator.method1147(this.files[var1][var2], false); // L: 199 - return var4; // L: 200 + byte[] var4 = GrandExchangeOfferOwnWorldComparator.method1147(this.files[var1][var2], false); + return var4; } else { return null; } @@ -417,12 +417,12 @@ public abstract class AbstractArchive { ) @Export("getFileFlat") public byte[] getFileFlat(int var1) { - if (this.files.length == 1) { // L: 204 + if (this.files.length == 1) { return this.getFile(0, var1); } else if (this.files[var1].length == 1) { - return this.getFile(var1, 0); // L: 205 + return this.getFile(var1, 0); } else { - throw new RuntimeException(); // L: 206 + throw new RuntimeException(); } } @@ -433,7 +433,7 @@ public abstract class AbstractArchive { ) @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; } @ObfuscatedName("br") @@ -443,7 +443,7 @@ public abstract class AbstractArchive { ) @Export("getGroupFileCount") public int getGroupFileCount(int var1) { - return this.files[var1].length; // L: 219 + return this.files[var1].length; } @ObfuscatedName("bi") @@ -453,7 +453,7 @@ public abstract class AbstractArchive { ) @Export("getGroupCount") public int getGroupCount() { - return this.files.length; // L: 223 + return this.files.length; } @ObfuscatedName("bm") @@ -463,11 +463,11 @@ public abstract class AbstractArchive { ) @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) { this.groups[var1] = null; } - } // L: 228 + } @ObfuscatedName("bs") @ObfuscatedSignature( @@ -476,11 +476,11 @@ public abstract class AbstractArchive { ) @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) { this.files[var1][var2] = null; } - } // L: 232 + } @ObfuscatedName("bv") @ObfuscatedSignature( @@ -489,15 +489,15 @@ public abstract class AbstractArchive { ) @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) { + if (this.files[var1] != null) { + for (int var2 = 0; var2 < this.files[var1].length; ++var2) { this.files[var1][var2] = null; } } } - } // L: 240 + } @ObfuscatedName("bb") @ObfuscatedSignature( @@ -506,120 +506,120 @@ public abstract class AbstractArchive { ) @Export("buildFiles") boolean buildFiles(int var1, int[] var2) { - if (this.groups[var1] == null) { // L: 243 + if (this.groups[var1] == null) { 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]; + int[] var4 = this.fileIds[var1]; + Object[] var5 = this.files[var1]; + boolean var6 = true; - 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) { + if (var5[var4[var7]] == null) { + var6 = false; break; } } - if (var6) { // L: 254 + if (var6) { return true; } else { byte[] var21; - if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { // L: 256 - var21 = GrandExchangeOfferOwnWorldComparator.method1147(this.groups[var1], false); // L: 261 + if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { + var21 = GrandExchangeOfferOwnWorldComparator.method1147(this.groups[var1], false); } else { - var21 = GrandExchangeOfferOwnWorldComparator.method1147(this.groups[var1], true); // L: 257 - Buffer var8 = new Buffer(var21); // L: 258 - var8.xteaDecrypt(var2, 5, var8.array.length); // L: 259 + var21 = GrandExchangeOfferOwnWorldComparator.method1147(this.groups[var1], true); + Buffer var8 = new Buffer(var21); + var8.xteaDecrypt(var2, 5, var8.array.length); } - byte[] var25 = ViewportMouse.decompressBytes(var21); // L: 264 - if (this.releaseGroups) { // L: 282 + byte[] var25 = ViewportMouse.decompressBytes(var21); + if (this.releaseGroups) { this.groups[var1] = null; } int var10; - if (var3 > 1) { // L: 283 - int var22 = var25.length; // L: 284 - --var22; // L: 285 + if (var3 > 1) { + int var22 = var25.length; + --var22; var10 = var25[var22] & 255; - var22 -= var10 * var3 * 4; // L: 286 - Buffer var11 = new Buffer(var25); // L: 287 - int[] var12 = new int[var3]; // L: 288 - var11.offset = var22; // L: 289 + var22 -= var10 * var3 * 4; + Buffer var11 = new Buffer(var25); + int[] var12 = new int[var3]; + var11.offset = var22; int var14; int var15; - for (int var13 = 0; var13 < var10; ++var13) { // L: 290 - var14 = 0; // L: 291 + for (int var13 = 0; var13 < var10; ++var13) { + var14 = 0; - for (var15 = 0; var15 < var3; ++var15) { // L: 292 - var14 += var11.readInt(); // L: 293 - var12[var15] += var14; // L: 294 + for (var15 = 0; var15 < var3; ++var15) { + var14 += var11.readInt(); + var12[var15] += var14; } } - byte[][] var23 = new byte[var3][]; // L: 297 + byte[][] var23 = new byte[var3][]; - for (var14 = 0; var14 < var3; ++var14) { // L: 298 - var23[var14] = new byte[var12[var14]]; // L: 299 - var12[var14] = 0; // L: 300 + for (var14 = 0; var14 < var3; ++var14) { + var23[var14] = new byte[var12[var14]]; + var12[var14] = 0; } - var11.offset = var22; // L: 302 - var14 = 0; // L: 303 + var11.offset = var22; + var14 = 0; int var17; - for (var15 = 0; var15 < var10; ++var15) { // L: 304 - int var24 = 0; // L: 305 + for (var15 = 0; var15 < var10; ++var15) { + int var24 = 0; - for (var17 = 0; var17 < var3; ++var17) { // L: 306 - var24 += var11.readInt(); // L: 307 - System.arraycopy(var25, var14, var23[var17], var12[var17], var24); // L: 308 - var12[var17] += var24; // L: 309 - var14 += var24; // L: 310 + for (var17 = 0; var17 < var3; ++var17) { + var24 += var11.readInt(); + System.arraycopy(var25, var14, var23[var17], var12[var17], var24); + var12[var17] += var24; + var14 += var24; } } - for (var15 = 0; var15 < var3; ++var15) { // L: 313 - if (!this.shallowFiles) { // L: 314 - var17 = var4[var15]; // L: 316 - byte[] var19 = var23[var15]; // L: 318 + for (var15 = 0; var15 < var3; ++var15) { + if (!this.shallowFiles) { + var17 = var4[var15]; + byte[] var19 = var23[var15]; Object var18; - if (var19 == null) { // L: 320 - var18 = null; // L: 321 - } else if (var19.length > 136) { // L: 324 - DirectByteArrayCopier var20 = new DirectByteArrayCopier(); // L: 326 - var20.set(var19); // L: 327 - var18 = var20; // L: 328 + if (var19 == null) { + var18 = null; + } else if (var19.length > 136) { + DirectByteArrayCopier var20 = new DirectByteArrayCopier(); + var20.set(var19); + var18 = var20; } else { - var18 = var19; // L: 333 + var18 = var19; } - var5[var17] = var18; // L: 335 + var5[var17] = var18; } else { - var5[var4[var15]] = var23[var15]; // L: 337 + var5[var4[var15]] = var23[var15]; } } - } else if (!this.shallowFiles) { // L: 341 - var10 = var4[0]; // L: 343 + } else if (!this.shallowFiles) { + var10 = var4[0]; Object var26; - if (var25 == null) { // L: 346 - var26 = null; // L: 347 - } else if (var25.length > 136) { // L: 350 - DirectByteArrayCopier var27 = new DirectByteArrayCopier(); // L: 352 - var27.set(var25); // L: 353 - var26 = var27; // L: 354 + if (var25 == null) { + var26 = null; + } else if (var25.length > 136) { + DirectByteArrayCopier var27 = new DirectByteArrayCopier(); + var27.set(var25); + var26 = var27; } else { - var26 = var25; // L: 359 + var26 = var25; } - var5[var10] = var26; // L: 361 + var5[var10] = var26; } else { - var5[var4[0]] = var25; // L: 363 + var5[var4[0]] = var25; } - return true; // L: 365 + return true; } } } @@ -631,8 +631,8 @@ public abstract class AbstractArchive { ) @Export("getGroupId") public int getGroupId(String var1) { - var1 = var1.toLowerCase(); // L: 369 - return this.groupNameHashTable.get(Skills.hashString(var1)); // L: 370 + var1 = var1.toLowerCase(); + return this.groupNameHashTable.get(Skills.hashString(var1)); } @ObfuscatedName("bx") @@ -642,8 +642,8 @@ public abstract class AbstractArchive { ) @Export("getFileId") public int getFileId(int var1, String var2) { - var2 = var2.toLowerCase(); // L: 374 - return this.fileNameHashTables[var1].get(Skills.hashString(var2)); // L: 375 + var2 = var2.toLowerCase(); + return this.fileNameHashTables[var1].get(Skills.hashString(var2)); } @ObfuscatedName("bt") @@ -653,14 +653,14 @@ public abstract class AbstractArchive { ) @Export("isValidFileName") public boolean isValidFileName(String var1, String var2) { - var1 = var1.toLowerCase(); // L: 379 - var2 = var2.toLowerCase(); // L: 380 - int var3 = this.groupNameHashTable.get(Skills.hashString(var1)); // L: 381 - if (var3 < 0) { // L: 382 + var1 = var1.toLowerCase(); + var2 = var2.toLowerCase(); + int var3 = this.groupNameHashTable.get(Skills.hashString(var1)); + if (var3 < 0) { return false; } else { - int var4 = this.fileNameHashTables[var3].get(Skills.hashString(var2)); // L: 383 - return var4 >= 0; // L: 384 + int var4 = this.fileNameHashTables[var3].get(Skills.hashString(var2)); + return var4 >= 0; } } @@ -671,11 +671,11 @@ public abstract class AbstractArchive { ) @Export("takeFileByNames") public byte[] takeFileByNames(String var1, String var2) { - var1 = var1.toLowerCase(); // L: 389 - var2 = var2.toLowerCase(); // L: 390 - int var3 = this.groupNameHashTable.get(Skills.hashString(var1)); // L: 391 - int var4 = this.fileNameHashTables[var3].get(Skills.hashString(var2)); // L: 392 - return this.takeFile(var3, var4); // L: 393 + var1 = var1.toLowerCase(); + var2 = var2.toLowerCase(); + int var3 = this.groupNameHashTable.get(Skills.hashString(var1)); + int var4 = this.fileNameHashTables[var3].get(Skills.hashString(var2)); + return this.takeFile(var3, var4); } @ObfuscatedName("bn") @@ -685,11 +685,11 @@ public abstract class AbstractArchive { ) @Export("tryLoadFileByNames") public boolean tryLoadFileByNames(String var1, String var2) { - var1 = var1.toLowerCase(); // L: 397 - var2 = var2.toLowerCase(); // L: 398 - int var3 = this.groupNameHashTable.get(Skills.hashString(var1)); // L: 399 - int var4 = this.fileNameHashTables[var3].get(Skills.hashString(var2)); // L: 400 - return this.tryLoadFile(var3, var4); // L: 401 + var1 = var1.toLowerCase(); + var2 = var2.toLowerCase(); + int var3 = this.groupNameHashTable.get(Skills.hashString(var1)); + int var4 = this.fileNameHashTables[var3].get(Skills.hashString(var2)); + return this.tryLoadFile(var3, var4); } @ObfuscatedName("bj") @@ -699,9 +699,9 @@ public abstract class AbstractArchive { ) @Export("tryLoadGroupByName") public boolean tryLoadGroupByName(String var1) { - var1 = var1.toLowerCase(); // L: 405 - int var2 = this.groupNameHashTable.get(Skills.hashString(var1)); // L: 406 - return this.tryLoadGroup(var2); // L: 407 + var1 = var1.toLowerCase(); + int var2 = this.groupNameHashTable.get(Skills.hashString(var1)); + return this.tryLoadGroup(var2); } @ObfuscatedName("by") @@ -711,12 +711,12 @@ public abstract class AbstractArchive { ) @Export("loadRegionFromName") public void loadRegionFromName(String var1) { - var1 = var1.toLowerCase(); // L: 411 - int var2 = this.groupNameHashTable.get(Skills.hashString(var1)); // L: 412 - if (var2 >= 0) { // L: 413 - this.loadRegionFromGroup(var2); // L: 414 + var1 = var1.toLowerCase(); + int var2 = this.groupNameHashTable.get(Skills.hashString(var1)); + if (var2 >= 0) { + this.loadRegionFromGroup(var2); } - } // L: 415 + } @ObfuscatedName("bk") @ObfuscatedSignature( @@ -725,9 +725,9 @@ public abstract class AbstractArchive { ) @Export("groupLoadPercentByName") public int groupLoadPercentByName(String var1) { - var1 = var1.toLowerCase(); // L: 418 - int var2 = this.groupNameHashTable.get(Skills.hashString(var1)); // L: 419 - return this.groupLoadPercent(var2); // L: 420 + var1 = var1.toLowerCase(); + int var2 = this.groupNameHashTable.get(Skills.hashString(var1)); + return this.groupLoadPercent(var2); } @ObfuscatedName("hs") @@ -736,8 +736,8 @@ public abstract class AbstractArchive { garbageValue = "-2059538703" ) static final void method5693() { - for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7978 7979 8022 - if (var0.hitpoints > 0) { // L: 7980 + for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { + if (var0.hitpoints > 0) { --var0.hitpoints; } @@ -745,61 +745,61 @@ public abstract class AbstractArchive { int var2; int var3; ObjectComposition var4; - if (var0.hitpoints == 0) { // L: 7981 - if (var0.objectId >= 0) { // L: 7983 - var2 = var0.objectId; // L: 7985 - var3 = var0.field1080; // L: 7986 - var4 = class148.getObjectDefinition(var2); // L: 7988 - if (var3 == 11) { // L: 7989 + if (var0.hitpoints == 0) { + if (var0.objectId >= 0) { + var2 = var0.objectId; + var3 = var0.field1080; + var4 = class148.getObjectDefinition(var2); + if (var3 == 11) { var3 = 10; } - if (var3 >= 5 && var3 <= 8) { // L: 7990 + if (var3 >= 5 && var3 <= 8) { var3 = 4; } - var1 = var4.method3491(var3); // L: 7991 - if (!var1) { // L: 7993 + var1 = var4.method3491(var3); + if (!var1) { continue; } } - DevicePcmPlayerProvider.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.objectId, var0.field1087, var0.field1080); // L: 7995 - var0.remove(); // L: 7996 + DevicePcmPlayerProvider.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.objectId, var0.field1087, var0.field1080); + var0.remove(); } else { - if (var0.delay > 0) { // L: 8000 + if (var0.delay > 0) { --var0.delay; } - if (var0.delay == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102) { // L: 8001 - if (var0.id >= 0) { // L: 8003 - var2 = var0.id; // L: 8005 - var3 = var0.field1075; // L: 8006 - var4 = class148.getObjectDefinition(var2); // L: 8008 - if (var3 == 11) { // L: 8009 + if (var0.delay == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102) { + if (var0.id >= 0) { + var2 = var0.id; + var3 = var0.field1075; + var4 = class148.getObjectDefinition(var2); + if (var3 == 11) { var3 = 10; } - if (var3 >= 5 && var3 <= 8) { // L: 8010 + if (var3 >= 5 && var3 <= 8) { var3 = 4; } - var1 = var4.method3491(var3); // L: 8011 - if (!var1) { // L: 8013 + var1 = var4.method3491(var3); + if (!var1) { continue; } } - DevicePcmPlayerProvider.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field1075); // L: 8015 - var0.delay = -1; // L: 8016 - if (var0.id == var0.objectId && var0.objectId == -1) { // L: 8017 + DevicePcmPlayerProvider.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field1075); + var0.delay = -1; + if (var0.id == var0.objectId && var0.objectId == -1) { var0.remove(); - } else if (var0.objectId == var0.id && var0.field1087 == var0.orientation && var0.field1080 == var0.field1075) { // L: 8018 + } else if (var0.objectId == var0.id && var0.field1087 == var0.orientation && var0.field1080 == var0.field1075) { var0.remove(); } } } } - } // L: 8024 + } } diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java index fd6abfc045..24b9cd9db1 100644 --- a/runescape-client/src/main/java/AbstractByteArrayCopier.java +++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java @@ -21,7 +21,7 @@ public abstract class AbstractByteArrayCopier { static int cameraY; AbstractByteArrayCopier() { - } // L: 4 + } @ObfuscatedName("p") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/AbstractFont.java b/runescape-client/src/main/java/AbstractFont.java index 8b356937d2..605e1c047d 100644 --- a/runescape-client/src/main/java/AbstractFont.java +++ b/runescape-client/src/main/java/AbstractFont.java @@ -78,50 +78,50 @@ public abstract class AbstractFont extends Rasterizer2D { byte[] kerning; static { - AbstractFont_strike = -1; // L: 24 - AbstractFont_underline = -1; // L: 25 - AbstractFont_previousShadow = -1; // L: 26 - AbstractFont_shadow = -1; // L: 27 - AbstractFont_previousColor = 0; // L: 28 - AbstractFont_color = 0; // L: 29 - AbstractFont_alpha = 256; // L: 30 - AbstractFont_justificationTotal = 0; // L: 31 - AbstractFont_justificationCurrent = 0; // L: 32 - AbstractFont_random = new Random(); // L: 33 - AbstractFont_lines = new String[100]; // L: 34 + AbstractFont_strike = -1; + AbstractFont_underline = -1; + AbstractFont_previousShadow = -1; + AbstractFont_shadow = -1; + AbstractFont_previousColor = 0; + AbstractFont_color = 0; + AbstractFont_alpha = 256; + AbstractFont_justificationTotal = 0; + AbstractFont_justificationCurrent = 0; + AbstractFont_random = new Random(); + AbstractFont_lines = new String[100]; } AbstractFont(byte[] var1) { this.pixels = new byte[256][]; this.ascent = 0; - this.readMetrics(var1); // L: 54 - } // L: 55 + this.readMetrics(var1); + } AbstractFont(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) { - this.pixels = new byte[256][]; // L: 13 - this.ascent = 0; // L: 19 - this.leftBearings = var2; // L: 37 - this.topBearings = var3; // L: 38 - this.widths = var4; // L: 39 - this.heights = var5; // L: 40 - this.readMetrics(var1); // L: 41 - this.pixels = var7; // L: 42 - int var8 = Integer.MAX_VALUE; // L: 43 - int var9 = Integer.MIN_VALUE; // L: 44 + this.pixels = new byte[256][]; + this.ascent = 0; + this.leftBearings = var2; + this.topBearings = var3; + this.widths = var4; + this.heights = var5; + this.readMetrics(var1); + this.pixels = var7; + int var8 = Integer.MAX_VALUE; + int var9 = Integer.MIN_VALUE; - for (int var10 = 0; var10 < 256; ++var10) { // L: 45 - if (this.topBearings[var10] < var8 && this.heights[var10] != 0) { // L: 46 + for (int var10 = 0; var10 < 256; ++var10) { + if (this.topBearings[var10] < var8 && this.heights[var10] != 0) { var8 = this.topBearings[var10]; } - if (this.topBearings[var10] + this.heights[var10] > var9) { // L: 47 + if (this.topBearings[var10] + this.heights[var10] > var9) { var9 = this.topBearings[var10] + this.heights[var10]; } } - this.maxAscent = this.ascent - var8; // L: 49 - this.maxDescent = var9 - this.ascent; // L: 50 - } // L: 51 + this.maxAscent = this.ascent - var8; + this.maxDescent = var9 - this.ascent; + } @ObfuscatedName("c") @Export("drawGlyph") @@ -134,114 +134,114 @@ public abstract class AbstractFont extends Rasterizer2D { @ObfuscatedName("w") @Export("readMetrics") void readMetrics(byte[] var1) { - this.advances = new int[256]; // L: 58 + this.advances = new int[256]; int var2; - if (var1.length == 257) { // L: 59 - for (var2 = 0; var2 < this.advances.length; ++var2) { // L: 60 + if (var1.length == 257) { + for (var2 = 0; var2 < this.advances.length; ++var2) { this.advances[var2] = var1[var2] & 255; } - this.ascent = var1[256] & 255; // L: 61 + this.ascent = var1[256] & 255; } else { - var2 = 0; // L: 64 + var2 = 0; - for (int var3 = 0; var3 < 256; ++var3) { // L: 65 + for (int var3 = 0; var3 < 256; ++var3) { this.advances[var3] = var1[var2++] & 255; } - int[] var10 = new int[256]; // L: 66 - int[] var4 = new int[256]; // L: 67 + int[] var10 = new int[256]; + int[] var4 = new int[256]; int var5; - for (var5 = 0; var5 < 256; ++var5) { // L: 68 + for (var5 = 0; var5 < 256; ++var5) { var10[var5] = var1[var2++] & 255; } - for (var5 = 0; var5 < 256; ++var5) { // L: 69 + for (var5 = 0; var5 < 256; ++var5) { var4[var5] = var1[var2++] & 255; } - byte[][] var11 = new byte[256][]; // L: 70 + byte[][] var11 = new byte[256][]; int var8; - for (int var6 = 0; var6 < 256; ++var6) { // L: 71 - var11[var6] = new byte[var10[var6]]; // L: 72 - byte var7 = 0; // L: 73 + for (int var6 = 0; var6 < 256; ++var6) { + var11[var6] = new byte[var10[var6]]; + byte var7 = 0; - for (var8 = 0; var8 < var11[var6].length; ++var8) { // L: 74 - var7 += var1[var2++]; // L: 75 - var11[var6][var8] = var7; // L: 76 + for (var8 = 0; var8 < var11[var6].length; ++var8) { + var7 += var1[var2++]; + var11[var6][var8] = var7; } } - byte[][] var12 = new byte[256][]; // L: 79 + byte[][] var12 = new byte[256][]; int var13; - for (var13 = 0; var13 < 256; ++var13) { // L: 80 - var12[var13] = new byte[var10[var13]]; // L: 81 - byte var14 = 0; // L: 82 + for (var13 = 0; var13 < 256; ++var13) { + var12[var13] = new byte[var10[var13]]; + byte var14 = 0; - for (int var9 = 0; var9 < var12[var13].length; ++var9) { // L: 83 - var14 += var1[var2++]; // L: 84 - var12[var13][var9] = var14; // L: 85 + for (int var9 = 0; var9 < var12[var13].length; ++var9) { + var14 += var1[var2++]; + var12[var13][var9] = var14; } } - this.kerning = new byte[65536]; // L: 88 + this.kerning = new byte[65536]; - for (var13 = 0; var13 < 256; ++var13) { // L: 89 - 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)method6038(var11, var12, var4, this.advances, var10, var13, var8); // L: 93 + for (var13 = 0; var13 < 256; ++var13) { + if (var13 != 32 && var13 != 160) { + for (var8 = 0; var8 < 256; ++var8) { + if (var8 != 32 && var8 != 160) { + this.kerning[var8 + (var13 << 8)] = (byte)method6038(var11, var12, var4, this.advances, var10, var13, var8); } } } } - this.ascent = var4[32] + var10[32]; // L: 96 + this.ascent = var4[32] + var10[32]; } - } // L: 98 + } @ObfuscatedName("r") @Export("charWidth") int charWidth(char var1) { - if (var1 == 160) { // L: 123 + if (var1 == 160) { var1 = ' '; } - return this.advances[class372.charToByteCp1252(var1) & 255]; // L: 124 + return this.advances[class372.charToByteCp1252(var1) & 255]; } @ObfuscatedName("o") @Export("stringWidth") public int stringWidth(String var1) { - if (var1 == null) { // L: 128 + if (var1 == null) { return 0; } else { - int var2 = -1; // L: 129 - int var3 = -1; // L: 130 - int var4 = 0; // L: 131 + int var2 = -1; + int var3 = -1; + int var4 = 0; - for (int var5 = 0; var5 < var1.length(); ++var5) { // L: 132 - char var6 = var1.charAt(var5); // L: 133 - if (var6 == '<') { // L: 134 - var2 = var5; // L: 135 + for (int var5 = 0; var5 < var1.length(); ++var5) { + char var6 = var1.charAt(var5); + if (var6 == '<') { + var2 = var5; } else { - if (var6 == '>' && var2 != -1) { // L: 138 - String var7 = var1.substring(var2 + 1, var5); // L: 139 - var2 = -1; // L: 140 - if (var7.equals("lt")) { // L: 141 + if (var6 == '>' && var2 != -1) { + String var7 = var1.substring(var2 + 1, var5); + var2 = -1; + if (var7.equals("lt")) { var6 = '<'; } else { - if (!var7.equals("gt")) { // L: 142 - if (var7.startsWith("img=")) { // L: 143 + if (!var7.equals("gt")) { + if (var7.startsWith("img=")) { try { - int var8 = ClanChannelMember.method2778(var7.substring(4)); // L: 145 - var4 += AbstractFont_modIconSprites[var8].width; // L: 146 - var3 = -1; // L: 147 - } catch (Exception var10) { // L: 149 + int var8 = ClanChannelMember.method2778(var7.substring(4)); + var4 += AbstractFont_modIconSprites[var8].width; + var3 = -1; + } catch (Exception var10) { } } continue; @@ -251,150 +251,150 @@ public abstract class AbstractFont extends Rasterizer2D { } } - if (var6 == 160) { // L: 154 + if (var6 == 160) { var6 = ' '; } - if (var2 == -1) { // L: 155 - var4 += this.advances[(char)(class372.charToByteCp1252(var6) & 255)]; // L: 156 - if (this.kerning != null && var3 != -1) { // L: 157 + if (var2 == -1) { + var4 += this.advances[(char)(class372.charToByteCp1252(var6) & 255)]; + if (this.kerning != null && var3 != -1) { var4 += this.kerning[var6 + (var3 << 8)]; } - var3 = var6; // L: 158 + var3 = var6; } } } - return var4; // L: 161 + return var4; } } @ObfuscatedName("v") @Export("breakLines") public int breakLines(String var1, int[] var2, String[] var3) { - if (var1 == null) { // L: 165 + if (var1 == null) { return 0; } else { - int var4 = 0; // L: 166 - int var5 = 0; // L: 167 - StringBuilder var6 = new StringBuilder(100); // L: 168 - int var7 = -1; // L: 169 - int var8 = 0; // L: 170 - byte var9 = 0; // L: 171 - int var10 = -1; // L: 172 - char var11 = 0; // L: 173 - int var12 = 0; // L: 174 - int var13 = var1.length(); // L: 175 + int var4 = 0; + int var5 = 0; + StringBuilder var6 = new StringBuilder(100); + int var7 = -1; + int var8 = 0; + byte var9 = 0; + int var10 = -1; + char var11 = 0; + int var12 = 0; + int var13 = var1.length(); - for (int var14 = 0; var14 < var13; ++var14) { // L: 176 - char var15 = var1.charAt(var14); // L: 177 - if (var15 == '<') { // L: 178 - var10 = var14; // L: 179 + for (int var14 = 0; var14 < var13; ++var14) { + char var15 = var1.charAt(var14); + if (var15 == '<') { + var10 = var14; } else { - if (var15 == '>' && var10 != -1) { // L: 182 - String var16 = var1.substring(var10 + 1, var14); // L: 183 - var10 = -1; // L: 184 - var6.append('<'); // L: 185 - var6.append(var16); // L: 186 - var6.append('>'); // L: 187 - if (var16.equals("br")) { // L: 188 - var3[var12] = var6.toString().substring(var5, var6.length()); // L: 189 - ++var12; // L: 190 - var5 = var6.length(); // L: 191 - var4 = 0; // L: 192 - var7 = -1; // L: 193 - var11 = 0; // L: 194 - } else if (var16.equals("lt")) { // L: 196 - var4 += this.charWidth('<'); // L: 197 - if (this.kerning != null && var11 != -1) { // L: 198 + if (var15 == '>' && var10 != -1) { + String var16 = var1.substring(var10 + 1, var14); + var10 = -1; + var6.append('<'); + var6.append(var16); + var6.append('>'); + if (var16.equals("br")) { + var3[var12] = var6.toString().substring(var5, var6.length()); + ++var12; + var5 = var6.length(); + var4 = 0; + var7 = -1; + var11 = 0; + } else if (var16.equals("lt")) { + var4 += this.charWidth('<'); + if (this.kerning != null && var11 != -1) { var4 += this.kerning[(var11 << '\b') + 60]; } - var11 = '<'; // L: 199 - } else if (var16.equals("gt")) { // L: 201 - var4 += this.charWidth('>'); // L: 202 - if (this.kerning != null && var11 != -1) { // L: 203 + var11 = '<'; + } else if (var16.equals("gt")) { + var4 += this.charWidth('>'); + if (this.kerning != null && var11 != -1) { var4 += this.kerning[(var11 << '\b') + 62]; } - var11 = '>'; // L: 204 - } else if (var16.startsWith("img=")) { // L: 206 + var11 = '>'; + } else if (var16.startsWith("img=")) { try { - int var17 = ClanChannelMember.method2778(var16.substring(4)); // L: 208 - var4 += AbstractFont_modIconSprites[var17].width; // L: 209 - var11 = 0; // L: 210 - } catch (Exception var20) { // L: 212 + int var17 = ClanChannelMember.method2778(var16.substring(4)); + var4 += AbstractFont_modIconSprites[var17].width; + var11 = 0; + } catch (Exception var20) { } } - var15 = 0; // L: 214 + var15 = 0; } - if (var10 == -1) { // L: 216 - if (var15 != 0) { // L: 217 - var6.append(var15); // L: 218 - var4 += this.charWidth(var15); // L: 219 - if (this.kerning != null && var11 != -1) { // L: 220 + if (var10 == -1) { + if (var15 != 0) { + var6.append(var15); + var4 += this.charWidth(var15); + if (this.kerning != null && var11 != -1) { var4 += this.kerning[var15 + (var11 << '\b')]; } - var11 = var15; // L: 221 + var11 = var15; } - if (var15 == ' ') { // L: 223 - var7 = var6.length(); // L: 224 - var8 = var4; // L: 225 - var9 = 1; // L: 226 + if (var15 == ' ') { + var7 = var6.length(); + var8 = var4; + var9 = 1; } - if (var2 != null && var4 > var2[var12 < var2.length ? var12 : var2.length - 1] && var7 >= 0) { // L: 228 - var3[var12] = var6.toString().substring(var5, var7 - var9); // L: 229 - ++var12; // L: 230 - var5 = var7; // L: 231 - var7 = -1; // L: 232 - var4 -= var8; // L: 233 - var11 = 0; // L: 234 + if (var2 != null && var4 > var2[var12 < var2.length ? var12 : var2.length - 1] && var7 >= 0) { + var3[var12] = var6.toString().substring(var5, var7 - var9); + ++var12; + var5 = var7; + var7 = -1; + var4 -= var8; + var11 = 0; } - if (var15 == '-') { // L: 236 - var7 = var6.length(); // L: 237 - var8 = var4; // L: 238 - var9 = 0; // L: 239 + if (var15 == '-') { + var7 = var6.length(); + var8 = var4; + var9 = 0; } } } } - String var19 = var6.toString(); // L: 243 - if (var19.length() > var5) { // L: 244 + String var19 = var6.toString(); + if (var19.length() > var5) { var3[var12++] = var19.substring(var5, var19.length()); } - return var12; // L: 245 + return var12; } } @ObfuscatedName("d") @Export("lineWidth") public int lineWidth(String var1, int var2) { - int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines); // L: 249 - int var4 = 0; // L: 250 + int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines); + int var4 = 0; - for (int var5 = 0; var5 < var3; ++var5) { // L: 251 - int var6 = this.stringWidth(AbstractFont_lines[var5]); // L: 252 - if (var6 > var4) { // L: 253 + for (int var5 = 0; var5 < var3; ++var5) { + int var6 = this.stringWidth(AbstractFont_lines[var5]); + if (var6 > var4) { var4 = var6; } } - return var4; // L: 255 + return var4; } @ObfuscatedName("h") @Export("lineCount") public int lineCount(String var1, int var2) { - return this.breakLines(var1, new int[]{var2}, AbstractFont_lines); // L: 259 + return this.breakLines(var1, new int[]{var2}, AbstractFont_lines); } @ObfuscatedName("e") @@ -402,202 +402,202 @@ public abstract class AbstractFont extends Rasterizer2D { descriptor = "(IILjava/lang/String;II)Lme;" ) public Bounds method6091(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 - int var7 = var5 - this.maxAscent; // L: 285 - int var8 = this.stringWidth(var3.substring(var1, var2 + var1)); // L: 286 - int var9 = this.maxAscent + this.maxDescent; // L: 287 - return new Bounds(var6, var7, var8, var9); // L: 288 + if (var3 != null && var3.length() >= var2 + var1) { + int var6 = var4 - this.stringWidth(var3) / 2; + var6 += this.stringWidth(var3.substring(0, var1)); + int var7 = var5 - this.maxAscent; + int var8 = this.stringWidth(var3.substring(var1, var2 + var1)); + int var9 = this.maxAscent + this.maxDescent; + return new Bounds(var6, var7, var8, var9); } else { - return new Bounds(var4, var5, 0, 0); // L: 281 + return new Bounds(var4, var5, 0, 0); } } @ObfuscatedName("a") @Export("draw") public void draw(String var1, int var2, int var3, int var4, int var5) { - if (var1 != null) { // L: 292 - this.reset(var4, var5); // L: 293 - this.draw0(var1, var2, var3); // L: 294 + if (var1 != null) { + this.reset(var4, var5); + this.draw0(var1, var2, var3); } - } // L: 295 + } @ObfuscatedName("u") @Export("drawAlpha") public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int var6) { - if (var1 != null) { // L: 298 - this.reset(var4, var5); // L: 299 - AbstractFont_alpha = var6; // L: 300 - this.draw0(var1, var2, var3); // L: 301 + if (var1 != null) { + this.reset(var4, var5); + AbstractFont_alpha = var6; + this.draw0(var1, var2, var3); } - } // L: 302 + } @ObfuscatedName("k") @Export("drawRightAligned") public void drawRightAligned(String var1, int var2, int var3, int var4, int var5) { - if (var1 != null) { // L: 305 - this.reset(var4, var5); // L: 306 - this.draw0(var1, var2 - this.stringWidth(var1), var3); // L: 307 + if (var1 != null) { + this.reset(var4, var5); + this.draw0(var1, var2 - this.stringWidth(var1), var3); } - } // L: 308 + } @ObfuscatedName("f") @Export("drawCentered") public void drawCentered(String var1, int var2, int var3, int var4, int var5) { - if (var1 != null) { // L: 311 - this.reset(var4, var5); // L: 312 - this.draw0(var1, var2 - this.stringWidth(var1) / 2, var3); // L: 313 + if (var1 != null) { + this.reset(var4, var5); + this.draw0(var1, var2 - this.stringWidth(var1) / 2, var3); } - } // L: 314 + } @ObfuscatedName("l") @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 + if (var1 == null) { return 0; } else { - this.reset(var6, var7); // L: 318 - if (var10 == 0) { // L: 319 + this.reset(var6, var7); + if (var10 == 0) { var10 = this.ascent; } - int[] var11 = new int[]{var4}; // L: 320 - if (var5 < var10 + this.maxAscent + this.maxDescent && var5 < var10 + var10) { // L: 321 + int[] var11 = new int[]{var4}; + if (var5 < var10 + this.maxAscent + this.maxDescent && var5 < var10 + var10) { var11 = null; } - int var12 = this.breakLines(var1, var11, AbstractFont_lines); // L: 322 - if (var9 == 3 && var12 == 1) { // L: 324 + int var12 = this.breakLines(var1, var11, AbstractFont_lines); + if (var9 == 3 && var12 == 1) { var9 = 1; } int var13; int var14; - if (var9 == 0) { // L: 325 + if (var9 == 0) { var13 = var3 + this.maxAscent; - } else if (var9 == 1) { // L: 326 + } else if (var9 == 1) { var13 = var3 + (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / 2 + this.maxAscent; - } else if (var9 == 2) { // L: 327 + } else if (var9 == 2) { var13 = var3 + var5 - this.maxDescent - var10 * (var12 - 1); } else { - var14 = (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / (var12 + 1); // L: 329 - if (var14 < 0) { // L: 330 + var14 = (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / (var12 + 1); + if (var14 < 0) { var14 = 0; } - var13 = var3 + var14 + this.maxAscent; // L: 331 - var10 += var14; // L: 332 + var13 = var3 + var14 + this.maxAscent; + var10 += var14; } - for (var14 = 0; var14 < var12; ++var14) { // L: 334 + for (var14 = 0; var14 < var12; ++var14) { if (var8 == 0) { - this.draw0(AbstractFont_lines[var14], var2, var13); // L: 335 - } else if (var8 == 1) { // L: 336 + this.draw0(AbstractFont_lines[var14], var2, var13); + } else if (var8 == 1) { this.draw0(AbstractFont_lines[var14], var2 + (var4 - this.stringWidth(AbstractFont_lines[var14])) / 2, var13); - } else if (var8 == 2) { // L: 337 + } else if (var8 == 2) { this.draw0(AbstractFont_lines[var14], var2 + var4 - this.stringWidth(AbstractFont_lines[var14]), var13); - } else if (var14 == var12 - 1) { // L: 339 + } else if (var14 == var12 - 1) { this.draw0(AbstractFont_lines[var14], var2, var13); } else { - this.calculateLineJustification(AbstractFont_lines[var14], var4); // L: 341 - this.draw0(AbstractFont_lines[var14], var2, var13); // L: 342 - AbstractFont_justificationTotal = 0; // L: 343 + this.calculateLineJustification(AbstractFont_lines[var14], var4); + this.draw0(AbstractFont_lines[var14], var2, var13); + AbstractFont_justificationTotal = 0; } - var13 += var10; // L: 346 + var13 += var10; } - return var12; // L: 348 + return var12; } } @ObfuscatedName("q") @Export("drawCenteredWave") public void drawCenteredWave(String var1, int var2, int var3, int var4, int var5, int var6) { - if (var1 != null) { // L: 352 - this.reset(var4, var5); // L: 353 - int[] var7 = new int[var1.length()]; // L: 354 + if (var1 != null) { + this.reset(var4, var5); + int[] var7 = new int[var1.length()]; - for (int var8 = 0; var8 < var1.length(); ++var8) { // L: 355 + for (int var8 = 0; var8 < var1.length(); ++var8) { var7[var8] = (int)(Math.sin((double)var8 / 2.0D + (double)var6 / 5.0D) * 5.0D); } - this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, (int[])null, var7); // L: 356 + this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, (int[])null, var7); } - } // L: 357 + } @ObfuscatedName("x") @Export("drawCenteredWave2") public void drawCenteredWave2(String var1, int var2, int var3, int var4, int var5, int var6) { - if (var1 != null) { // L: 360 - this.reset(var4, var5); // L: 361 - int[] var7 = new int[var1.length()]; // L: 362 - int[] var8 = new int[var1.length()]; // L: 363 + if (var1 != null) { + this.reset(var4, var5); + int[] var7 = new int[var1.length()]; + int[] var8 = new int[var1.length()]; - for (int var9 = 0; var9 < var1.length(); ++var9) { // L: 364 - var7[var9] = (int)(Math.sin((double)var9 / 5.0D + (double)var6 / 5.0D) * 5.0D); // L: 365 - var8[var9] = (int)(Math.sin((double)var9 / 3.0D + (double)var6 / 5.0D) * 5.0D); // L: 366 + for (int var9 = 0; var9 < var1.length(); ++var9) { + var7[var9] = (int)(Math.sin((double)var9 / 5.0D + (double)var6 / 5.0D) * 5.0D); + var8[var9] = (int)(Math.sin((double)var9 / 3.0D + (double)var6 / 5.0D) * 5.0D); } - this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, var7, var8); // L: 368 + this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, var7, var8); } - } // L: 369 + } @ObfuscatedName("z") @Export("drawCenteredShake") public void drawCenteredShake(String var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (var1 != null) { // L: 372 - this.reset(var4, var5); // L: 373 - double var8 = 7.0D - (double)var7 / 8.0D; // L: 374 - if (var8 < 0.0D) { // L: 375 + if (var1 != null) { + this.reset(var4, var5); + double var8 = 7.0D - (double)var7 / 8.0D; + if (var8 < 0.0D) { var8 = 0.0D; } - int[] var10 = new int[var1.length()]; // L: 376 + int[] var10 = new int[var1.length()]; - for (int var11 = 0; var11 < var1.length(); ++var11) { // L: 377 + for (int var11 = 0; var11 < var1.length(); ++var11) { var10[var11] = (int)(Math.sin((double)var11 / 1.5D + (double)var6 / 1.0D) * var8); } - this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, (int[])null, var10); // L: 378 + this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, (int[])null, var10); } - } // L: 379 + } @ObfuscatedName("i") @Export("drawRandomAlphaAndSpacing") public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, int var5, int var6) { - if (var1 != null) { // L: 382 - this.reset(var4, var5); // L: 383 - AbstractFont_random.setSeed((long)var6); // L: 384 - AbstractFont_alpha = 192 + (AbstractFont_random.nextInt() & 31); // L: 385 - int[] var7 = new int[var1.length()]; // L: 386 - int var8 = 0; // L: 387 + if (var1 != null) { + this.reset(var4, var5); + AbstractFont_random.setSeed((long)var6); + AbstractFont_alpha = 192 + (AbstractFont_random.nextInt() & 31); + int[] var7 = new int[var1.length()]; + int var8 = 0; - for (int var9 = 0; var9 < var1.length(); ++var9) { // L: 388 - var7[var9] = var8; // L: 389 - if ((AbstractFont_random.nextInt() & 3) == 0) { // L: 390 + for (int var9 = 0; var9 < var1.length(); ++var9) { + var7[var9] = var8; + if ((AbstractFont_random.nextInt() & 3) == 0) { ++var8; } } - this.drawWithOffsets0(var1, var2, var3, var7, (int[])null); // L: 392 + this.drawWithOffsets0(var1, var2, var3, var7, (int[])null); } - } // L: 393 + } @ObfuscatedName("y") @Export("reset") void reset(int var1, int var2) { - AbstractFont_strike = -1; // L: 396 - AbstractFont_underline = -1; // L: 397 - AbstractFont_previousShadow = var2; // L: 398 + AbstractFont_strike = -1; + AbstractFont_underline = -1; + AbstractFont_previousShadow = var2; AbstractFont_shadow = var2; - AbstractFont_previousColor = var1; // L: 399 + AbstractFont_previousColor = var1; AbstractFont_color = var1; - AbstractFont_alpha = 256; // L: 400 - AbstractFont_justificationTotal = 0; // L: 401 - AbstractFont_justificationCurrent = 0; // L: 402 - } // L: 403 + AbstractFont_alpha = 256; + AbstractFont_justificationTotal = 0; + AbstractFont_justificationCurrent = 0; + } @ObfuscatedName("ah") @Export("decodeTag") @@ -605,99 +605,99 @@ public abstract class AbstractFont extends Rasterizer2D { try { int var2; String var3; - if (var1.startsWith("col=")) { // L: 407 - var3 = var1.substring(4); // L: 409 - var2 = MusicPatchNode.method5293(var3, 16, true); // L: 411 - AbstractFont_color = var2; // L: 413 - } else if (var1.equals("/col")) { // L: 415 + if (var1.startsWith("col=")) { + var3 = var1.substring(4); + var2 = MusicPatchNode.method5293(var3, 16, true); + AbstractFont_color = var2; + } else if (var1.equals("/col")) { AbstractFont_color = AbstractFont_previousColor; - } else if (var1.startsWith("str=")) { // L: 416 - var3 = var1.substring(4); // L: 418 - var2 = MusicPatchNode.method5293(var3, 16, true); // L: 420 - AbstractFont_strike = var2; // L: 422 - } else if (var1.equals("str")) { // L: 424 + } else if (var1.startsWith("str=")) { + var3 = var1.substring(4); + var2 = MusicPatchNode.method5293(var3, 16, true); + AbstractFont_strike = var2; + } else if (var1.equals("str")) { AbstractFont_strike = 8388608; - } else if (var1.equals("/str")) { // L: 425 + } else if (var1.equals("/str")) { AbstractFont_strike = -1; - } else if (var1.startsWith("u=")) { // L: 426 - var3 = var1.substring(2); // L: 428 - var2 = MusicPatchNode.method5293(var3, 16, true); // L: 430 - AbstractFont_underline = var2; // L: 432 - } else if (var1.equals("u")) { // L: 434 + } else if (var1.startsWith("u=")) { + var3 = var1.substring(2); + var2 = MusicPatchNode.method5293(var3, 16, true); + AbstractFont_underline = var2; + } else if (var1.equals("u")) { AbstractFont_underline = 0; - } else if (var1.equals("/u")) { // L: 435 + } else if (var1.equals("/u")) { AbstractFont_underline = -1; - } else if (var1.startsWith("shad=")) { // L: 436 - var3 = var1.substring(5); // L: 438 - var2 = MusicPatchNode.method5293(var3, 16, true); // L: 440 - AbstractFont_shadow = var2; // L: 442 - } else if (var1.equals("shad")) { // L: 444 + } else if (var1.startsWith("shad=")) { + var3 = var1.substring(5); + var2 = MusicPatchNode.method5293(var3, 16, true); + AbstractFont_shadow = var2; + } else if (var1.equals("shad")) { AbstractFont_shadow = 0; - } else if (var1.equals("/shad")) { // L: 445 + } else if (var1.equals("/shad")) { AbstractFont_shadow = AbstractFont_previousShadow; } else if (var1.equals("br")) { - this.reset(AbstractFont_previousColor, AbstractFont_previousShadow); // L: 446 + this.reset(AbstractFont_previousColor, AbstractFont_previousShadow); } - } catch (Exception var5) { // L: 448 + } catch (Exception var5) { } - } // L: 449 + } @ObfuscatedName("ao") @Export("calculateLineJustification") void calculateLineJustification(String var1, int var2) { - int var3 = 0; // L: 452 - boolean var4 = false; // L: 453 + int var3 = 0; + boolean var4 = false; - for (int var5 = 0; var5 < var1.length(); ++var5) { // L: 454 - char var6 = var1.charAt(var5); // L: 455 - if (var6 == '<') { // L: 456 + for (int var5 = 0; var5 < var1.length(); ++var5) { + char var6 = var1.charAt(var5); + if (var6 == '<') { var4 = true; - } else if (var6 == '>') { // L: 457 + } else if (var6 == '>') { var4 = false; - } else if (!var4 && var6 == ' ') { // L: 458 + } else if (!var4 && var6 == ' ') { ++var3; } } - if (var3 > 0) { // L: 460 + if (var3 > 0) { AbstractFont_justificationTotal = (var2 - this.stringWidth(var1) << 8) / var3; } - } // L: 461 + } @ObfuscatedName("ab") @Export("draw0") void draw0(String var1, int var2, int var3) { - var3 -= this.ascent; // L: 464 - int var4 = -1; // L: 465 - int var5 = -1; // L: 466 + var3 -= this.ascent; + int var4 = -1; + int var5 = -1; - for (int var6 = 0; var6 < var1.length(); ++var6) { // L: 467 - if (var1.charAt(var6) != 0) { // L: 468 - char var7 = (char)(class372.charToByteCp1252(var1.charAt(var6)) & 255); // L: 469 - if (var7 == '<') { // L: 470 - var4 = var6; // L: 471 + for (int var6 = 0; var6 < var1.length(); ++var6) { + if (var1.charAt(var6) != 0) { + char var7 = (char)(class372.charToByteCp1252(var1.charAt(var6)) & 255); + if (var7 == '<') { + var4 = var6; } else { int var9; - if (var7 == '>' && var4 != -1) { // L: 474 - String var8 = var1.substring(var4 + 1, var6); // L: 475 - var4 = -1; // L: 476 - if (var8.equals("lt")) { // L: 477 + if (var7 == '>' && var4 != -1) { + String var8 = var1.substring(var4 + 1, var6); + var4 = -1; + if (var8.equals("lt")) { var7 = '<'; } else { - if (!var8.equals("gt")) { // L: 478 - if (var8.startsWith("img=")) { // L: 479 + if (!var8.equals("gt")) { + if (var8.startsWith("img=")) { try { - var9 = ClanChannelMember.method2778(var8.substring(4)); // L: 481 - IndexedSprite var10 = AbstractFont_modIconSprites[var9]; // L: 482 - var10.drawAt(var2, var3 + this.ascent - var10.height); // L: 483 - var2 += var10.width; // L: 484 - var5 = -1; // L: 485 - } catch (Exception var14) { // L: 487 + var9 = ClanChannelMember.method2778(var8.substring(4)); + IndexedSprite var10 = AbstractFont_modIconSprites[var9]; + var10.drawAt(var2, var3 + this.ascent - var10.height); + var2 += var10.width; + var5 = -1; + } catch (Exception var14) { } } else { - this.decodeTag(var8); // L: 491 + this.decodeTag(var8); } continue; } @@ -706,103 +706,103 @@ public abstract class AbstractFont extends Rasterizer2D { } } - if (var7 == 160) { // L: 495 + if (var7 == 160) { var7 = ' '; } - if (var4 == -1) { // L: 496 - if (this.kerning != null && var5 != -1) { // L: 497 + if (var4 == -1) { + if (this.kerning != null && var5 != -1) { var2 += this.kerning[var7 + (var5 << 8)]; } - int var12 = this.widths[var7]; // L: 498 - var9 = this.heights[var7]; // L: 499 - if (var7 != ' ') { // L: 500 - if (AbstractFont_alpha == 256) { // L: 501 - if (AbstractFont_shadow != -1) { // L: 502 + int var12 = this.widths[var7]; + var9 = this.heights[var7]; + if (var7 != ' ') { + if (AbstractFont_alpha == 256) { + if (AbstractFont_shadow != -1) { AbstractFont_drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var9, AbstractFont_shadow); } - this.drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color); // L: 503 + this.drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color); } else { - if (AbstractFont_shadow != -1) { // L: 506 + if (AbstractFont_shadow != -1) { AbstractFont_drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var9, AbstractFont_shadow, AbstractFont_alpha); } - this.drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color, AbstractFont_alpha); // L: 507 + this.drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color, AbstractFont_alpha); } - } else if (AbstractFont_justificationTotal > 0) { // L: 511 - AbstractFont_justificationCurrent += AbstractFont_justificationTotal; // L: 512 - var2 += AbstractFont_justificationCurrent >> 8; // L: 513 - AbstractFont_justificationCurrent &= 255; // L: 514 + } else if (AbstractFont_justificationTotal > 0) { + AbstractFont_justificationCurrent += AbstractFont_justificationTotal; + var2 += AbstractFont_justificationCurrent >> 8; + AbstractFont_justificationCurrent &= 255; } - int var13 = this.advances[var7]; // L: 517 - if (AbstractFont_strike != -1) { // L: 518 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var13, AbstractFont_strike); + int var13 = this.advances[var7]; + if (AbstractFont_strike != -1) { + Rasterizer2D.method7649(var2, var3 + (int)((double)this.ascent * 0.7D), var13, AbstractFont_strike); } - if (AbstractFont_underline != -1) { // L: 519 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent + 1, var13, AbstractFont_underline); + if (AbstractFont_underline != -1) { + Rasterizer2D.method7649(var2, var3 + this.ascent + 1, var13, AbstractFont_underline); } - var2 += var13; // L: 520 - var5 = var7; // L: 521 + var2 += var13; + var5 = var7; } } } } - } // L: 524 + } @ObfuscatedName("an") @Export("drawWithOffsets0") void drawWithOffsets0(String var1, int var2, int var3, int[] var4, int[] var5) { - var3 -= this.ascent; // L: 527 - int var6 = -1; // L: 528 - int var7 = -1; // L: 529 - int var8 = 0; // L: 530 + var3 -= this.ascent; + int var6 = -1; + int var7 = -1; + int var8 = 0; - for (int var9 = 0; var9 < var1.length(); ++var9) { // L: 531 - if (var1.charAt(var9) != 0) { // L: 532 - char var10 = (char)(class372.charToByteCp1252(var1.charAt(var9)) & 255); // L: 533 - if (var10 == '<') { // L: 534 - var6 = var9; // L: 535 + for (int var9 = 0; var9 < var1.length(); ++var9) { + if (var1.charAt(var9) != 0) { + char var10 = (char)(class372.charToByteCp1252(var1.charAt(var9)) & 255); + if (var10 == '<') { + var6 = var9; } else { int var12; int var13; int var14; - if (var10 == '>' && var6 != -1) { // L: 538 - String var11 = var1.substring(var6 + 1, var9); // L: 539 - var6 = -1; // L: 540 - if (var11.equals("lt")) { // L: 541 + if (var10 == '>' && var6 != -1) { + String var11 = var1.substring(var6 + 1, var9); + var6 = -1; + if (var11.equals("lt")) { var10 = '<'; } else { - if (!var11.equals("gt")) { // L: 542 - if (var11.startsWith("img=")) { // L: 543 + if (!var11.equals("gt")) { + if (var11.startsWith("img=")) { try { - if (var4 != null) { // L: 546 + if (var4 != null) { var12 = var4[var8]; } else { - var12 = 0; // L: 547 + var12 = 0; } - if (var5 != null) { // L: 549 + if (var5 != null) { var13 = var5[var8]; } else { - var13 = 0; // L: 550 + var13 = 0; } - ++var8; // L: 551 - var14 = ClanChannelMember.method2778(var11.substring(4)); // L: 552 - IndexedSprite var15 = AbstractFont_modIconSprites[var14]; // L: 553 - var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height)); // L: 554 - var2 += var15.width; // L: 555 - var7 = -1; // L: 556 - } catch (Exception var19) { // L: 558 + ++var8; + var14 = ClanChannelMember.method2778(var11.substring(4)); + IndexedSprite var15 = AbstractFont_modIconSprites[var14]; + var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height)); + var2 += var15.width; + var7 = -1; + } catch (Exception var19) { } } else { - this.decodeTag(var11); // L: 562 + this.decodeTag(var11); } continue; } @@ -811,284 +811,284 @@ public abstract class AbstractFont extends Rasterizer2D { } } - if (var10 == 160) { // L: 566 + if (var10 == 160) { var10 = ' '; } - if (var6 == -1) { // L: 567 - if (this.kerning != null && var7 != -1) { // L: 568 + if (var6 == -1) { + if (this.kerning != null && var7 != -1) { var2 += this.kerning[var10 + (var7 << 8)]; } - int var17 = this.widths[var10]; // L: 569 - var12 = this.heights[var10]; // L: 570 - if (var4 != null) { // L: 572 + int var17 = this.widths[var10]; + var12 = this.heights[var10]; + if (var4 != null) { var13 = var4[var8]; } else { - var13 = 0; // L: 573 + var13 = 0; } - if (var5 != null) { // L: 575 + if (var5 != null) { var14 = var5[var8]; } else { - var14 = 0; // L: 576 + var14 = 0; } - ++var8; // L: 577 - if (var10 != ' ') { // L: 578 - if (AbstractFont_alpha == 256) { // L: 579 - if (AbstractFont_shadow != -1) { // L: 580 + ++var8; + if (var10 != ' ') { + if (AbstractFont_alpha == 256) { + if (AbstractFont_shadow != -1) { AbstractFont_drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10] + 1, var3 + var14 + this.topBearings[var10] + 1, var17, var12, AbstractFont_shadow); } - this.drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color); // L: 581 + this.drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color); } else { - if (AbstractFont_shadow != -1) { // L: 584 + if (AbstractFont_shadow != -1) { AbstractFont_drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10] + 1, var3 + var14 + this.topBearings[var10] + 1, var17, var12, AbstractFont_shadow, AbstractFont_alpha); } - this.drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color, AbstractFont_alpha); // L: 585 + this.drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color, AbstractFont_alpha); } - } else if (AbstractFont_justificationTotal > 0) { // L: 589 - AbstractFont_justificationCurrent += AbstractFont_justificationTotal; // L: 590 - var2 += AbstractFont_justificationCurrent >> 8; // L: 591 - AbstractFont_justificationCurrent &= 255; // L: 592 + } else if (AbstractFont_justificationTotal > 0) { + AbstractFont_justificationCurrent += AbstractFont_justificationTotal; + var2 += AbstractFont_justificationCurrent >> 8; + AbstractFont_justificationCurrent &= 255; } - int var18 = this.advances[var10]; // L: 595 - if (AbstractFont_strike != -1) { // L: 596 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var18, AbstractFont_strike); + int var18 = this.advances[var10]; + if (AbstractFont_strike != -1) { + Rasterizer2D.method7649(var2, var3 + (int)((double)this.ascent * 0.7D), var18, AbstractFont_strike); } - if (AbstractFont_underline != -1) { // L: 597 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent, var18, AbstractFont_underline); + if (AbstractFont_underline != -1) { + Rasterizer2D.method7649(var2, var3 + this.ascent, var18, AbstractFont_underline); } - var2 += var18; // L: 598 - var7 = var10; // L: 599 + var2 += var18; + var7 = var10; } } } } - } // L: 602 + } @ObfuscatedName("n") static int method6038(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 - int var10 = var9 + var4[var6]; // L: 104 - int var11 = var7; // L: 105 - if (var9 > var7) { // L: 106 + int var7 = var2[var5]; + int var8 = var7 + var4[var5]; + int var9 = var2[var6]; + int var10 = var9 + var4[var6]; + int var11 = var7; + if (var9 > var7) { var11 = var9; } - int var12 = var8; // L: 107 - if (var10 < var8) { // L: 108 + int var12 = var8; + if (var10 < var8) { var12 = var10; } - int var13 = var3[var5]; // L: 109 - if (var3[var6] < var13) { // L: 110 + int var13 = var3[var5]; + if (var3[var6] < var13) { var13 = var3[var6]; } - byte[] var14 = var1[var5]; // L: 111 - byte[] var15 = var0[var6]; // L: 112 - int var16 = var11 - var7; // L: 113 - int var17 = var11 - var9; // L: 114 + byte[] var14 = var1[var5]; + byte[] var15 = var0[var6]; + int var16 = var11 - var7; + int var17 = var11 - var9; - for (int var18 = var11; var18 < var12; ++var18) { // L: 115 - int var19 = var14[var16++] + var15[var17++]; // L: 116 - if (var19 < var13) { // L: 117 + for (int var18 = var11; var18 < var12; ++var18) { + int var19 = var14[var16++] + var15[var17++]; + if (var19 < var13) { var13 = var19; } } - return -var13; // L: 119 + return -var13; } @ObfuscatedName("g") @Export("escapeBrackets") public static String escapeBrackets(String var0) { - int var1 = var0.length(); // L: 263 - int var2 = 0; // L: 264 + int var1 = var0.length(); + int var2 = 0; - for (int var3 = 0; var3 < var1; ++var3) { // L: 265 - char var4 = var0.charAt(var3); // L: 266 + for (int var3 = 0; var3 < var1; ++var3) { + char var4 = var0.charAt(var3); if (var4 == '<' || var4 == '>') { - var2 += 3; // L: 267 + var2 += 3; } } - StringBuilder var6 = new StringBuilder(var1 + var2); // L: 269 + StringBuilder var6 = new StringBuilder(var1 + var2); - for (int var7 = 0; var7 < var1; ++var7) { // L: 270 - char var5 = var0.charAt(var7); // L: 271 + for (int var7 = 0; var7 < var1; ++var7) { + char var5 = var0.charAt(var7); if (var5 == '<') { - var6.append(""); // L: 272 - } else if (var5 == '>') { // L: 273 + var6.append(""); + } else if (var5 == '>') { var6.append(""); } else { - var6.append(var5); // L: 274 + var6.append(var5); } } - return var6.toString(); // L: 276 + return var6.toString(); } @ObfuscatedName("ax") @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: 608 - int var7 = Rasterizer2D.Rasterizer2D_width - var3; // L: 609 - int var8 = 0; // L: 610 - int var9 = 0; // L: 611 + int var6 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; + int var7 = Rasterizer2D.Rasterizer2D_width - var3; + int var8 = 0; + int var9 = 0; int var10; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 612 - var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 613 - var4 -= var10; // L: 614 - var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 615 - var9 += var3 * var10; // L: 616 - var6 += var10 * Rasterizer2D.Rasterizer2D_width; // L: 617 + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; + var4 -= var10; + var2 = Rasterizer2D.Rasterizer2D_yClipStart; + var9 += var3 * var10; + var6 += var10 * Rasterizer2D.Rasterizer2D_width; } - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 619 + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 620 - var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 621 - var3 -= var10; // L: 622 - var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 623 - var9 += var10; // L: 624 - var6 += var10; // L: 625 - var8 += var10; // L: 626 - var7 += var10; // L: 627 + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; + var3 -= var10; + var1 = Rasterizer2D.Rasterizer2D_xClipStart; + var9 += var10; + var6 += var10; + var8 += var10; + var7 += var10; } - if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 629 - var10 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 630 - var3 -= var10; // L: 631 - var8 += var10; // L: 632 - var7 += var10; // L: 633 + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var10 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; + var3 -= var10; + var8 += var10; + var7 += var10; } - if (var3 > 0 && var4 > 0) { // L: 635 - AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var9, var6, var3, var4, var7, var8); // L: 636 + if (var3 > 0 && var4 > 0) { + AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var9, var6, var3, var4, var7, var8); } - } // L: 637 + } @ObfuscatedName("am") @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: 640 - var5 = -(var5 & 3); // L: 641 + int var9 = -(var5 >> 2); + var5 = -(var5 & 3); - for (int var10 = -var6; var10 < 0; ++var10) { // L: 642 + for (int var10 = -var6; var10 < 0; ++var10) { int var11; - for (var11 = var9; var11 < 0; ++var11) { // L: 643 - if (var1[var3++] != 0) { // L: 644 + for (var11 = var9; var11 < 0; ++var11) { + if (var1[var3++] != 0) { var0[var4++] = var2; } else { - ++var4; // L: 645 + ++var4; } - if (var1[var3++] != 0) { // L: 646 + if (var1[var3++] != 0) { var0[var4++] = var2; } else { - ++var4; // L: 647 + ++var4; } - if (var1[var3++] != 0) { // L: 648 + if (var1[var3++] != 0) { var0[var4++] = var2; } else { - ++var4; // L: 649 + ++var4; } - if (var1[var3++] != 0) { // L: 650 + if (var1[var3++] != 0) { var0[var4++] = var2; } else { - ++var4; // L: 651 + ++var4; } } - for (var11 = var5; var11 < 0; ++var11) { // L: 653 - if (var1[var3++] != 0) { // L: 654 + for (var11 = var5; var11 < 0; ++var11) { + if (var1[var3++] != 0) { var0[var4++] = var2; } else { - ++var4; // L: 655 + ++var4; } } - var4 += var7; // L: 657 - var3 += var8; // L: 658 + var4 += var7; + var3 += var8; } - } // L: 660 + } @ObfuscatedName("az") @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: 663 - int var8 = Rasterizer2D.Rasterizer2D_width - var3; // L: 664 - int var9 = 0; // L: 665 - int var10 = 0; // L: 666 + int var7 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; + int var8 = Rasterizer2D.Rasterizer2D_width - var3; + int var9 = 0; + int var10 = 0; int var11; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 667 - var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 668 - var4 -= var11; // L: 669 - var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 670 - var10 += var3 * var11; // L: 671 - var7 += var11 * Rasterizer2D.Rasterizer2D_width; // L: 672 + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2; + var4 -= var11; + var2 = Rasterizer2D.Rasterizer2D_yClipStart; + var10 += var3 * var11; + var7 += var11 * Rasterizer2D.Rasterizer2D_width; } - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 674 + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 675 - var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 676 - var3 -= var11; // L: 677 - var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 678 - var10 += var11; // L: 679 - var7 += var11; // L: 680 - var9 += var11; // L: 681 - var8 += var11; // L: 682 + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1; + var3 -= var11; + var1 = Rasterizer2D.Rasterizer2D_xClipStart; + var10 += var11; + var7 += var11; + var9 += var11; + var8 += var11; } - if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 684 - var11 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 685 - var3 -= var11; // L: 686 - var9 += var11; // L: 687 - var8 += var11; // L: 688 + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var11 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; + var3 -= var11; + var9 += var11; + var8 += var11; } - if (var3 > 0 && var4 > 0) { // L: 690 - AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var10, var7, var3, var4, var8, var9, var6); // L: 691 + if (var3 > 0 && var4 > 0) { + AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var10, var7, var3, var4, var8, var9, var6); } - } // L: 692 + } @ObfuscatedName("au") @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: 695 - var9 = 256 - var9; // L: 696 + var2 = ((var2 & 65280) * var9 & 16711680) + (var9 * (var2 & 16711935) & -16711936) >> 8; + var9 = 256 - var9; - for (int var10 = -var6; var10 < 0; ++var10) { // L: 697 - for (int var11 = -var5; var11 < 0; ++var11) { // L: 698 - if (var1[var3++] != 0) { // L: 699 - int var12 = var0[var4]; // L: 700 - var0[var4++] = (((var12 & 65280) * var9 & 16711680) + ((var12 & 16711935) * var9 & -16711936) >> 8) + var2; // L: 701 + for (int var10 = -var6; var10 < 0; ++var10) { + for (int var11 = -var5; var11 < 0; ++var11) { + if (var1[var3++] != 0) { + int var12 = var0[var4]; + var0[var4++] = (((var12 & 65280) * var9 & 16711680) + ((var12 & 16711935) * var9 & -16711936) >> 8) + var2; } else { - ++var4; // L: 703 + ++var4; } } - var4 += var7; // L: 705 - var3 += var8; // L: 706 + var4 += var7; + var3 += var8; } - } // L: 708 + } } diff --git a/runescape-client/src/main/java/AbstractRasterProvider.java b/runescape-client/src/main/java/AbstractRasterProvider.java index ab8c4abf2d..337413ae22 100644 --- a/runescape-client/src/main/java/AbstractRasterProvider.java +++ b/runescape-client/src/main/java/AbstractRasterProvider.java @@ -24,7 +24,7 @@ public abstract class AbstractRasterProvider { public int height; protected AbstractRasterProvider() { - } // L: 8 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -49,8 +49,8 @@ public abstract class AbstractRasterProvider { ) @Export("apply") public final void apply() { - Rasterizer2D.Rasterizer2D_replace(this.pixels, this.width, this.height); // L: 11 - } // L: 12 + Rasterizer2D.Rasterizer2D_replace(this.pixels, this.width, this.height); + } @ObfuscatedName("fe") @ObfuscatedSignature( @@ -58,14 +58,14 @@ public abstract class AbstractRasterProvider { garbageValue = "-685860336" ) static int method7714() { - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 2159 - int var0 = 0; // L: 2160 + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { + int var0 = 0; - for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { // L: 2161 - var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; // L: 2162 + for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { + var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; } - return var0 * 10000 / Client.field753; // L: 2164 + return var0 * 10000 / Client.field753; } else { return 10000; } diff --git a/runescape-client/src/main/java/AbstractSocket.java b/runescape-client/src/main/java/AbstractSocket.java index 8f03c5617c..89c8dfbb22 100644 --- a/runescape-client/src/main/java/AbstractSocket.java +++ b/runescape-client/src/main/java/AbstractSocket.java @@ -15,7 +15,7 @@ public abstract class AbstractSocket { static class404 HitSplatDefinition_cachedSprites; protected AbstractSocket() { - } // L: 7 + } @ObfuscatedName("c") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/AbstractSound.java b/runescape-client/src/main/java/AbstractSound.java index 3a4de129d1..4f4fccea01 100644 --- a/runescape-client/src/main/java/AbstractSound.java +++ b/runescape-client/src/main/java/AbstractSound.java @@ -10,5 +10,5 @@ public abstract class AbstractSound extends Node { int position; AbstractSound() { - } // L: 10 + } } diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java index 60641eff0d..88e02a1a7d 100644 --- a/runescape-client/src/main/java/AbstractUserComparator.java +++ b/runescape-client/src/main/java/AbstractUserComparator.java @@ -15,7 +15,7 @@ public abstract class AbstractUserComparator implements Comparator { Comparator nextComparator; protected AbstractUserComparator() { - } // L: 8 + } @ObfuscatedName("j") @ObfuscatedSignature( @@ -24,13 +24,13 @@ public abstract class AbstractUserComparator implements Comparator { ) @Export("addComparator") final void addComparator(Comparator var1) { - if (this.nextComparator == null) { // L: 11 - this.nextComparator = var1; // L: 12 - } else if (this.nextComparator instanceof AbstractUserComparator) { // L: 14 - ((AbstractUserComparator)this.nextComparator).addComparator(var1); // L: 15 + if (this.nextComparator == null) { + this.nextComparator = var1; + } else if (this.nextComparator instanceof AbstractUserComparator) { + ((AbstractUserComparator)this.nextComparator).addComparator(var1); } - } // L: 17 + } @ObfuscatedName("w") @ObfuscatedSignature( @@ -39,10 +39,10 @@ public abstract class AbstractUserComparator implements Comparator { ) @Export("compareUser") protected final int compareUser(User var1, User var2) { - return this.nextComparator == null ? 0 : this.nextComparator.compare(var1, var2); // L: 20 21 + return this.nextComparator == null ? 0 : this.nextComparator.compare(var1, var2); } public boolean equals(Object var1) { - return super.equals(var1); // L: 25 + return super.equals(var1); } } diff --git a/runescape-client/src/main/java/AbstractWorldMapData.java b/runescape-client/src/main/java/AbstractWorldMapData.java index 928528c0af..594cd80d0d 100644 --- a/runescape-client/src/main/java/AbstractWorldMapData.java +++ b/runescape-client/src/main/java/AbstractWorldMapData.java @@ -90,12 +90,12 @@ public abstract class AbstractWorldMapData { boolean field2709; AbstractWorldMapData() { - this.groupId = -1; // L: 14 - this.fileId = -1; // L: 15 + this.groupId = -1; + this.fileId = -1; new LinkedList(); - this.field2696 = false; // L: 26 - this.field2709 = false; // L: 27 - } // L: 29 + this.field2696 = false; + this.field2709 = false; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -112,7 +112,7 @@ public abstract class AbstractWorldMapData { ) @Export("isFullyLoaded") boolean isFullyLoaded() { - return this.field2696 && this.field2709; // L: 32 + return this.field2696 && this.field2709; } @ObfuscatedName("z") @@ -122,16 +122,16 @@ public abstract class AbstractWorldMapData { ) @Export("loadGeography") void loadGeography(AbstractArchive var1) { - if (!this.isFullyLoaded()) { // L: 36 - byte[] var2 = var1.takeFile(this.groupId, this.fileId); // L: 37 - if (var2 != null) { // L: 38 - this.readGeography(new Buffer(var2)); // L: 39 - this.field2696 = true; // L: 40 - this.field2709 = true; // L: 41 + if (!this.isFullyLoaded()) { + byte[] var2 = var1.takeFile(this.groupId, this.fileId); + if (var2 != null) { + this.readGeography(new Buffer(var2)); + this.field2696 = true; + this.field2709 = true; } } - } // L: 43 + } @ObfuscatedName("i") @ObfuscatedSignature( @@ -140,14 +140,14 @@ public abstract class AbstractWorldMapData { ) @Export("reset") void reset() { - this.floorUnderlayIds = null; // L: 46 - this.floorOverlayIds = null; // L: 47 - this.field2699 = null; // L: 48 - this.field2706 = null; // L: 49 - this.decorations = null; // L: 50 - this.field2696 = false; // L: 51 - this.field2709 = false; // L: 52 - } // L: 53 + this.floorUnderlayIds = null; + this.floorOverlayIds = null; + this.field2699 = null; + this.field2706 = null; + this.decorations = null; + this.field2696 = false; + this.field2709 = false; + } @ObfuscatedName("y") @ObfuscatedSignature( @@ -156,16 +156,16 @@ public abstract class AbstractWorldMapData { ) @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.method4762(var1, var2, var3, var4); // L: 61 + int var4 = var3.readUnsignedByte(); + if (var4 != 0) { + if ((var4 & 1) != 0) { + this.method4762(var1, var2, var3, var4); } else { - this.method4763(var1, var2, var3, var4); // L: 64 + this.method4763(var1, var2, var3, var4); } } - } // L: 58 66 + } @ObfuscatedName("ah") @ObfuscatedSignature( @@ -173,13 +173,13 @@ public abstract class AbstractWorldMapData { garbageValue = "-1058192672" ) void method4762(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 + boolean var5 = (var4 & 2) != 0; + if (var5) { + this.floorOverlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); } - this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); // L: 73 - } // L: 74 + this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); + } @ObfuscatedName("ao") @ObfuscatedSignature( @@ -187,43 +187,43 @@ public abstract class AbstractWorldMapData { garbageValue = "-82" ) void method4763(int var1, int var2, Buffer var3, int var4) { - int var5 = ((var4 & 24) >> 3) + 1; // L: 77 - boolean var6 = (var4 & 2) != 0; // L: 78 - boolean var7 = (var4 & 4) != 0; // L: 79 - this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); // L: 80 + int var5 = ((var4 & 24) >> 3) + 1; + boolean var6 = (var4 & 2) != 0; + boolean var7 = (var4 & 4) != 0; + this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); int var8; int var9; int var11; - if (var6) { // L: 81 - var8 = var3.readUnsignedByte(); // L: 82 + if (var6) { + var8 = var3.readUnsignedByte(); - for (var9 = 0; var9 < var8; ++var9) { // L: 83 - int var14 = var3.readUnsignedByte(); // L: 84 - if (var14 != 0) { // L: 85 - this.floorOverlayIds[var9][var1][var2] = (short)var14; // L: 86 - var11 = var3.readUnsignedByte(); // L: 87 - this.field2699[var9][var1][var2] = (byte)(var11 >> 2); // L: 88 - this.field2706[var9][var1][var2] = (byte)(var11 & 3); // L: 89 + for (var9 = 0; var9 < var8; ++var9) { + int var14 = var3.readUnsignedByte(); + if (var14 != 0) { + this.floorOverlayIds[var9][var1][var2] = (short)var14; + var11 = var3.readUnsignedByte(); + this.field2699[var9][var1][var2] = (byte)(var11 >> 2); + this.field2706[var9][var1][var2] = (byte)(var11 & 3); } } } - if (var7) { // L: 93 - for (var8 = 0; var8 < var5; ++var8) { // L: 94 - var9 = var3.readUnsignedByte(); // L: 95 - if (var9 != 0) { // L: 96 - WorldMapDecoration[] var10 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9]; // L: 99 + if (var7) { + for (var8 = 0; var8 < var5; ++var8) { + var9 = var3.readUnsignedByte(); + if (var9 != 0) { + WorldMapDecoration[] var10 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9]; - for (var11 = 0; var11 < var9; ++var11) { // L: 100 - int var12 = var3.method7400(); // L: 101 - int var13 = var3.readUnsignedByte(); // L: 102 - var10[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3); // L: 103 + for (var11 = 0; var11 < var9; ++var11) { + int var12 = var3.method7400(); + int var13 = var3.readUnsignedByte(); + var10[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3); } } } } - } // L: 107 + } @ObfuscatedName("ab") @ObfuscatedSignature( @@ -232,7 +232,7 @@ public abstract class AbstractWorldMapData { ) @Export("getRegionX") int getRegionX() { - return this.regionX; // L: 112 + return this.regionX; } @ObfuscatedName("an") @@ -242,7 +242,7 @@ public abstract class AbstractWorldMapData { ) @Export("getRegionY") int getRegionY() { - return this.regionY; // L: 116 + return this.regionY; } @ObfuscatedName("d") @@ -252,12 +252,12 @@ public abstract class AbstractWorldMapData { ) @Export("isCharPrintable") public static boolean isCharPrintable(char var0) { - if (var0 >= ' ' && var0 <= '~') { // L: 186 + if (var0 >= ' ' && var0 <= '~') { return true; - } else if (var0 >= 160 && var0 <= 255) { // L: 187 + } else if (var0 >= 160 && var0 <= 255) { return true; } else { - return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; // L: 188 + return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; } } @@ -267,43 +267,43 @@ public abstract class AbstractWorldMapData { garbageValue = "-2046983611" ) static final void method4787(Widget var0) { - int var1 = var0.contentType; // L: 12214 - if (var1 == 324) { // L: 12215 - if (Client.field744 == -1) { // L: 12216 - Client.field744 = var0.spriteId2; // L: 12217 - Client.field571 = var0.spriteId; // L: 12218 + int var1 = var0.contentType; + if (var1 == 324) { + if (Client.field744 == -1) { + Client.field744 = var0.spriteId2; + Client.field571 = var0.spriteId; } - if (Client.playerAppearance.isFemale) { // L: 12220 + if (Client.playerAppearance.isFemale) { var0.spriteId2 = Client.field744; } else { - var0.spriteId2 = Client.field571; // L: 12221 + var0.spriteId2 = Client.field571; } - } else if (var1 == 325) { // L: 12224 - if (Client.field744 == -1) { // L: 12225 - Client.field744 = var0.spriteId2; // L: 12226 - Client.field571 = var0.spriteId; // L: 12227 + } else if (var1 == 325) { + if (Client.field744 == -1) { + Client.field744 = var0.spriteId2; + Client.field571 = var0.spriteId; } - if (Client.playerAppearance.isFemale) { // L: 12229 + if (Client.playerAppearance.isFemale) { var0.spriteId2 = Client.field571; } else { - var0.spriteId2 = Client.field744; // L: 12230 + var0.spriteId2 = Client.field744; } - } else if (var1 == 327) { // L: 12233 - var0.modelAngleX = 150; // L: 12234 - var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 12235 - var0.modelType = 5; // L: 12236 - var0.modelId = 0; // L: 12237 - } else if (var1 == 328) { // L: 12240 - var0.modelAngleX = 150; // L: 12241 - var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 12242 - var0.modelType = 5; // L: 12243 - var0.modelId = 1; // L: 12244 + } else if (var1 == 327) { + var0.modelAngleX = 150; + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; + var0.modelType = 5; + var0.modelId = 0; + } else if (var1 == 328) { + var0.modelAngleX = 150; + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; + var0.modelType = 5; + var0.modelId = 1; } - } // L: 12222 12231 12238 12245 12247 + } @ObfuscatedName("lj") @ObfuscatedSignature( @@ -311,16 +311,16 @@ public abstract class AbstractWorldMapData { garbageValue = "-1607165722" ) static String method4791(String var0) { - PlayerType[] var1 = SpotAnimationDefinition.PlayerType_values(); // L: 12695 + PlayerType[] var1 = SpotAnimationDefinition.PlayerType_values(); - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 12696 - PlayerType var3 = var1[var2]; // L: 12697 - if (var3.modIcon != -1 && var0.startsWith(class221.method4705(var3.modIcon))) { // L: 12699 12700 - var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); // L: 12701 + for (int var2 = 0; var2 < var1.length; ++var2) { + PlayerType var3 = var1[var2]; + if (var3.modIcon != -1 && var0.startsWith(class221.method4705(var3.modIcon))) { + var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); break; } } - return var0; // L: 12708 + return var0; } } diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java index 779d58a26e..05966a56ec 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -38,9 +38,9 @@ public abstract class AbstractWorldMapIcon { descriptor = "(Lju;Lju;)V" ) AbstractWorldMapIcon(Coord var1, Coord var2) { - this.coord1 = var1; // L: 13 - this.coord2 = var2; // L: 14 - } // L: 15 + this.coord1 = var1; + this.coord2 = var2; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -81,10 +81,10 @@ public abstract class AbstractWorldMapIcon { ) @Export("fitsScreen") boolean fitsScreen(int var1, int var2) { - if (this.elementFitsScreen(var1, var2)) { // L: 18 - return true; // L: 19 + if (this.elementFitsScreen(var1, var2)) { + return true; } else { - return this.labelFitsScreen(var1, var2); // L: 21 + return this.labelFitsScreen(var1, var2); } } @@ -95,7 +95,7 @@ public abstract class AbstractWorldMapIcon { ) @Export("hasValidElement") boolean hasValidElement() { - return this.getElement() >= 0; // L: 33 + return this.getElement() >= 0; } @ObfuscatedName("u") @@ -105,48 +105,48 @@ public abstract class AbstractWorldMapIcon { ) @Export("elementFitsScreen") boolean elementFitsScreen(int var1, int var2) { - if (!this.hasValidElement()) { // L: 37 + if (!this.hasValidElement()) { return false; } else { - WorldMapElement var3 = class78.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 = class78.WorldMapElement_get(this.getElement()); + int var4 = this.getSubWidth(); + int var5 = this.getSubHeight(); + switch(var3.horizontalAlignment.value) { case 0: - if (var1 > this.screenX - var4 && var1 <= this.screenX) { // L: 54 + if (var1 > this.screenX - var4 && var1 <= this.screenX) { break; } return false; case 1: - if (var1 < this.screenX || var1 >= var4 + this.screenX) { // L: 44 + if (var1 < this.screenX || var1 >= var4 + this.screenX) { return false; } break; case 2: - if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) { // L: 49 + if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + 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 || var2 >= var5 + this.screenY) { return false; } break; 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) { return false; } break; case 2: - if (var2 <= this.screenY - var5 || var2 > this.screenY) { // L: 71 + if (var2 <= this.screenY - var5 || var2 > this.screenY) { return false; } } - return true; // L: 75 + return true; } } @@ -157,13 +157,13 @@ public abstract class AbstractWorldMapIcon { ) @Export("labelFitsScreen") boolean labelFitsScreen(int var1, int var2) { - WorldMapLabel var3 = this.getLabel(); // L: 79 - if (var3 == null) { // L: 80 - return false; // L: 81 - } else if (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX) { // L: 83 - return var2 >= this.screenY && var2 <= this.screenY + var3.height; // L: 84 + 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; } } @@ -173,7 +173,7 @@ public abstract class AbstractWorldMapIcon { garbageValue = "91" ) public static boolean method4863(int var0) { - return var0 >= WorldMapDecorationType.field3391.id && var0 <= WorldMapDecorationType.field3385.id || var0 == WorldMapDecorationType.field3406.id; // L: 43 + return var0 >= WorldMapDecorationType.field3391.id && var0 <= WorldMapDecorationType.field3385.id || var0 == WorldMapDecorationType.field3406.id; } @ObfuscatedName("hg") @@ -182,105 +182,105 @@ public abstract class AbstractWorldMapIcon { garbageValue = "-356740041" ) static final int method4862() { - if (SecureRandomFuture.clientPreferences.roofsHidden) { // L: 5508 + if (SecureRandomFuture.clientPreferences.roofsHidden) { return class20.Client_plane; } else { - int var0 = 3; // L: 5509 - if (UserComparator7.cameraPitch < 310) { // L: 5510 + int var0 = 3; + if (UserComparator7.cameraPitch < 310) { label169: { int var1; int var2; - if (Client.oculusOrbState == 1) { // L: 5513 - var1 = class7.oculusOrbFocalPointX >> 7; // L: 5514 - var2 = Actor.oculusOrbFocalPointY >> 7; // L: 5515 + if (Client.oculusOrbState == 1) { + var1 = class7.oculusOrbFocalPointX >> 7; + var2 = Actor.oculusOrbFocalPointY >> 7; } else { - var1 = class340.localPlayer.x >> 7; // L: 5518 - var2 = class340.localPlayer.y >> 7; // L: 5519 + var1 = class340.localPlayer.x >> 7; + var2 = class340.localPlayer.y >> 7; } - int var3 = UserComparator7.cameraX >> 7; // L: 5521 - int var4 = UserComparator10.cameraZ >> 7; // L: 5522 - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 5523 - if (var1 >= 0 && var2 >= 0 && var1 < 104 && var2 < 104) { // L: 5524 - if ((Tiles.Tiles_renderFlags[class20.Client_plane][var3][var4] & 4) != 0) { // L: 5525 + int var3 = UserComparator7.cameraX >> 7; + int var4 = UserComparator10.cameraZ >> 7; + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { + if (var1 >= 0 && var2 >= 0 && var1 < 104 && var2 < 104) { + if ((Tiles.Tiles_renderFlags[class20.Client_plane][var3][var4] & 4) != 0) { var0 = class20.Client_plane; } int var5; - if (var1 > var3) { // L: 5527 + if (var1 > var3) { var5 = var1 - var3; } else { - var5 = var3 - var1; // L: 5528 + var5 = var3 - var1; } int var6; - if (var2 > var4) { // L: 5530 + if (var2 > var4) { var6 = var2 - var4; } else { - var6 = var4 - var2; // L: 5531 + var6 = var4 - var2; } int var7; int var8; - if (var5 > var6) { // L: 5532 - var7 = var6 * 65536 / var5; // L: 5533 - var8 = 32768; // L: 5534 + if (var5 > var6) { + var7 = var6 * 65536 / var5; + var8 = 32768; while (true) { - if (var3 == var1) { // L: 5535 + if (var3 == var1) { break label169; } if (var3 < var1) { - ++var3; // L: 5536 - } else if (var3 > var1) { // L: 5537 + ++var3; + } else if (var3 > var1) { --var3; } - if ((Tiles.Tiles_renderFlags[class20.Client_plane][var3][var4] & 4) != 0) { // L: 5538 + if ((Tiles.Tiles_renderFlags[class20.Client_plane][var3][var4] & 4) != 0) { var0 = class20.Client_plane; } - var8 += var7; // L: 5539 - if (var8 >= 65536) { // L: 5540 - var8 -= 65536; // L: 5541 - if (var4 < var2) { // L: 5542 + var8 += var7; + if (var8 >= 65536) { + var8 -= 65536; + if (var4 < var2) { ++var4; - } else if (var4 > var2) { // L: 5543 + } else if (var4 > var2) { --var4; } - if ((Tiles.Tiles_renderFlags[class20.Client_plane][var3][var4] & 4) != 0) { // L: 5544 + if ((Tiles.Tiles_renderFlags[class20.Client_plane][var3][var4] & 4) != 0) { var0 = class20.Client_plane; } } } } else { - if (var6 > 0) { // L: 5548 - var7 = var5 * 65536 / var6; // L: 5549 - var8 = 32768; // L: 5550 + if (var6 > 0) { + var7 = var5 * 65536 / var6; + var8 = 32768; - while (var4 != var2) { // L: 5551 - if (var4 < var2) { // L: 5552 + while (var4 != var2) { + if (var4 < var2) { ++var4; - } else if (var4 > var2) { // L: 5553 + } else if (var4 > var2) { --var4; } - if ((Tiles.Tiles_renderFlags[class20.Client_plane][var3][var4] & 4) != 0) { // L: 5554 + if ((Tiles.Tiles_renderFlags[class20.Client_plane][var3][var4] & 4) != 0) { var0 = class20.Client_plane; } - var8 += var7; // L: 5555 - if (var8 >= 65536) { // L: 5556 - var8 -= 65536; // L: 5557 - if (var3 < var1) { // L: 5558 + var8 += var7; + if (var8 >= 65536) { + var8 -= 65536; + if (var3 < var1) { ++var3; - } else if (var3 > var1) { // L: 5559 + } else if (var3 > var1) { --var3; } - if ((Tiles.Tiles_renderFlags[class20.Client_plane][var3][var4] & 4) != 0) { // L: 5560 + if ((Tiles.Tiles_renderFlags[class20.Client_plane][var3][var4] & 4) != 0) { var0 = class20.Client_plane; } } @@ -297,12 +297,12 @@ public abstract class AbstractWorldMapIcon { } } - if (class340.localPlayer.x >= 0 && class340.localPlayer.y >= 0 && class340.localPlayer.x < 13312 && class340.localPlayer.y < 13312) { // L: 5565 - if ((Tiles.Tiles_renderFlags[class20.Client_plane][class340.localPlayer.x >> 7][class340.localPlayer.y >> 7] & 4) != 0) { // L: 5566 + if (class340.localPlayer.x >= 0 && class340.localPlayer.y >= 0 && class340.localPlayer.x < 13312 && class340.localPlayer.y < 13312) { + if ((Tiles.Tiles_renderFlags[class20.Client_plane][class340.localPlayer.x >> 7][class340.localPlayer.y >> 7] & 4) != 0) { var0 = class20.Client_plane; } - return var0; // L: 5567 + return var0; } else { return class20.Client_plane; } diff --git a/runescape-client/src/main/java/AccessFile.java b/runescape-client/src/main/java/AccessFile.java index 9c00084cf4..c51f655259 100644 --- a/runescape-client/src/main/java/AccessFile.java +++ b/runescape-client/src/main/java/AccessFile.java @@ -31,32 +31,32 @@ public final class AccessFile { long offset; public AccessFile(File var1, String var2, long var3) throws IOException { - if (-1L == var3) { // L: 11 + if (-1L == var3) { var3 = Long.MAX_VALUE; } - if (var1.length() > var3) { // L: 12 - var1.delete(); // L: 13 + if (var1.length() > var3) { + var1.delete(); } - this.file = new RandomAccessFile(var1, var2); // L: 15 - this.maxSize = var3; // L: 16 - this.offset = 0L; // L: 17 - int var5 = this.file.read(); // L: 18 - if (var5 != -1 && !var2.equals("r")) { // L: 19 - this.file.seek(0L); // L: 20 - this.file.write(var5); // L: 21 + this.file = new RandomAccessFile(var1, var2); + this.maxSize = var3; + this.offset = 0L; + int var5 = this.file.read(); + if (var5 != -1 && !var2.equals("r")) { + this.file.seek(0L); + this.file.write(var5); } - this.file.seek(0L); // L: 23 - } // L: 24 + this.file.seek(0L); + } @ObfuscatedName("c") @Export("seek") final void seek(long var1) throws IOException { - this.file.seek(var1); // L: 27 - this.offset = var1; // L: 28 - } // L: 29 + this.file.seek(var1); + this.offset = var1; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -65,7 +65,7 @@ public final class AccessFile { ) @Export("write") public final void write(byte[] var1, int var2, int var3) throws IOException { - if (this.offset + (long)var3 > this.maxSize) { // L: 32 + if (this.offset + (long)var3 > this.maxSize) { this.file.seek(this.maxSize); this.file.write(1); throw new EOFException(); @@ -95,16 +95,16 @@ public final class AccessFile { if (this.file != null) { if (var1) { try { - this.file.getFD().sync(); // L: 49 + this.file.getFD().sync(); } catch (SyncFailedException var3) { } } - this.file.close(); // L: 53 - this.file = null; // L: 54 + this.file.close(); + this.file = null; } - } // L: 56 + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -113,7 +113,7 @@ public final class AccessFile { ) @Export("length") public final long length() throws IOException { - return this.file.length(); // L: 59 + return this.file.length(); } @ObfuscatedName("s") @@ -123,21 +123,21 @@ public final class AccessFile { ) @Export("read") public final int read(byte[] var1, int var2, int var3) throws IOException { - int var4 = this.file.read(var1, var2, var3); // L: 63 + int var4 = this.file.read(var1, var2, var3); if (var4 > 0) { - this.offset += (long)var4; // L: 64 + this.offset += (long)var4; } - return var4; // L: 65 + return var4; } protected void finalize() throws Throwable { - if (this.file != null) { // L: 69 - System.out.println(""); // L: 70 - this.close(); // L: 71 + if (this.file != null) { + System.out.println(""); + this.close(); } - } // L: 73 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -150,13 +150,13 @@ public final class AccessFile { var1.printStackTrace(); } else { try { - String var2 = ""; // L: 33 - if (var1 != null) { // L: 34 + String var2 = ""; + if (var1 != null) { var2 = IgnoreList.method6267(var1); } - if (var0 != null) { // L: 35 - if (var1 != null) { // L: 36 + if (var0 != null) { + if (var1 != null) { var2 = var2 + " | "; } @@ -172,15 +172,15 @@ public final class AccessFile { return; } - URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + RunException.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + NPC.javaVersion + "&ct=" + class398.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 + URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + RunException.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + NPC.javaVersion + "&ct=" + class398.clientType + "&e=" + var2); + DataInputStream var4 = new DataInputStream(var3.openStream()); + var4.read(); + var4.close(); + } catch (Exception var5) { } } - } // L: 51 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -189,19 +189,19 @@ public final class AccessFile { ) @Export("SpotAnimationDefinition_get") public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) { - SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); // L: 37 - if (var1 != null) { // L: 38 + SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); + if (var1 != null) { return var1; } else { - byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); // L: 39 - var1 = new SpotAnimationDefinition(); // L: 40 - var1.id = var0; // L: 41 - if (var2 != null) { // L: 42 + byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); + var1 = new SpotAnimationDefinition(); + var1.id = var0; + if (var2 != null) { var1.decode(new Buffer(var2)); } - SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); // L: 43 - return var1; // L: 44 + SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); + return var1; } } } diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java index 23a4f0b29a..da55f6e8b4 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -175,8 +175,7 @@ public abstract class Actor extends Renderable { @ObfuscatedGetter( intValue = 892078037 ) - @Export("movementFrameCycle") - int movementFrameCycle; + int field1121; @ObfuscatedName("bv") @ObfuscatedGetter( intValue = -1419164143 @@ -349,56 +348,56 @@ public abstract class Actor extends Renderable { int field1119; Actor() { - this.isWalking = false; // L: 13 - this.field1120 = 1; // L: 14 + this.isWalking = false; + this.field1120 = 1; this.idleSequence = -1; this.turnLeftSequence = -1; - this.turnRightSequence = -1; // L: 18 + this.turnRightSequence = -1; this.walkSequence = -1; this.walkBackSequence = -1; - this.walkLeftSequence = -1; // L: 21 + this.walkLeftSequence = -1; this.walkRightSequence = -1; - this.runSequence = -1; // L: 23 + this.runSequence = -1; this.overheadText = null; - this.field1114 = false; // L: 26 + this.field1114 = false; this.overheadTextCyclesRemaining = 100; this.overheadTextColor = 0; - this.overheadTextEffect = 0; // L: 29 + this.overheadTextEffect = 0; this.hitSplatCount = 0; this.hitSplatTypes = new int[4]; this.hitSplatValues = new int[4]; - this.hitSplatCycles = new int[4]; // L: 34 + this.hitSplatCycles = new int[4]; this.hitSplatTypes2 = new int[4]; this.hitSplatValues2 = new int[4]; - this.healthBars = new IterableNodeDeque(); // L: 37 + this.healthBars = new IterableNodeDeque(); this.targetIndex = -1; this.false0 = false; - this.field1122 = -1; // L: 40 + this.field1122 = -1; this.movementSequence = -1; this.movementFrame = 0; - this.movementFrameCycle = 0; + this.field1121 = 0; this.sequence = -1; - this.sequenceFrame = 0; // L: 46 - this.sequenceFrameCycle = 0; // L: 47 + this.sequenceFrame = 0; + this.sequenceFrameCycle = 0; this.sequenceDelay = 0; - this.field1126 = 0; // L: 49 + this.field1126 = 0; this.spotAnimation = -1; this.spotAnimationFrame = 0; - this.spotAnimationFrameCycle = 0; // L: 52 + this.spotAnimationFrameCycle = 0; this.npcCycle = 0; this.defaultHeight = 200; this.field1141 = -1; - this.field1140 = -1; // L: 65 - this.field1148 = 0; // L: 71 - this.field1149 = 32; // L: 72 + this.field1140 = -1; + this.field1148 = 0; + this.field1149 = 32; this.pathLength = 0; this.pathX = new int[10]; this.pathY = new int[10]; this.field1153 = new class185[10]; - this.field1117 = 0; // L: 77 - this.field1098 = 0; // L: 78 + this.field1117 = 0; + this.field1098 = 0; this.field1119 = -1; - } // L: 81 + } @ObfuscatedName("f") @ObfuscatedSignature( @@ -407,7 +406,7 @@ public abstract class Actor extends Renderable { ) @Export("isVisible") boolean isVisible() { - return false; // L: 89 + return false; } @ObfuscatedName("bv") @@ -416,9 +415,9 @@ public abstract class Actor extends Renderable { garbageValue = "1722592983" ) final void method2228() { - this.pathLength = 0; // L: 84 - this.field1098 = 0; // L: 85 - } // L: 86 + this.pathLength = 0; + this.field1098 = 0; + } @ObfuscatedName("bb") @ObfuscatedSignature( @@ -427,79 +426,79 @@ public abstract class Actor extends Renderable { ) @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 + boolean var7 = true; + boolean var8 = true; int var9; - for (var9 = 0; var9 < 4; ++var9) { // L: 95 - if (this.hitSplatCycles[var9] > var5) { // L: 96 + for (var9 = 0; var9 < 4; ++var9) { + if (this.hitSplatCycles[var9] > var5) { var7 = false; } else { - var8 = false; // L: 97 + var8 = false; } } - var9 = -1; // L: 99 - int var10 = -1; // L: 100 - int var11 = 0; // L: 101 - if (var1 >= 0) { // L: 102 - HitSplatDefinition var12 = UserComparator6.method2554(var1); // L: 103 - var10 = var12.field1946; // L: 104 - var11 = var12.field1934; // L: 105 + var9 = -1; + int var10 = -1; + int var11 = 0; + if (var1 >= 0) { + HitSplatDefinition var12 = UserComparator6.method2554(var1); + var10 = var12.field1946; + var11 = var12.field1934; } int var14; - if (var8) { // L: 107 - if (var10 == -1) { // L: 108 + if (var8) { + if (var10 == -1) { return; } - var9 = 0; // L: 109 - var14 = 0; // L: 110 - if (var10 == 0) { // L: 111 + var9 = 0; + var14 = 0; + if (var10 == 0) { var14 = this.hitSplatCycles[0]; - } else if (var10 == 1) { // L: 112 + } else if (var10 == 1) { 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 + for (int var13 = 1; var13 < 4; ++var13) { + if (var10 == 0) { + if (this.hitSplatCycles[var13] < var14) { + var9 = var13; + var14 = this.hitSplatCycles[var13]; } - } else if (var10 == 1 && this.hitSplatValues[var13] < var14) { // L: 120 121 - var9 = var13; // L: 122 - var14 = this.hitSplatValues[var13]; // L: 123 + } else if (var10 == 1 && this.hitSplatValues[var13] < var14) { + var9 = var13; + var14 = this.hitSplatValues[var13]; } } - if (var10 == 1 && var14 >= var2) { // L: 127 + if (var10 == 1 && var14 >= var2) { return; } } else { - if (var7) { // L: 130 + if (var7) { 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 + for (var14 = 0; var14 < 4; ++var14) { + byte var15 = this.hitSplatCount; + this.hitSplatCount = (byte)((this.hitSplatCount + 1) % 4); + if (this.hitSplatCycles[var15] <= var5) { + var9 = var15; + break; } } } - 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 + if (var9 >= 0) { + this.hitSplatTypes[var9] = var1; + this.hitSplatValues[var9] = var2; + this.hitSplatTypes2[var9] = var3; + this.hitSplatValues2[var9] = var4; + this.hitSplatCycles[var9] = var5 + var11 + var6; } - } // L: 146 + } @ObfuscatedName("bc") @ObfuscatedSignature( @@ -508,45 +507,45 @@ public abstract class Actor extends Renderable { ) @Export("addHealthBar") final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) { - HealthBarDefinition var7 = class118.method2683(var1); // L: 149 - HealthBar var8 = null; // L: 150 - HealthBar var9 = null; // L: 151 - int var10 = var7.int2; // L: 152 - int var11 = 0; // L: 153 + HealthBarDefinition var7 = class118.method2683(var1); + HealthBar var8 = null; + HealthBar var9 = null; + int var10 = var7.int2; + int var11 = 0; HealthBar var12; - for (var12 = (HealthBar)this.healthBars.last(); var12 != null; var12 = (HealthBar)this.healthBars.previous()) { // L: 154 - ++var11; // L: 155 - if (var12.definition.field1796 == var7.field1796) { // L: 156 - var12.put(var2 + var4, var5, var6, var3); // L: 157 - return; // L: 158 + for (var12 = (HealthBar)this.healthBars.last(); var12 != null; var12 = (HealthBar)this.healthBars.previous()) { + ++var11; + if (var12.definition.field1796 == var7.field1796) { + var12.put(var2 + var4, var5, var6, var3); + return; } - if (var12.definition.int1 <= var7.int1) { // L: 160 + if (var12.definition.int1 <= var7.int1) { var8 = var12; } - if (var12.definition.int2 > var10) { // L: 161 - var9 = var12; // L: 162 - var10 = var12.definition.int2; // L: 163 + if (var12.definition.int2 > var10) { + var9 = var12; + var10 = var12.definition.int2; } } - if (var9 != null || var11 < 4) { // L: 166 - var12 = new HealthBar(var7); // L: 167 - if (var8 == null) { // L: 168 + if (var9 != null || var11 < 4) { + var12 = new HealthBar(var7); + if (var8 == null) { this.healthBars.addLast(var12); } else { - IterableNodeDeque.IterableNodeDeque_addBefore(var12, var8); // L: 169 + IterableNodeDeque.IterableNodeDeque_addBefore(var12, var8); } - var12.put(var2 + var4, var5, var6, var3); // L: 170 - if (var11 >= 4) { // L: 171 + var12.put(var2 + var4, var5, var6, var3); + if (var11 >= 4) { var9.remove(); } } - } // L: 172 + } @ObfuscatedName("bx") @ObfuscatedSignature( @@ -555,16 +554,16 @@ public abstract class Actor extends Renderable { ) @Export("removeHealthBar") final void removeHealthBar(int var1) { - HealthBarDefinition var2 = class118.method2683(var1); // L: 175 + HealthBarDefinition var2 = class118.method2683(var1); - 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 + for (HealthBar var3 = (HealthBar)this.healthBars.last(); var3 != null; var3 = (HealthBar)this.healthBars.previous()) { + if (var2 == var3.definition) { + var3.remove(); + return; } } - } // L: 182 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -572,70 +571,70 @@ public abstract class Actor extends Renderable { garbageValue = "1718558788" ) static int method2235(int var0, int var1) { - FloorOverlayDefinition var2 = class18.method302(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 + FloorOverlayDefinition var2 = class18.method302(var0); + if (var2 == null) { + return var1; + } else if (var2.secondaryRgb >= 0) { + return var2.secondaryRgb | -16777216; } 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) { // L: 43 - var7 = 2; - } 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 = WorldMapRectangle.method4794(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 + if (var2.texture >= 0) { + var4 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var2.texture); + var5 = 96; + if (var4 == -2) { + var3 = 12345678; + } else if (var4 == -1) { + if (var5 < 0) { + var5 = 0; } else if (var5 > 127) { var5 = 127; } var7 = 127 - var5; - var4 = var7; // L: 70 + var3 = var7; } else { - var7 = var5 * (var3 & 127) / 128; // L: 73 - if (var7 < 2) { // L: 74 + var7 = var5 * (var4 & 127) / 128; + if (var7 < 2) { var7 = 2; - } else if (var7 > 126) { // L: 75 + } else if (var7 > 126) { var7 = 126; } - var4 = var7 + (var3 & 65408); // L: 76 + var3 = var7 + (var4 & 65408); } - return Rasterizer3D.Rasterizer3D_colorPalette[var4] | -16777216; // L: 79 + return Rasterizer3D.Rasterizer3D_colorPalette[var3] | -16777216; + } else if (var2.primaryRgb == 16711935) { + return var1; + } else { + var3 = WorldMapRectangle.method4794(var2.hue, var2.saturation, var2.lightness); + var5 = 96; + if (var3 == -2) { + var4 = 12345678; + } else if (var3 == -1) { + if (var5 < 0) { + var5 = 0; + } else if (var5 > 127) { + var5 = 127; + } + + var7 = 127 - var5; + var4 = var7; + } else { + var7 = var5 * (var3 & 127) / 128; + if (var7 < 2) { + var7 = 2; + } else if (var7 > 126) { + var7 = 126; + } + + var4 = var7 + (var3 & 65408); + } + + return Rasterizer3D.Rasterizer3D_colorPalette[var4] | -16777216; } } } @@ -646,11 +645,11 @@ public abstract class Actor extends Renderable { garbageValue = "28" ) static int method2233(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 66 - if (var1 == null) { // L: 67 + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); + if (var1 == null) { return -1; } else { - return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; // L: 68 69 + return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; } } } diff --git a/runescape-client/src/main/java/Animation.java b/runescape-client/src/main/java/Animation.java index 01920949a9..1c6b126679 100644 --- a/runescape-client/src/main/java/Animation.java +++ b/runescape-client/src/main/java/Animation.java @@ -40,93 +40,93 @@ public class Animation { boolean hasAlphaTransform; static { - field2223 = new int[500]; // L: 8 - field2220 = new int[500]; // L: 9 - field2224 = new int[500]; // L: 10 - field2219 = new int[500]; // L: 11 + field2223 = new int[500]; + field2220 = new int[500]; + field2224 = new int[500]; + field2219 = new int[500]; } @ObfuscatedSignature( descriptor = "([BLgi;)V" ) Animation(byte[] var1, Skeleton var2) { - this.skeleton = null; // L: 12 - this.transformCount = -1; // L: 13 - this.hasAlphaTransform = false; // L: 18 - this.skeleton = var2; // L: 21 - Buffer var3 = new Buffer(var1); // L: 22 - Buffer var4 = new Buffer(var1); // L: 23 - var3.offset = 2; // L: 24 - int var5 = var3.readUnsignedByte(); // L: 25 - int var6 = -1; // L: 26 - int var7 = 0; // L: 27 - var4.offset = var5 + var3.offset; // L: 28 + this.skeleton = null; + this.transformCount = -1; + this.hasAlphaTransform = false; + this.skeleton = var2; + Buffer var3 = new Buffer(var1); + Buffer var4 = new Buffer(var1); + var3.offset = 2; + int var5 = var3.readUnsignedByte(); + int var6 = -1; + int var7 = 0; + var4.offset = var5 + var3.offset; int var8; - for (var8 = 0; var8 < var5; ++var8) { // L: 29 - int var9 = var3.readUnsignedByte(); // L: 30 - if (var9 > 0) { // L: 31 - 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 - field2223[var7] = var10; // L: 35 - field2220[var7] = 0; // L: 36 - field2224[var7] = 0; // L: 37 - field2219[var7] = 0; // L: 38 - ++var7; // L: 39 + for (var8 = 0; var8 < var5; ++var8) { + int var9 = var3.readUnsignedByte(); + if (var9 > 0) { + if (this.skeleton.transformTypes[var8] != 0) { + for (int var10 = var8 - 1; var10 > var6; --var10) { + if (this.skeleton.transformTypes[var10] == 0) { + field2223[var7] = var10; + field2220[var7] = 0; + field2224[var7] = 0; + field2219[var7] = 0; + ++var7; break; } } } - field2223[var7] = var8; // L: 44 - short var11 = 0; // L: 45 - if (this.skeleton.transformTypes[var8] == 3) { // L: 46 + field2223[var7] = var8; + short var11 = 0; + if (this.skeleton.transformTypes[var8] == 3) { var11 = 128; } - if ((var9 & 1) != 0) { // L: 47 + if ((var9 & 1) != 0) { field2220[var7] = var4.readShortSmart(); } else { - field2220[var7] = var11; // L: 48 + field2220[var7] = var11; } - if ((var9 & 2) != 0) { // L: 49 + if ((var9 & 2) != 0) { field2224[var7] = var4.readShortSmart(); } else { - field2224[var7] = var11; // L: 50 + field2224[var7] = var11; } - if ((var9 & 4) != 0) { // L: 51 + if ((var9 & 4) != 0) { field2219[var7] = var4.readShortSmart(); } else { - field2219[var7] = var11; // L: 52 + field2219[var7] = var11; } - var6 = var8; // L: 53 - ++var7; // L: 54 - if (this.skeleton.transformTypes[var8] == 5) { // L: 55 + var6 = var8; + ++var7; + if (this.skeleton.transformTypes[var8] == 5) { this.hasAlphaTransform = true; } } } - if (var1.length != var4.offset) { // L: 58 - throw new RuntimeException(); // L: 59 + if (var1.length != var4.offset) { + throw new RuntimeException(); } else { - this.transformCount = var7; // L: 61 - this.transformSkeletonLabels = new int[var7]; // L: 62 - this.transformXs = new int[var7]; // L: 63 - this.transformYs = new int[var7]; // L: 64 - this.transformZs = new int[var7]; // L: 65 + this.transformCount = var7; + this.transformSkeletonLabels = new int[var7]; + this.transformXs = new int[var7]; + this.transformYs = new int[var7]; + this.transformZs = new int[var7]; - for (var8 = 0; var8 < var7; ++var8) { // L: 66 - this.transformSkeletonLabels[var8] = field2223[var8]; // L: 67 - this.transformXs[var8] = field2220[var8]; // L: 68 - this.transformYs[var8] = field2224[var8]; // L: 69 - this.transformZs[var8] = field2219[var8]; // L: 70 + for (var8 = 0; var8 < var7; ++var8) { + this.transformSkeletonLabels[var8] = field2223[var8]; + this.transformXs[var8] = field2220[var8]; + this.transformYs[var8] = field2224[var8]; + this.transformZs[var8] = field2219[var8]; } } - } // L: 72 + } } diff --git a/runescape-client/src/main/java/ApproximateRouteStrategy.java b/runescape-client/src/main/java/ApproximateRouteStrategy.java index fdda2f2366..9563c13d93 100644 --- a/runescape-client/src/main/java/ApproximateRouteStrategy.java +++ b/runescape-client/src/main/java/ApproximateRouteStrategy.java @@ -18,7 +18,7 @@ public class ApproximateRouteStrategy extends RouteStrategy { public static int[] ByteArrayPool_altSizeArrayCounts; ApproximateRouteStrategy() { - } // L: 12795 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -27,7 +27,7 @@ public class ApproximateRouteStrategy extends RouteStrategy { ) @Export("hasArrived") public boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) { - return var2 == super.approxDestinationX && var3 == super.approxDestinationY; // L: 12799 + return var2 == super.approxDestinationX && var3 == super.approxDestinationY; } @ObfuscatedName("ag") @@ -36,198 +36,198 @@ public class ApproximateRouteStrategy extends RouteStrategy { garbageValue = "-10" ) static int method1139(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { // L: 3707 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = PlayerComposition.loadWorlds() ? 1 : 0; // L: 3708 - return 1; // L: 3709 + if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = PlayerComposition.loadWorlds() ? 1 : 0; + return 1; } else { World var9; - if (var0 == ScriptOpcodes.WORLDLIST_START) { // L: 3711 - var9 = class282.worldListStart(); // L: 3712 - if (var9 != null) { // L: 3713 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.id; // L: 3714 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.properties; // L: 3715 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var9.activity; // L: 3716 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.location; // L: 3717 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.population; // L: 3718 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var9.host; // L: 3719 + if (var0 == ScriptOpcodes.WORLDLIST_START) { + var9 = class282.worldListStart(); + if (var9 != null) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.id; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.properties; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var9.activity; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.location; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.population; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var9.host; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 3722 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3723 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3724 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3725 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3726 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3727 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; } - return 1; // L: 3729 - } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { // L: 3731 - var9 = Canvas.getNextWorldListWorld(); // L: 3732 - if (var9 != null) { // L: 3733 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.id; // L: 3734 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.properties; // L: 3735 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var9.activity; // L: 3736 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.location; // L: 3737 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.population; // L: 3738 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var9.host; // L: 3739 + return 1; + } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { + var9 = Canvas.getNextWorldListWorld(); + if (var9 != null) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.id; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.properties; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var9.activity; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.location; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.population; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var9.host; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 3742 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3743 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3744 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3745 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3746 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3747 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; } - return 1; // L: 3749 + return 1; } else { int var3; World var7; int var8; - if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { // L: 3751 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3752 - var7 = null; // L: 3753 + if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + var7 = null; - for (var8 = 0; var8 < World.World_count; ++var8) { // L: 3754 - if (var3 == class334.World_worlds[var8].id) { // L: 3755 - var7 = class334.World_worlds[var8]; // L: 3756 + for (var8 = 0; var8 < World.World_count; ++var8) { + if (var3 == class334.World_worlds[var8].id) { + var7 = class334.World_worlds[var8]; break; } } - if (var7 != null) { // L: 3760 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.id; // L: 3761 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.properties; // L: 3762 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.activity; // L: 3763 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.location; // L: 3764 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.population; // L: 3765 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.host; // L: 3766 + if (var7 != null) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.id; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.properties; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.activity; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.location; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.population; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.host; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 3769 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3770 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3771 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3772 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3773 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3774 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; } - return 1; // L: 3776 - } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { // L: 3778 - IsaacCipher.Interpreter_intStackSize -= 4; // L: 3779 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3780 - boolean var10 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1] == 1; // L: 3781 - var8 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 3782 - boolean var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3] == 1; // L: 3783 - class118.sortWorldList(var3, var10, var8, var6); // L: 3784 - return 1; // L: 3785 - } else if (var0 != 6511) { // L: 3787 - if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { // L: 3808 - Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 3809 - return 1; // L: 3810 + return 1; + } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { + IsaacCipher.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + boolean var10 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1] == 1; + var8 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; + boolean var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3] == 1; + class118.sortWorldList(var3, var10, var8, var6); + return 1; + } else if (var0 != 6511) { + if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { + Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + return 1; } else { int var4; ParamComposition var5; - if (var0 == ScriptOpcodes.NC_PARAM) { // L: 3812 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 3813 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3814 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3815 - var5 = VerticalAlignment.getParamDefinition(var4); // L: 3816 - if (var5.isString()) { // L: 3817 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = WorldMapLabelSize.getNpcDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3818 + if (var0 == ScriptOpcodes.NC_PARAM) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + var5 = VerticalAlignment.getParamDefinition(var4); + if (var5.isString()) { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = WorldMapLabelSize.getNpcDefinition(var3).getStringParam(var4, var5.defaultStr); } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapLabelSize.getNpcDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3821 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapLabelSize.getNpcDefinition(var3).getIntParam(var4, var5.defaultInt); } - return 1; // L: 3823 - } else if (var0 == ScriptOpcodes.LC_PARAM) { // L: 3825 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 3826 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3827 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3828 - var5 = VerticalAlignment.getParamDefinition(var4); // L: 3829 - if (var5.isString()) { // L: 3830 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = class148.getObjectDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3831 + return 1; + } else if (var0 == ScriptOpcodes.LC_PARAM) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + var5 = VerticalAlignment.getParamDefinition(var4); + if (var5.isString()) { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = class148.getObjectDefinition(var3).getStringParam(var4, var5.defaultStr); } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class148.getObjectDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3834 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class148.getObjectDefinition(var3).getIntParam(var4, var5.defaultInt); } - return 1; // L: 3836 - } else if (var0 == ScriptOpcodes.OC_PARAM) { // L: 3838 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 3839 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3840 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3841 - var5 = VerticalAlignment.getParamDefinition(var4); // L: 3842 - if (var5.isString()) { // L: 3843 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = UserComparator6.ItemDefinition_get(var3).getStringParam(var4, var5.defaultStr); // L: 3844 + return 1; + } else if (var0 == ScriptOpcodes.OC_PARAM) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + var5 = VerticalAlignment.getParamDefinition(var4); + if (var5.isString()) { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = UserComparator6.ItemDefinition_get(var3).getStringParam(var4, var5.defaultStr); } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = UserComparator6.ItemDefinition_get(var3).getIntParam(var4, var5.defaultInt); // L: 3847 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = UserComparator6.ItemDefinition_get(var3).getIntParam(var4, var5.defaultInt); } - return 1; // L: 3849 - } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { // L: 3851 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 3852 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3853 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3854 - var5 = VerticalAlignment.getParamDefinition(var4); // L: 3855 - if (var5.isString()) { // L: 3856 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = class18.StructDefinition_getStructDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3857 + return 1; + } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + var5 = VerticalAlignment.getParamDefinition(var4); + if (var5.isString()) { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = class18.StructDefinition_getStructDefinition(var3).getStringParam(var4, var5.defaultStr); } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class18.StructDefinition_getStructDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3860 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class18.StructDefinition_getStructDefinition(var3).getIntParam(var4, var5.defaultInt); } - return 1; // L: 3862 - } else if (var0 == ScriptOpcodes.ON_MOBILE) { // L: 3864 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; // L: 3865 - return 1; // L: 3866 - } else if (var0 == ScriptOpcodes.CLIENTTYPE) { // L: 3868 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.clientType & 3; // L: 3869 - return 1; // L: 3870 - } else if (var0 == 6520) { // L: 3872 - return 1; // L: 3873 - } else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { // L: 3875 - return 1; // L: 3876 - } else if (var0 == 6522) { // L: 3878 - --class13.Interpreter_stringStackSize; // L: 3879 - --IsaacCipher.Interpreter_intStackSize; // L: 3880 - return 1; // L: 3881 - } else if (var0 == 6523) { // L: 3883 - --class13.Interpreter_stringStackSize; // L: 3884 - --IsaacCipher.Interpreter_intStackSize; // L: 3885 - return 1; // L: 3886 - } else if (var0 == ScriptOpcodes.MOBILE_BATTERYLEVEL) { // L: 3888 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 3889 - return 1; // L: 3890 - } else if (var0 == ScriptOpcodes.MOBILE_BATTERYCHARGING) { // L: 3892 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; // L: 3893 - return 1; // L: 3894 - } else if (var0 == ScriptOpcodes.MOBILE_WIFIAVAILABLE) { // L: 3896 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; // L: 3897 - return 1; // L: 3898 - } else if (var0 == 6527) { // L: 3900 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.field499; // L: 3901 - return 1; // L: 3902 + return 1; + } else if (var0 == ScriptOpcodes.ON_MOBILE) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLIENTTYPE) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.clientType & 3; + return 1; + } else if (var0 == 6520) { + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { + return 1; + } else if (var0 == 6522) { + --class13.Interpreter_stringStackSize; + --IsaacCipher.Interpreter_intStackSize; + return 1; + } else if (var0 == 6523) { + --class13.Interpreter_stringStackSize; + --IsaacCipher.Interpreter_intStackSize; + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_BATTERYLEVEL) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_BATTERYCHARGING) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_WIFIAVAILABLE) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; + return 1; + } else if (var0 == 6527) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.field499; + return 1; } else { - return 2; // L: 3904 + return 2; } } } else { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3788 - if (var3 >= 0 && var3 < World.World_count) { // L: 3789 - var7 = class334.World_worlds[var3]; // L: 3790 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.id; // L: 3791 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.properties; // L: 3792 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.activity; // L: 3793 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.location; // L: 3794 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.population; // L: 3795 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.host; // L: 3796 + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + if (var3 >= 0 && var3 < World.World_count) { + var7 = class334.World_worlds[var3]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.id; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.properties; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.activity; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.location; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.population; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.host; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 3799 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3800 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3801 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3802 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3803 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3804 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; } - return 1; // L: 3806 + return 1; } } } diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java index d249502ae4..46ef2edfdd 100644 --- a/runescape-client/src/main/java/Archive.java +++ b/runescape-client/src/main/java/Archive.java @@ -55,33 +55,33 @@ public class Archive extends AbstractArchive { int field3816; static { - Archive_crc = new CRC32(); // L: 17 + Archive_crc = new CRC32(); } @ObfuscatedSignature( descriptor = "(Lmy;Lmy;IZZZ)V" ) public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) { - super(var4, var5); // L: 23 - this.field3821 = false; // L: 14 - this.field3822 = false; // L: 15 - this.field3816 = -1; // L: 20 - this.archiveDisk = var1; // L: 24 - this.masterDisk = var2; // L: 25 - this.index = var3; // L: 26 - this.field3822 = var6; // L: 27 - int var8 = this.index; // L: 29 - if (WorldMapLabel.NetCache_reference != null) { // L: 31 - WorldMapLabel.NetCache_reference.offset = var8 * 8 + 5; // L: 32 - int var9 = WorldMapLabel.NetCache_reference.readInt(); // L: 33 - int var10 = WorldMapLabel.NetCache_reference.readInt(); // L: 34 - this.loadIndex(var9, var10); // L: 35 + super(var4, var5); + this.field3821 = false; + this.field3822 = false; + this.field3816 = -1; + this.archiveDisk = var1; + this.masterDisk = var2; + this.index = var3; + this.field3822 = var6; + int var8 = this.index; + if (WorldMapLabel.NetCache_reference != null) { + WorldMapLabel.NetCache_reference.offset = var8 * 8 + 5; + int var9 = WorldMapLabel.NetCache_reference.readInt(); + int var10 = WorldMapLabel.NetCache_reference.readInt(); + this.loadIndex(var9, var10); } else { - class269.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); // L: 38 - NetCache.NetCache_archives[var8] = this; // L: 39 + class269.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); + NetCache.NetCache_archives[var8] = this; } - } // L: 41 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -89,7 +89,7 @@ public class Archive extends AbstractArchive { garbageValue = "782340670" ) public boolean method5540() { - return this.field3821; // L: 44 + return this.field3821; } @ObfuscatedName("b") @@ -99,17 +99,17 @@ public class Archive extends AbstractArchive { ) @Export("percentage") public int percentage() { - if (this.field3821) { // L: 48 + if (this.field3821) { return 100; - } else if (super.groups != null) { // L: 49 + } else if (super.groups != null) { return 99; } else { - int var1 = IsaacCipher.method7886(255, this.index); // L: 50 - if (var1 >= 100) { // L: 51 + int var1 = IsaacCipher.method7886(255, this.index); + if (var1 >= 100) { var1 = 99; } - return var1; // L: 52 + return var1; } } @@ -120,8 +120,8 @@ public class Archive extends AbstractArchive { ) @Export("loadRegionFromGroup") void loadRegionFromGroup(int var1) { - PendingSpawn.method2225(this.index, var1); // L: 56 - } // L: 57 + PendingSpawn.method2225(this.index, var1); + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -131,12 +131,12 @@ public class Archive extends AbstractArchive { @Export("loadGroup") void loadGroup(int var1) { if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { - class10.method122(var1, this.archiveDisk, this); // L: 60 + class10.method122(var1, this.archiveDisk, this); } else { - class269.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); // L: 61 + class269.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); } - } // L: 62 + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -145,15 +145,15 @@ public class Archive extends AbstractArchive { ) @Export("loadIndex") void loadIndex(int var1, int var2) { - this.indexCrc = var1; // L: 65 - this.indexVersion = var2; // L: 66 - if (this.masterDisk != null) { // L: 67 + this.indexCrc = var1; + this.indexVersion = var2; + if (this.masterDisk != null) { class10.method122(this.index, this.masterDisk, this); } else { - class269.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 68 + class269.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); } - } // L: 69 + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -162,43 +162,43 @@ public class Archive extends AbstractArchive { ) @Export("write") void write(int var1, byte[] var2, boolean var3, boolean var4) { - if (var3) { // L: 72 - if (this.field3821) { // L: 73 - throw new RuntimeException(); // L: 74 + if (var3) { + if (this.field3821) { + throw new RuntimeException(); } - if (this.masterDisk != null) { // L: 76 + if (this.masterDisk != null) { NPCComposition.method3321(this.index, var2, this.masterDisk); } - this.decodeIndex(var2); // L: 77 - this.loadAllLocal(); // L: 78 + this.decodeIndex(var2); + this.loadAllLocal(); } else { - var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); // L: 81 - var2[var2.length - 1] = (byte)super.groupVersions[var1]; // L: 82 - if (this.archiveDisk != null) { // L: 83 - NPCComposition.method3321(var1, var2, this.archiveDisk); // L: 84 - this.validGroups[var1] = true; // L: 85 + var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); + var2[var2.length - 1] = (byte)super.groupVersions[var1]; + if (this.archiveDisk != null) { + NPCComposition.method3321(var1, var2, this.archiveDisk); + this.validGroups[var1] = true; } - if (var4) { // L: 87 - Object[] var5 = super.groups; // L: 88 + if (var4) { + Object[] var5 = super.groups; Object var7; - if (var2 == null) { // L: 92 - var7 = null; // L: 93 - } else if (var2.length > 136) { // L: 96 - DirectByteArrayCopier var8 = new DirectByteArrayCopier(); // L: 98 - var8.set(var2); // L: 99 - var7 = var8; // L: 100 + if (var2 == null) { + var7 = null; + } else if (var2.length > 136) { + DirectByteArrayCopier var8 = new DirectByteArrayCopier(); + var8.set(var2); + var7 = var8; } else { - var7 = var2; // L: 105 + var7 = var2; } - var5[var1] = var7; // L: 107 + var5[var1] = var7; } } - } // L: 110 + } @ObfuscatedName("j") @ObfuscatedSignature( @@ -208,88 +208,88 @@ public class Archive extends AbstractArchive { @Export("load") public void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { int var5; - if (var1 == this.masterDisk) { // L: 113 - if (this.field3821) { // L: 114 - throw new RuntimeException(); // L: 115 + if (var1 == this.masterDisk) { + if (this.field3821) { + throw new RuntimeException(); } - if (var3 == null) { // L: 117 - class269.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 118 - return; // L: 119 + if (var3 == null) { + class269.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); + return; } - Archive_crc.reset(); // L: 121 - Archive_crc.update(var3, 0, var3.length); // L: 122 - var5 = (int)Archive_crc.getValue(); // L: 123 - if (var5 != this.indexCrc) { // L: 124 - class269.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 125 - return; // L: 126 + Archive_crc.reset(); + Archive_crc.update(var3, 0, var3.length); + var5 = (int)Archive_crc.getValue(); + if (var5 != this.indexCrc) { + class269.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); + return; } - Buffer var11 = new Buffer(ViewportMouse.decompressBytes(var3)); // L: 128 - int var12 = var11.readUnsignedByte(); // L: 129 - if (var12 != 5 && var12 != 6) { // L: 130 + Buffer var11 = new Buffer(ViewportMouse.decompressBytes(var3)); + int var12 = var11.readUnsignedByte(); + if (var12 != 5 && var12 != 6) { throw new RuntimeException(var12 + "," + this.index + "," + var2); } - int var8 = 0; // L: 131 - if (var12 >= 6) { // L: 132 + int var8 = 0; + if (var12 >= 6) { var8 = var11.readInt(); } - if (var8 != this.indexVersion) { // L: 133 - class269.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 134 - return; // L: 135 + if (var8 != this.indexVersion) { + class269.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); + return; } - this.decodeIndex(var3); // L: 137 - this.loadAllLocal(); // L: 138 + this.decodeIndex(var3); + this.loadAllLocal(); } else { - if (!var4 && var2 == this.field3816) { // L: 141 - this.field3821 = true; // L: 142 + if (!var4 && var2 == this.field3816) { + this.field3821 = true; } - if (var3 == null || var3.length <= 2) { // L: 144 - this.validGroups[var2] = false; // L: 145 - if (this.field3822 || var4) { // L: 146 + if (var3 == null || var3.length <= 2) { + this.validGroups[var2] = false; + if (this.field3822 || var4) { class269.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } - return; // L: 147 + return; } - Archive_crc.reset(); // L: 149 - Archive_crc.update(var3, 0, var3.length - 2); // L: 150 - var5 = (int)Archive_crc.getValue(); // L: 151 - int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); // L: 152 - if (var5 != super.groupCrcs[var2] || var6 != super.groupVersions[var2]) { // L: 153 - this.validGroups[var2] = false; // L: 154 - if (this.field3822 || var4) { // L: 155 + Archive_crc.reset(); + Archive_crc.update(var3, 0, var3.length - 2); + var5 = (int)Archive_crc.getValue(); + int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); + if (var5 != super.groupCrcs[var2] || var6 != super.groupVersions[var2]) { + this.validGroups[var2] = false; + if (this.field3822 || var4) { class269.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } - return; // L: 156 + return; } - this.validGroups[var2] = true; // L: 158 - if (var4) { // L: 159 - Object[] var7 = super.groups; // L: 160 + this.validGroups[var2] = true; + if (var4) { + Object[] var7 = super.groups; Object var9; - if (var3 == null) { // L: 164 - var9 = null; // L: 165 - } else if (var3.length > 136) { // L: 168 - DirectByteArrayCopier var10 = new DirectByteArrayCopier(); // L: 170 - var10.set(var3); // L: 171 - var9 = var10; // L: 172 + if (var3 == null) { + var9 = null; + } else if (var3.length > 136) { + DirectByteArrayCopier var10 = new DirectByteArrayCopier(); + var10.set(var3); + var9 = var10; } else { - var9 = var3; // L: 177 + var9 = var3; } - var7[var2] = var9; // L: 179 + var7[var2] = var9; } } - } // L: 182 + } @ObfuscatedName("w") @ObfuscatedSignature( @@ -298,41 +298,41 @@ public class Archive extends AbstractArchive { ) @Export("loadAllLocal") void loadAllLocal() { - this.validGroups = new boolean[super.groups.length]; // L: 185 + this.validGroups = new boolean[super.groups.length]; int var1; - for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 186 + for (var1 = 0; var1 < this.validGroups.length; ++var1) { this.validGroups[var1] = false; } - if (this.archiveDisk == null) { // L: 187 - this.field3821 = true; // L: 188 + if (this.archiveDisk == null) { + this.field3821 = true; } else { - this.field3816 = -1; // L: 191 + this.field3816 = -1; - for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 192 - if (super.fileCounts[var1] > 0) { // L: 193 - ArchiveDisk var2 = this.archiveDisk; // L: 194 - ArchiveDiskAction var4 = new ArchiveDiskAction(); // L: 197 - var4.type = 1; // L: 198 - var4.key = (long)var1; // L: 199 - var4.archiveDisk = var2; // L: 200 - var4.archive = this; // L: 201 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 202 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var4); // L: 203 - } // L: 204 + for (var1 = 0; var1 < this.validGroups.length; ++var1) { + if (super.fileCounts[var1] > 0) { + ArchiveDisk var2 = this.archiveDisk; + ArchiveDiskAction var4 = new ArchiveDiskAction(); + var4.type = 1; + var4.key = (long)var1; + var4.archiveDisk = var2; + var4.archive = this; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var4); + } - class174.method3383(); // L: 205 - this.field3816 = var1; // L: 207 + class174.method3383(); + this.field3816 = var1; } } - if (this.field3816 == -1) { // L: 210 + if (this.field3816 == -1) { this.field3821 = true; } } - } // L: 189 211 + } @ObfuscatedName("n") @ObfuscatedSignature( @@ -341,10 +341,10 @@ public class Archive extends AbstractArchive { ) @Export("groupLoadPercent") int groupLoadPercent(int var1) { - if (super.groups[var1] != null) { // L: 214 + if (super.groups[var1] != null) { return 100; } else { - return this.validGroups[var1] ? 100 : IsaacCipher.method7886(this.index, var1); // L: 215 216 + return this.validGroups[var1] ? 100 : IsaacCipher.method7886(this.index, var1); } } @@ -354,7 +354,7 @@ public class Archive extends AbstractArchive { garbageValue = "-1796808817" ) public boolean method5570(int var1) { - return this.validGroups[var1]; // L: 220 + return this.validGroups[var1]; } @ObfuscatedName("o") @@ -363,7 +363,7 @@ public class Archive extends AbstractArchive { garbageValue = "832467152" ) public boolean method5584(int var1) { - return this.getGroupFileIds(var1) != null; // L: 224 + return this.getGroupFileIds(var1) != null; } @ObfuscatedName("v") @@ -373,22 +373,22 @@ public class Archive extends AbstractArchive { ) @Export("loadPercent") public int loadPercent() { - int var1 = 0; // L: 228 - int var2 = 0; // L: 229 + int var1 = 0; + int var2 = 0; int var3; - for (var3 = 0; var3 < super.groups.length; ++var3) { // L: 230 - if (super.fileCounts[var3] > 0) { // L: 231 - var1 += 100; // L: 232 - var2 += this.groupLoadPercent(var3); // L: 233 + for (var3 = 0; var3 < super.groups.length; ++var3) { + if (super.fileCounts[var3] > 0) { + var1 += 100; + var2 += this.groupLoadPercent(var3); } } - if (var1 == 0) { // L: 236 + if (var1 == 0) { return 100; } else { - var3 = var2 * 100 / var1; // L: 237 - return var3; // L: 238 + var3 = var2 * 100 / var1; + return var3; } } @@ -398,28 +398,28 @@ public class Archive extends AbstractArchive { garbageValue = "95" ) static final void method5586(Player var0, int var1, int var2, class185 var3) { - int var4 = var0.pathX[0]; // L: 8574 - int var5 = var0.pathY[0]; // L: 8575 - int var6 = var0.transformedSize(); // L: 8576 - if (var4 >= var6 && var4 < 104 - var6 && var5 >= var6 && var5 < 104 - var6) { // L: 8577 - if (var1 >= var6 && var1 < 104 - var6 && var2 >= var6 && var2 < 104 - var6) { // L: 8578 - int var8 = var0.transformedSize(); // L: 8580 - Client.field754.approxDestinationX = var1; // L: 8583 - Client.field754.approxDestinationY = var2; // L: 8584 - Client.field754.field2117 = 1; // L: 8585 - Client.field754.field2114 = 1; // L: 8586 - ApproximateRouteStrategy var9 = Client.field754; // L: 8587 - ApproximateRouteStrategy var10 = var9; // L: 8589 - CollisionMap var11 = Client.collisionMaps[var0.plane]; // L: 8590 - int[] var12 = Client.field755; // L: 8591 - int[] var13 = Client.field756; // L: 8592 + int var4 = var0.pathX[0]; + int var5 = var0.pathY[0]; + int var6 = var0.transformedSize(); + if (var4 >= var6 && var4 < 104 - var6 && var5 >= var6 && var5 < 104 - var6) { + if (var1 >= var6 && var1 < 104 - var6 && var2 >= var6 && var2 < 104 - var6) { + int var8 = var0.transformedSize(); + Client.field754.approxDestinationX = var1; + Client.field754.approxDestinationY = var2; + Client.field754.field2117 = 1; + Client.field754.field2114 = 1; + ApproximateRouteStrategy var9 = Client.field754; + ApproximateRouteStrategy var10 = var9; + CollisionMap var11 = Client.collisionMaps[var0.plane]; + int[] var12 = Client.field755; + int[] var13 = Client.field756; int var14; int var15; - for (var14 = 0; var14 < 128; ++var14) { // L: 8594 - for (var15 = 0; var15 < 128; ++var15) { // L: 8595 - class186.directions[var14][var15] = 0; // L: 8596 - class186.distances[var14][var15] = 99999999; // L: 8597 + for (var14 = 0; var14 < 128; ++var14) { + for (var15 = 0; var15 < 128; ++var15) { + class186.directions[var14][var15] = 0; + class186.distances[var14][var15] = 99999999; } } @@ -436,219 +436,219 @@ public class Archive extends AbstractArchive { int var36; int var37; int var39; - if (var8 == 1) { // L: 8601 - var16 = var4; // L: 8604 - var17 = var5; // L: 8605 - byte var18 = 64; // L: 8606 - var19 = 64; // L: 8607 - var20 = var4 - var18; // L: 8608 - var21 = var5 - var19; // L: 8609 - class186.directions[var18][var19] = 99; // L: 8610 - class186.distances[var18][var19] = 0; // L: 8611 - byte var22 = 0; // L: 8612 - var23 = 0; // L: 8613 - class186.bufferX[var22] = var4; // L: 8614 + if (var8 == 1) { + var16 = var4; + var17 = var5; + byte var18 = 64; + var19 = 64; + var20 = var4 - var18; + var21 = var5 - var19; + class186.directions[var18][var19] = 99; + class186.distances[var18][var19] = 0; + byte var22 = 0; + var23 = 0; + class186.bufferX[var22] = var4; var39 = var22 + 1; - class186.bufferY[var22] = var5; // L: 8615 - int[][] var24 = var11.flags; // L: 8616 + class186.bufferY[var22] = var5; + int[][] var24 = var11.flags; boolean var35; while (true) { - if (var39 == var23) { // L: 8619 - class186.field2129 = var16; // L: 8691 - class186.field2130 = var17; // L: 8692 - var35 = false; // L: 8693 + if (var39 == var23) { + class186.field2129 = var16; + class186.field2130 = var17; + var35 = false; break; } - var16 = class186.bufferX[var23]; // L: 8620 - var17 = class186.bufferY[var23]; // L: 8621 - var23 = var23 + 1 & 4095; // L: 8622 - var36 = var16 - var20; // L: 8623 - var37 = var17 - var21; // L: 8624 - var25 = var16 - var11.xInset; // L: 8625 - var26 = var17 - var11.yInset; // L: 8626 - if (var10.hasArrived(1, var16, var17, var11)) { // L: 8627 - class186.field2129 = var16; // L: 8628 - class186.field2130 = var17; // L: 8629 - var35 = true; // L: 8630 + var16 = class186.bufferX[var23]; + var17 = class186.bufferY[var23]; + var23 = var23 + 1 & 4095; + var36 = var16 - var20; + var37 = var17 - var21; + var25 = var16 - var11.xInset; + var26 = var17 - var11.yInset; + if (var10.hasArrived(1, var16, var17, var11)) { + class186.field2129 = var16; + class186.field2130 = var17; + var35 = true; break; } - var27 = class186.distances[var36][var37] + 1; // L: 8633 - if (var36 > 0 && class186.directions[var36 - 1][var37] == 0 && (var24[var25 - 1][var26] & 19136776) == 0) { // L: 8634 - class186.bufferX[var39] = var16 - 1; // L: 8635 - class186.bufferY[var39] = var17; // L: 8636 - var39 = var39 + 1 & 4095; // L: 8637 - class186.directions[var36 - 1][var37] = 2; // L: 8638 - class186.distances[var36 - 1][var37] = var27; // L: 8639 + var27 = class186.distances[var36][var37] + 1; + if (var36 > 0 && class186.directions[var36 - 1][var37] == 0 && (var24[var25 - 1][var26] & 19136776) == 0) { + class186.bufferX[var39] = var16 - 1; + class186.bufferY[var39] = var17; + var39 = var39 + 1 & 4095; + class186.directions[var36 - 1][var37] = 2; + class186.distances[var36 - 1][var37] = var27; } - if (var36 < 127 && class186.directions[var36 + 1][var37] == 0 && (var24[var25 + 1][var26] & 19136896) == 0) { // L: 8641 - class186.bufferX[var39] = var16 + 1; // L: 8642 - class186.bufferY[var39] = var17; // L: 8643 - var39 = var39 + 1 & 4095; // L: 8644 - class186.directions[var36 + 1][var37] = 8; // L: 8645 - class186.distances[var36 + 1][var37] = var27; // L: 8646 + if (var36 < 127 && class186.directions[var36 + 1][var37] == 0 && (var24[var25 + 1][var26] & 19136896) == 0) { + class186.bufferX[var39] = var16 + 1; + class186.bufferY[var39] = var17; + var39 = var39 + 1 & 4095; + class186.directions[var36 + 1][var37] = 8; + class186.distances[var36 + 1][var37] = var27; } - if (var37 > 0 && class186.directions[var36][var37 - 1] == 0 && (var24[var25][var26 - 1] & 19136770) == 0) { // L: 8648 - class186.bufferX[var39] = var16; // L: 8649 - class186.bufferY[var39] = var17 - 1; // L: 8650 - var39 = var39 + 1 & 4095; // L: 8651 - class186.directions[var36][var37 - 1] = 1; // L: 8652 - class186.distances[var36][var37 - 1] = var27; // L: 8653 + if (var37 > 0 && class186.directions[var36][var37 - 1] == 0 && (var24[var25][var26 - 1] & 19136770) == 0) { + class186.bufferX[var39] = var16; + class186.bufferY[var39] = var17 - 1; + var39 = var39 + 1 & 4095; + class186.directions[var36][var37 - 1] = 1; + class186.distances[var36][var37 - 1] = var27; } - if (var37 < 127 && class186.directions[var36][var37 + 1] == 0 && (var24[var25][var26 + 1] & 19136800) == 0) { // L: 8655 - class186.bufferX[var39] = var16; // L: 8656 - class186.bufferY[var39] = var17 + 1; // L: 8657 - var39 = var39 + 1 & 4095; // L: 8658 - class186.directions[var36][var37 + 1] = 4; // L: 8659 - class186.distances[var36][var37 + 1] = var27; // L: 8660 + if (var37 < 127 && class186.directions[var36][var37 + 1] == 0 && (var24[var25][var26 + 1] & 19136800) == 0) { + class186.bufferX[var39] = var16; + class186.bufferY[var39] = var17 + 1; + var39 = var39 + 1 & 4095; + class186.directions[var36][var37 + 1] = 4; + class186.distances[var36][var37 + 1] = var27; } - if (var36 > 0 && var37 > 0 && class186.directions[var36 - 1][var37 - 1] == 0 && (var24[var25 - 1][var26 - 1] & 19136782) == 0 && (var24[var25 - 1][var26] & 19136776) == 0 && (var24[var25][var26 - 1] & 19136770) == 0) { // L: 8662 - class186.bufferX[var39] = var16 - 1; // L: 8663 - class186.bufferY[var39] = var17 - 1; // L: 8664 - var39 = var39 + 1 & 4095; // L: 8665 - class186.directions[var36 - 1][var37 - 1] = 3; // L: 8666 - class186.distances[var36 - 1][var37 - 1] = var27; // L: 8667 + if (var36 > 0 && var37 > 0 && class186.directions[var36 - 1][var37 - 1] == 0 && (var24[var25 - 1][var26 - 1] & 19136782) == 0 && (var24[var25 - 1][var26] & 19136776) == 0 && (var24[var25][var26 - 1] & 19136770) == 0) { + class186.bufferX[var39] = var16 - 1; + class186.bufferY[var39] = var17 - 1; + var39 = var39 + 1 & 4095; + class186.directions[var36 - 1][var37 - 1] = 3; + class186.distances[var36 - 1][var37 - 1] = var27; } - if (var36 < 127 && var37 > 0 && class186.directions[var36 + 1][var37 - 1] == 0 && (var24[var25 + 1][var26 - 1] & 19136899) == 0 && (var24[var25 + 1][var26] & 19136896) == 0 && (var24[var25][var26 - 1] & 19136770) == 0) { // L: 8669 - class186.bufferX[var39] = var16 + 1; // L: 8670 - class186.bufferY[var39] = var17 - 1; // L: 8671 - var39 = var39 + 1 & 4095; // L: 8672 - class186.directions[var36 + 1][var37 - 1] = 9; // L: 8673 - class186.distances[var36 + 1][var37 - 1] = var27; // L: 8674 + if (var36 < 127 && var37 > 0 && class186.directions[var36 + 1][var37 - 1] == 0 && (var24[var25 + 1][var26 - 1] & 19136899) == 0 && (var24[var25 + 1][var26] & 19136896) == 0 && (var24[var25][var26 - 1] & 19136770) == 0) { + class186.bufferX[var39] = var16 + 1; + class186.bufferY[var39] = var17 - 1; + var39 = var39 + 1 & 4095; + class186.directions[var36 + 1][var37 - 1] = 9; + class186.distances[var36 + 1][var37 - 1] = var27; } - if (var36 > 0 && var37 < 127 && class186.directions[var36 - 1][var37 + 1] == 0 && (var24[var25 - 1][var26 + 1] & 19136824) == 0 && (var24[var25 - 1][var26] & 19136776) == 0 && (var24[var25][var26 + 1] & 19136800) == 0) { // L: 8676 - class186.bufferX[var39] = var16 - 1; // L: 8677 - class186.bufferY[var39] = var17 + 1; // L: 8678 - var39 = var39 + 1 & 4095; // L: 8679 - class186.directions[var36 - 1][var37 + 1] = 6; // L: 8680 - class186.distances[var36 - 1][var37 + 1] = var27; // L: 8681 + if (var36 > 0 && var37 < 127 && class186.directions[var36 - 1][var37 + 1] == 0 && (var24[var25 - 1][var26 + 1] & 19136824) == 0 && (var24[var25 - 1][var26] & 19136776) == 0 && (var24[var25][var26 + 1] & 19136800) == 0) { + class186.bufferX[var39] = var16 - 1; + class186.bufferY[var39] = var17 + 1; + var39 = var39 + 1 & 4095; + class186.directions[var36 - 1][var37 + 1] = 6; + class186.distances[var36 - 1][var37 + 1] = var27; } - if (var36 < 127 && var37 < 127 && class186.directions[var36 + 1][var37 + 1] == 0 && (var24[var25 + 1][var26 + 1] & 19136992) == 0 && (var24[var25 + 1][var26] & 19136896) == 0 && (var24[var25][var26 + 1] & 19136800) == 0) { // L: 8683 - class186.bufferX[var39] = var16 + 1; // L: 8684 - class186.bufferY[var39] = var17 + 1; // L: 8685 - var39 = var39 + 1 & 4095; // L: 8686 - class186.directions[var36 + 1][var37 + 1] = 12; // L: 8687 - class186.distances[var36 + 1][var37 + 1] = var27; // L: 8688 + if (var36 < 127 && var37 < 127 && class186.directions[var36 + 1][var37 + 1] == 0 && (var24[var25 + 1][var26 + 1] & 19136992) == 0 && (var24[var25 + 1][var26] & 19136896) == 0 && (var24[var25][var26 + 1] & 19136800) == 0) { + class186.bufferX[var39] = var16 + 1; + class186.bufferY[var39] = var17 + 1; + var39 = var39 + 1 & 4095; + class186.directions[var36 + 1][var37 + 1] = 12; + class186.distances[var36 + 1][var37 + 1] = var27; } } - var34 = var35; // L: 8695 - } else if (var8 == 2) { // L: 8697 + var34 = var35; + } else if (var8 == 2) { var34 = Clock.method3132(var4, var5, var9, var11); } else { - var34 = UserComparator2.method7617(var4, var5, var8, var9, var11); // L: 8698 + var34 = UserComparator2.method7617(var4, var5, var8, var9, var11); } int var7; label346: { - var15 = var4 - 64; // L: 8699 - var16 = var5 - 64; // L: 8700 - var17 = class186.field2129; // L: 8701 - var36 = class186.field2130; // L: 8702 - if (!var34) { // L: 8703 - var37 = Integer.MAX_VALUE; // L: 8705 - var20 = Integer.MAX_VALUE; // L: 8706 - byte var38 = 10; // L: 8707 - var39 = var10.approxDestinationX; // L: 8708 - var23 = var10.approxDestinationY; // L: 8709 - int var33 = var10.field2117; // L: 8710 - var25 = var10.field2114; // L: 8711 + var15 = var4 - 64; + var16 = var5 - 64; + var17 = class186.field2129; + var36 = class186.field2130; + if (!var34) { + var37 = Integer.MAX_VALUE; + var20 = Integer.MAX_VALUE; + byte var38 = 10; + var39 = var10.approxDestinationX; + var23 = var10.approxDestinationY; + int var33 = var10.field2117; + var25 = var10.field2114; - for (var26 = var39 - var38; var26 <= var38 + var39; ++var26) { // L: 8712 - for (var27 = var23 - var38; var27 <= var23 + var38; ++var27) { // L: 8713 - int var28 = var26 - var15; // L: 8714 - int var29 = var27 - var16; // L: 8715 - if (var28 >= 0 && var29 >= 0 && var28 < 128 && var29 < 128 && class186.distances[var28][var29] < 100) { // L: 8716 8717 - int var30 = 0; // L: 8718 - if (var26 < var39) { // L: 8719 + for (var26 = var39 - var38; var26 <= var38 + var39; ++var26) { + for (var27 = var23 - var38; var27 <= var23 + var38; ++var27) { + int var28 = var26 - var15; + int var29 = var27 - var16; + if (var28 >= 0 && var29 >= 0 && var28 < 128 && var29 < 128 && class186.distances[var28][var29] < 100) { + int var30 = 0; + if (var26 < var39) { var30 = var39 - var26; - } else if (var26 > var39 + var33 - 1) { // L: 8720 + } else if (var26 > var39 + var33 - 1) { var30 = var26 - (var39 + var33 - 1); } - int var31 = 0; // L: 8721 - if (var27 < var23) { // L: 8722 + int var31 = 0; + if (var27 < var23) { var31 = var23 - var27; } else if (var27 > var25 + var23 - 1) { - var31 = var27 - (var23 + var25 - 1); // L: 8723 + var31 = var27 - (var23 + var25 - 1); } - int var32 = var30 * var30 + var31 * var31; // L: 8724 - if (var32 < var37 || var32 == var37 && class186.distances[var28][var29] < var20) { // L: 8725 - var37 = var32; // L: 8726 - var20 = class186.distances[var28][var29]; // L: 8727 - var17 = var26; // L: 8728 - var36 = var27; // L: 8729 + int var32 = var30 * var30 + var31 * var31; + if (var32 < var37 || var32 == var37 && class186.distances[var28][var29] < var20) { + var37 = var32; + var20 = class186.distances[var28][var29]; + var17 = var26; + var36 = var27; } } } } - if (var37 == Integer.MAX_VALUE) { // L: 8735 - var7 = -1; // L: 8736 + if (var37 == Integer.MAX_VALUE) { + var7 = -1; break label346; } } - if (var4 == var17 && var36 == var5) { // L: 8745 - var7 = 0; // L: 8746 + if (var4 == var17 && var36 == var5) { + var7 = 0; } else { - var19 = 0; // L: 8749 - class186.bufferX[var19] = var17; // L: 8752 + var19 = 0; + class186.bufferX[var19] = var17; var37 = var19 + 1; - class186.bufferY[var19] = var36; // L: 8753 + class186.bufferY[var19] = var36; - for (var20 = var21 = class186.directions[var17 - var15][var36 - var16]; var17 != var4 || var36 != var5; var20 = class186.directions[var17 - var15][var36 - var16]) { // L: 8754 8755 8765 - if (var20 != var21) { // L: 8756 - var21 = var20; // L: 8757 - class186.bufferX[var37] = var17; // L: 8758 - class186.bufferY[var37++] = var36; // L: 8759 + for (var20 = var21 = class186.directions[var17 - var15][var36 - var16]; var17 != var4 || var36 != var5; var20 = class186.directions[var17 - var15][var36 - var16]) { + if (var20 != var21) { + var21 = var20; + class186.bufferX[var37] = var17; + class186.bufferY[var37++] = var36; } - if ((var20 & 2) != 0) { // L: 8761 + if ((var20 & 2) != 0) { ++var17; - } else if ((var20 & 8) != 0) { // L: 8762 + } else if ((var20 & 8) != 0) { --var17; } - if ((var20 & 1) != 0) { // L: 8763 + if ((var20 & 1) != 0) { ++var36; - } else if ((var20 & 4) != 0) { // L: 8764 + } else if ((var20 & 4) != 0) { --var36; } } - var39 = 0; // L: 8767 + var39 = 0; - while (var37-- > 0) { // L: 8768 - var12[var39] = class186.bufferX[var37]; // L: 8769 - var13[var39++] = class186.bufferY[var37]; // L: 8770 - if (var39 >= var12.length) { // L: 8771 + while (var37-- > 0) { + var12[var39] = class186.bufferX[var37]; + var13[var39++] = class186.bufferY[var37]; + if (var39 >= var12.length) { break; } } - var7 = var39; // L: 8773 + var7 = var39; } } - var14 = var7; // L: 8775 - if (var7 >= 1) { // L: 8776 - for (var15 = 0; var15 < var14 - 1; ++var15) { // L: 8777 + var14 = var7; + if (var7 >= 1) { + for (var15 = 0; var15 < var14 - 1; ++var15) { var0.method2177(Client.field755[var15], Client.field756[var15], var3); } } } } - } // L: 8778 + } } diff --git a/runescape-client/src/main/java/ArchiveDisk.java b/runescape-client/src/main/java/ArchiveDisk.java index fd6306e2a3..8b4485ed69 100644 --- a/runescape-client/src/main/java/ArchiveDisk.java +++ b/runescape-client/src/main/java/ArchiveDisk.java @@ -38,21 +38,21 @@ public final class ArchiveDisk { int maxEntrySize; static { - ArchiveDisk_buffer = new byte[520]; // L: 7 + ArchiveDisk_buffer = new byte[520]; } @ObfuscatedSignature( descriptor = "(ILof;Lof;I)V" ) public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) { - this.datFile = null; // L: 8 - this.idxFile = null; // L: 9 - this.maxEntrySize = 65000; // L: 11 - this.archive = var1; // L: 14 - this.datFile = var2; // L: 15 - this.idxFile = var3; // L: 16 - this.maxEntrySize = var4; // L: 17 - } // L: 18 + this.datFile = null; + this.idxFile = null; + this.maxEntrySize = 65000; + this.archive = var1; + this.datFile = var2; + this.idxFile = var3; + this.maxEntrySize = var4; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -61,28 +61,28 @@ public final class ArchiveDisk { ) @Export("read") public byte[] read(int var1) { - synchronized(this.datFile) { // L: 21 + synchronized(this.datFile) { try { Object var10000; - if (this.idxFile.length() < (long)(var1 * 6 + 6)) { // L: 23 + if (this.idxFile.length() < (long)(var1 * 6 + 6)) { var10000 = null; return (byte[])var10000; } else { - this.idxFile.seek((long)(var1 * 6)); // L: 24 - this.idxFile.read(ArchiveDisk_buffer, 0, 6); // L: 25 - int var3 = ((ArchiveDisk_buffer[0] & 255) << 16) + (ArchiveDisk_buffer[2] & 255) + ((ArchiveDisk_buffer[1] & 255) << 8); // L: 26 - int var4 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[3] & 255) << 16) + ((ArchiveDisk_buffer[4] & 255) << 8); // L: 27 - if (var3 < 0 || var3 > this.maxEntrySize) { // L: 28 + this.idxFile.seek((long)(var1 * 6)); + this.idxFile.read(ArchiveDisk_buffer, 0, 6); + int var3 = ((ArchiveDisk_buffer[0] & 255) << 16) + (ArchiveDisk_buffer[2] & 255) + ((ArchiveDisk_buffer[1] & 255) << 8); + int var4 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[3] & 255) << 16) + ((ArchiveDisk_buffer[4] & 255) << 8); + if (var3 < 0 || var3 > this.maxEntrySize) { var10000 = null; return (byte[])var10000; - } else if (var4 <= 0 || (long)var4 > this.datFile.length() / 520L) { // L: 29 + } else if (var4 <= 0 || (long)var4 > this.datFile.length() / 520L) { var10000 = null; return (byte[])var10000; } else { - byte[] var5 = new byte[var3]; // L: 30 - int var6 = 0; // L: 31 + byte[] var5 = new byte[var3]; + int var6 = 0; - for (int var7 = 0; var6 < var3; ++var7) { // L: 32 65 + for (int var7 = 0; var6 < var3; ++var7) { if (var4 == 0) { var10000 = null; return (byte[])var10000; @@ -95,55 +95,55 @@ public final class ArchiveDisk { int var11; int var12; byte var13; - if (var1 > 65535) { // L: 42 - if (var8 > 510) { // L: 43 + if (var1 > 65535) { + if (var8 > 510) { var8 = 510; } - var13 = 10; // L: 44 - 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 - var12 = ArchiveDisk_buffer[9] & 255; // L: 49 + var13 = 10; + this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13); + var9 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); + var10 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[4] & 255) << 8); + var11 = (ArchiveDisk_buffer[8] & 255) + ((ArchiveDisk_buffer[7] & 255) << 8) + ((ArchiveDisk_buffer[6] & 255) << 16); + var12 = ArchiveDisk_buffer[9] & 255; } else { - if (var8 > 512) { // L: 52 + if (var8 > 512) { var8 = 512; } - var13 = 8; // L: 53 - 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 + var13 = 8; + this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13); + var9 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); + var10 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); + var11 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255); + var12 = ArchiveDisk_buffer[7] & 255; } - if (var9 != var1 || var7 != var10 || var12 != this.archive) { // L: 60 + if (var9 != var1 || var7 != var10 || var12 != this.archive) { var10000 = null; return (byte[])var10000; } - if (var11 < 0 || (long)var11 > this.datFile.length() / 520L) { // L: 61 + if (var11 < 0 || (long)var11 > this.datFile.length() / 520L) { var10000 = null; return (byte[])var10000; } - int var14 = var13 + var8; // L: 62 + int var14 = var13 + var8; - for (int var15 = var13; var15 < var14; ++var15) { // L: 63 + for (int var15 = var13; var15 < var14; ++var15) { var5[var6++] = ArchiveDisk_buffer[var15]; } - var4 = var11; // L: 64 + var4 = var11; } byte[] var20 = var5; - return var20; // L: 67 + return var20; } } - } catch (IOException var18) { // L: 69 - return null; // L: 70 + } catch (IOException var18) { + return null; } } } @@ -155,16 +155,16 @@ public final class ArchiveDisk { ) @Export("write") public boolean write(int var1, byte[] var2, int var3) { - synchronized(this.datFile) { // L: 76 - if (var3 >= 0 && var3 <= this.maxEntrySize) { // L: 77 - boolean var5 = this.write0(var1, var2, var3, true); // L: 80 - if (!var5) { // L: 81 + synchronized(this.datFile) { + if (var3 >= 0 && var3 <= this.maxEntrySize) { + boolean var5 = this.write0(var1, var2, var3, true); + if (!var5) { var5 = this.write0(var1, var2, var3, false); } - return var5; // L: 82 + return var5; } else { - throw new IllegalArgumentException("" + this.archive + ',' + var1 + ',' + var3); // L: 78 + throw new IllegalArgumentException("" + this.archive + ',' + var1 + ',' + var3); } } } @@ -176,162 +176,162 @@ public final class ArchiveDisk { ) @Export("write0") boolean write0(int var1, byte[] var2, int var3, boolean var4) { - synchronized(this.datFile) { // L: 87 + synchronized(this.datFile) { try { int var6; boolean var10000; - if (var4) { // L: 90 - if (this.idxFile.length() < (long)(var1 * 6 + 6)) { // L: 91 + if (var4) { + if (this.idxFile.length() < (long)(var1 * 6 + 6)) { var10000 = false; return var10000; } - this.idxFile.seek((long)(var1 * 6)); // L: 92 - this.idxFile.read(ArchiveDisk_buffer, 0, 6); // L: 93 - var6 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[3] & 255) << 16) + ((ArchiveDisk_buffer[4] & 255) << 8); // L: 94 - if (var6 <= 0 || (long)var6 > this.datFile.length() / 520L) { // L: 95 + this.idxFile.seek((long)(var1 * 6)); + this.idxFile.read(ArchiveDisk_buffer, 0, 6); + var6 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[3] & 255) << 16) + ((ArchiveDisk_buffer[4] & 255) << 8); + if (var6 <= 0 || (long)var6 > this.datFile.length() / 520L) { var10000 = false; return var10000; } } else { - var6 = (int)((this.datFile.length() + 519L) / 520L); // L: 98 - if (var6 == 0) { // L: 99 + var6 = (int)((this.datFile.length() + 519L) / 520L); + if (var6 == 0) { var6 = 1; } } - ArchiveDisk_buffer[0] = (byte)(var3 >> 16); // L: 101 - ArchiveDisk_buffer[1] = (byte)(var3 >> 8); // L: 102 - ArchiveDisk_buffer[2] = (byte)var3; // L: 103 - ArchiveDisk_buffer[3] = (byte)(var6 >> 16); // L: 104 - ArchiveDisk_buffer[4] = (byte)(var6 >> 8); // L: 105 - ArchiveDisk_buffer[5] = (byte)var6; // L: 106 - this.idxFile.seek((long)(var1 * 6)); // L: 107 - this.idxFile.write(ArchiveDisk_buffer, 0, 6); // L: 108 - int var7 = 0; // L: 109 - int var8 = 0; // L: 110 + ArchiveDisk_buffer[0] = (byte)(var3 >> 16); + ArchiveDisk_buffer[1] = (byte)(var3 >> 8); + ArchiveDisk_buffer[2] = (byte)var3; + ArchiveDisk_buffer[3] = (byte)(var6 >> 16); + ArchiveDisk_buffer[4] = (byte)(var6 >> 8); + ArchiveDisk_buffer[5] = (byte)var6; + this.idxFile.seek((long)(var1 * 6)); + this.idxFile.write(ArchiveDisk_buffer, 0, 6); + int var7 = 0; + int var8 = 0; while (true) { - if (var7 < var3) { // L: 111 + if (var7 < var3) { label171: { - int var9 = 0; // L: 112 + int var9 = 0; int var10; - if (var4) { // L: 113 - this.datFile.seek((long)var6 * 520L); // L: 114 + if (var4) { + this.datFile.seek((long)var6 * 520L); int var11; int var12; - if (var1 > 65535) { // L: 118 + if (var1 > 65535) { try { - this.datFile.read(ArchiveDisk_buffer, 0, 10); // L: 120 - } catch (EOFException var17) { // L: 122 - break label171; // L: 123 + this.datFile.read(ArchiveDisk_buffer, 0, 10); + } catch (EOFException var17) { + break label171; } - var10 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); // L: 125 - var11 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[4] & 255) << 8); // L: 126 - var9 = (ArchiveDisk_buffer[8] & 255) + ((ArchiveDisk_buffer[7] & 255) << 8) + ((ArchiveDisk_buffer[6] & 255) << 16); // L: 127 - var12 = ArchiveDisk_buffer[9] & 255; // L: 128 + var10 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); + var11 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[4] & 255) << 8); + var9 = (ArchiveDisk_buffer[8] & 255) + ((ArchiveDisk_buffer[7] & 255) << 8) + ((ArchiveDisk_buffer[6] & 255) << 16); + var12 = ArchiveDisk_buffer[9] & 255; } else { try { - this.datFile.read(ArchiveDisk_buffer, 0, 8); // L: 132 - } catch (EOFException var16) { // L: 134 - break label171; // L: 135 + this.datFile.read(ArchiveDisk_buffer, 0, 8); + } catch (EOFException var16) { + break label171; } - var10 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); // L: 137 - var11 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); // L: 138 - var9 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255); // L: 139 - var12 = ArchiveDisk_buffer[7] & 255; // L: 140 + var10 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); + var11 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); + var9 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255); + var12 = ArchiveDisk_buffer[7] & 255; } - if (var10 != var1 || var11 != var8 || var12 != this.archive) { // L: 142 + if (var10 != var1 || var11 != var8 || var12 != this.archive) { var10000 = false; return var10000; } - if (var9 < 0 || (long)var9 > this.datFile.length() / 520L) { // L: 143 + if (var9 < 0 || (long)var9 > this.datFile.length() / 520L) { var10000 = false; return var10000; } } - if (var9 == 0) { // L: 145 - var4 = false; // L: 146 - var9 = (int)((this.datFile.length() + 519L) / 520L); // L: 147 - if (var9 == 0) { // L: 148 + if (var9 == 0) { + var4 = false; + var9 = (int)((this.datFile.length() + 519L) / 520L); + if (var9 == 0) { ++var9; } - if (var6 == var9) { // L: 149 + if (var6 == var9) { ++var9; } } - if (var1 > 65535) { // L: 151 - if (var3 - var7 <= 510) { // L: 152 + if (var1 > 65535) { + if (var3 - var7 <= 510) { var9 = 0; } - ArchiveDisk_buffer[0] = (byte)(var1 >> 24); // L: 153 - ArchiveDisk_buffer[1] = (byte)(var1 >> 16); // L: 154 - ArchiveDisk_buffer[2] = (byte)(var1 >> 8); // L: 155 - ArchiveDisk_buffer[3] = (byte)var1; // L: 156 - ArchiveDisk_buffer[4] = (byte)(var8 >> 8); // L: 157 - ArchiveDisk_buffer[5] = (byte)var8; // L: 158 - ArchiveDisk_buffer[6] = (byte)(var9 >> 16); // L: 159 - ArchiveDisk_buffer[7] = (byte)(var9 >> 8); // L: 160 - ArchiveDisk_buffer[8] = (byte)var9; // L: 161 - ArchiveDisk_buffer[9] = (byte)this.archive; // L: 162 - this.datFile.seek((long)var6 * 520L); // L: 163 - this.datFile.write(ArchiveDisk_buffer, 0, 10); // L: 164 - var10 = var3 - var7; // L: 165 - if (var10 > 510) { // L: 166 + ArchiveDisk_buffer[0] = (byte)(var1 >> 24); + ArchiveDisk_buffer[1] = (byte)(var1 >> 16); + ArchiveDisk_buffer[2] = (byte)(var1 >> 8); + ArchiveDisk_buffer[3] = (byte)var1; + ArchiveDisk_buffer[4] = (byte)(var8 >> 8); + ArchiveDisk_buffer[5] = (byte)var8; + ArchiveDisk_buffer[6] = (byte)(var9 >> 16); + ArchiveDisk_buffer[7] = (byte)(var9 >> 8); + ArchiveDisk_buffer[8] = (byte)var9; + ArchiveDisk_buffer[9] = (byte)this.archive; + this.datFile.seek((long)var6 * 520L); + this.datFile.write(ArchiveDisk_buffer, 0, 10); + var10 = var3 - var7; + if (var10 > 510) { var10 = 510; } - this.datFile.write(var2, var7, var10); // L: 167 - var7 += var10; // L: 168 + this.datFile.write(var2, var7, var10); + var7 += var10; } else { - if (var3 - var7 <= 512) { // L: 171 + if (var3 - var7 <= 512) { var9 = 0; } - ArchiveDisk_buffer[0] = (byte)(var1 >> 8); // L: 172 - ArchiveDisk_buffer[1] = (byte)var1; // L: 173 - ArchiveDisk_buffer[2] = (byte)(var8 >> 8); // L: 174 - ArchiveDisk_buffer[3] = (byte)var8; // L: 175 - ArchiveDisk_buffer[4] = (byte)(var9 >> 16); // L: 176 - 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((long)var6 * 520L); // L: 180 - this.datFile.write(ArchiveDisk_buffer, 0, 8); // L: 181 - var10 = var3 - var7; // L: 182 - if (var10 > 512) { // L: 183 + ArchiveDisk_buffer[0] = (byte)(var1 >> 8); + ArchiveDisk_buffer[1] = (byte)var1; + ArchiveDisk_buffer[2] = (byte)(var8 >> 8); + ArchiveDisk_buffer[3] = (byte)var8; + ArchiveDisk_buffer[4] = (byte)(var9 >> 16); + ArchiveDisk_buffer[5] = (byte)(var9 >> 8); + ArchiveDisk_buffer[6] = (byte)var9; + ArchiveDisk_buffer[7] = (byte)this.archive; + this.datFile.seek((long)var6 * 520L); + this.datFile.write(ArchiveDisk_buffer, 0, 8); + var10 = var3 - var7; + if (var10 > 512) { var10 = 512; } - this.datFile.write(var2, var7, var10); // L: 184 - var7 += var10; // L: 185 + this.datFile.write(var2, var7, var10); + var7 += var10; } - var6 = var9; // L: 187 - ++var8; // L: 188 - continue; // L: 189 + var6 = var9; + ++var8; + continue; } } - var10000 = true; // L: 190 + var10000 = true; return var10000; } - } catch (IOException var18) { // L: 192 - return false; // L: 193 + } catch (IOException var18) { + return false; } } } public String toString() { - return "" + this.archive; // L: 198 + return "" + this.archive; } @ObfuscatedName("b") @@ -341,18 +341,18 @@ public final class ArchiveDisk { ) @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 + KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); + if (var1 != null) { return var1; } else { - byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); // L: 35 - var1 = new KitDefinition(); // L: 36 - if (var2 != null) { // L: 37 + byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); + var1 = new KitDefinition(); + if (var2 != null) { var1.decode(new Buffer(var2)); } - KitDefinition.KitDefinition_cached.put(var1, (long)var0); // L: 38 - return var1; // L: 39 + KitDefinition.KitDefinition_cached.put(var1, (long)var0); + return var1; } } @@ -363,21 +363,21 @@ public final class ArchiveDisk { ) @Export("drawSpriteOnMinimap") static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { - if (var4 != null) { // L: 12434 - int var6 = Client.camAngleY & 2047; // L: 12435 - int var7 = var3 * var3 + var2 * var2; // L: 12436 - if (var7 <= 6400) { // L: 12437 - int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 12438 - int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 12439 - int var10 = var9 * var2 + var3 * var8 >> 16; // L: 12440 - int var11 = var3 * var9 - var8 * var2 >> 16; // L: 12441 + if (var4 != null) { + int var6 = Client.camAngleY & 2047; + int var7 = var3 * var3 + var2 * var2; + if (var7 <= 6400) { + int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; + int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; + int var10 = var9 * var2 + var3 * var8 >> 16; + int var11 = var3 * var9 - var8 * var2 >> 16; if (var7 > 2500) { - var4.method7779(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: 12442 + var4.method7779(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths); } else { - var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); // L: 12443 + var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); } } } - } // L: 12444 + } } diff --git a/runescape-client/src/main/java/ArchiveDiskAction.java b/runescape-client/src/main/java/ArchiveDiskAction.java index 85eb439a93..f4c1554e66 100644 --- a/runescape-client/src/main/java/ArchiveDiskAction.java +++ b/runescape-client/src/main/java/ArchiveDiskAction.java @@ -30,7 +30,7 @@ public class ArchiveDiskAction extends Node { public Archive archive; ArchiveDiskAction() { - } // L: 12 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -38,10 +38,10 @@ public class ArchiveDiskAction extends Node { garbageValue = "1" ) static void method5526(SpritePixels var0, int var1, int var2, int var3) { - DemotingHashTable var4 = WorldMapRegion.WorldMapRegion_cachedSprites; // L: 38 - long var6 = (long)(var3 << 16 | var1 << 8 | var2); // L: 42 - var4.put(var0, var6, var0.pixels.length * 4); // L: 44 - } // L: 45 + DemotingHashTable var4 = WorldMapRegion.WorldMapRegion_cachedSprites; + long var6 = (long)(var3 << 16 | var1 << 8 | var2); + var4.put(var0, var6, var0.pixels.length * 4); + } @ObfuscatedName("hp") @ObfuscatedSignature( @@ -49,12 +49,12 @@ public class ArchiveDiskAction extends Node { garbageValue = "128" ) static final void method5527(int var0, int var1) { - if (Client.hintArrowType == 2) { // L: 5578 - ModeWhere.worldToScreen((Client.hintArrowX - class131.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - TileItem.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); // L: 5579 - if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { // L: 5580 + if (Client.hintArrowType == 2) { + ModeWhere.worldToScreen((Client.hintArrowX - class131.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - TileItem.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); + if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { class260.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); } } - } // L: 5581 + } } diff --git a/runescape-client/src/main/java/ArchiveDiskActionHandler.java b/runescape-client/src/main/java/ArchiveDiskActionHandler.java index b7460bd933..743bb581e3 100644 --- a/runescape-client/src/main/java/ArchiveDiskActionHandler.java +++ b/runescape-client/src/main/java/ArchiveDiskActionHandler.java @@ -29,62 +29,62 @@ public class ArchiveDiskActionHandler implements Runnable { static Object ArchiveDiskActionHandler_lock; static { - ArchiveDiskActionHandler_requestQueue = new NodeDeque(); // L: 9 - ArchiveDiskActionHandler_responseQueue = new NodeDeque(); // L: 10 - field3815 = 0; // L: 11 + ArchiveDiskActionHandler_requestQueue = new NodeDeque(); + ArchiveDiskActionHandler_responseQueue = new NodeDeque(); + field3815 = 0; ArchiveDiskActionHandler_lock = new Object(); - } // L: 12 + } ArchiveDiskActionHandler() { - } // L: 15 + } public void run() { try { while (true) { ArchiveDiskAction var1; - synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 63 - var1 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); // L: 64 - } // L: 65 + synchronized(ArchiveDiskActionHandler_requestQueue) { + var1 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); + } - if (var1 != null) { // L: 66 - if (var1.type == 0) { // L: 67 - var1.archiveDisk.write((int)var1.key, var1.data, var1.data.length); // L: 68 - synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 69 - var1.remove(); // L: 70 - } // L: 71 - } else if (var1.type == 1) { // L: 73 - var1.data = var1.archiveDisk.read((int)var1.key); // L: 74 - synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 75 - ArchiveDiskActionHandler_responseQueue.addFirst(var1); // L: 76 - } // L: 77 + if (var1 != null) { + if (var1.type == 0) { + var1.archiveDisk.write((int)var1.key, var1.data, var1.data.length); + synchronized(ArchiveDiskActionHandler_requestQueue) { + var1.remove(); + } + } else if (var1.type == 1) { + var1.data = var1.archiveDisk.read((int)var1.key); + synchronized(ArchiveDiskActionHandler_requestQueue) { + ArchiveDiskActionHandler_responseQueue.addFirst(var1); + } } - synchronized(ArchiveDiskActionHandler_lock) { // L: 79 - if (field3815 <= 1) { // L: 80 - field3815 = 0; // L: 81 - ArchiveDiskActionHandler_lock.notifyAll(); // L: 82 - return; // L: 83 + synchronized(ArchiveDiskActionHandler_lock) { + if (field3815 <= 1) { + field3815 = 0; + ArchiveDiskActionHandler_lock.notifyAll(); + return; } - field3815 = 600; // L: 85 + field3815 = 600; } } else { - Bounds.method6608(100L); // L: 89 - synchronized(ArchiveDiskActionHandler_lock) { // L: 90 - if (field3815 <= 1) { // L: 91 - field3815 = 0; // L: 92 - ArchiveDiskActionHandler_lock.notifyAll(); // L: 93 - return; // L: 94 + Bounds.method6608(100L); + synchronized(ArchiveDiskActionHandler_lock) { + if (field3815 <= 1) { + field3815 = 0; + ArchiveDiskActionHandler_lock.notifyAll(); + return; } - --field3815; // L: 96 + --field3815; } } } - } catch (Exception var13) { // L: 101 - AccessFile.RunException_sendStackTrace((String)null, var13); // L: 102 + } catch (Exception var13) { + AccessFile.RunException_sendStackTrace((String)null, var13); } - } // L: 104 + } @ObfuscatedName("gl") @ObfuscatedSignature( @@ -93,31 +93,31 @@ public class ArchiveDiskActionHandler implements Runnable { ) @Export("drawLoadingMessage") static final void drawLoadingMessage(String var0, boolean var1) { - if (Client.showLoadingMessages) { // L: 5120 - byte var2 = 4; // L: 5121 - int var3 = var2 + 6; // L: 5122 - int var4 = var2 + 6; // L: 5123 - int var5 = class114.fontPlain12.lineWidth(var0, 250); // L: 5124 - int var6 = class114.fontPlain12.lineCount(var0, 250) * 13; // L: 5125 - Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var2 + var5, var2 + var6 + var2, 0); // L: 5126 - Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var2 + var6, 16777215); // L: 5127 - class114.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); // L: 5128 - class10.method124(var3 - var2, var4 - var2, var2 + var5 + var2, var6 + var2 + var2); // L: 5129 - if (var1) { // L: 5130 - class19.rasterProvider.drawFull(0, 0); // L: 5131 + if (Client.showLoadingMessages) { + byte var2 = 4; + int var3 = var2 + 6; + int var4 = var2 + 6; + int var5 = class114.fontPlain12.lineWidth(var0, 250); + int var6 = class114.fontPlain12.lineCount(var0, 250) * 13; + Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var2 + var5, var2 + var6 + var2, 0); + Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var2 + var6, 16777215); + class114.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); + class10.method124(var3 - var2, var4 - var2, var2 + var5 + var2, var6 + var2 + var2); + if (var1) { + class19.rasterProvider.drawFull(0, 0); } else { - int var7 = var3; // L: 5134 - int var8 = var4; // L: 5135 - int var9 = var5; // L: 5136 - int var10 = var6; // L: 5137 + int var7 = var3; + int var8 = var4; + int var9 = var5; + int var10 = var6; - for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { // L: 5139 - if (Client.rootWidgetWidths[var11] + Client.rootWidgetXs[var11] > var7 && Client.rootWidgetXs[var11] < var9 + var7 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var8 + var10) { // L: 5140 + for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { + if (Client.rootWidgetWidths[var11] + Client.rootWidgetXs[var11] > var7 && Client.rootWidgetXs[var11] < var9 + var7 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var8 + var10) { Client.field686[var11] = true; } } } } - } // L: 5144 + } } diff --git a/runescape-client/src/main/java/ArchiveLoader.java b/runescape-client/src/main/java/ArchiveLoader.java index fe460b86fc..a41de914c9 100644 --- a/runescape-client/src/main/java/ArchiveLoader.java +++ b/runescape-client/src/main/java/ArchiveLoader.java @@ -33,10 +33,10 @@ public class ArchiveLoader { descriptor = "(Lkz;Ljava/lang/String;)V" ) ArchiveLoader(Archive var1, String var2) { - this.loadedCount = 0; // L: 9 - this.archive = var1; // L: 12 - this.groupCount = var1.getGroupCount(); // L: 13 - } // L: 14 + this.loadedCount = 0; + this.archive = var1; + this.groupCount = var1.getGroupCount(); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -45,21 +45,21 @@ public class ArchiveLoader { ) @Export("isLoaded") boolean isLoaded() { - this.loadedCount = 0; // L: 17 + this.loadedCount = 0; - for (int var1 = 0; var1 < this.groupCount; ++var1) { // L: 18 + for (int var1 = 0; var1 < this.groupCount; ++var1) { if (!this.archive.method5584(var1) || this.archive.method5570(var1)) { - ++this.loadedCount; // L: 19 + ++this.loadedCount; } } - return this.loadedCount >= this.groupCount; // L: 21 + return this.loadedCount >= this.groupCount; } @ObfuscatedName("b") static boolean method2123(long var0) { - int var2 = (int)(var0 >>> 14 & 3L); // L: 50 - return var2 == 2; // L: 52 + int var2 = (int)(var0 >>> 14 & 3L); + return var2 == 2; } @ObfuscatedName("q") @@ -69,366 +69,366 @@ public class ArchiveLoader { ) static int method2122(int var0, Script var1, boolean var2) { String var7; - if (var0 == ScriptOpcodes.MES) { // L: 1409 - var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 1410 - class194.addGameMessage(0, "", var7); // L: 1411 - return 1; // L: 1412 + if (var0 == ScriptOpcodes.MES) { + var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + class194.addGameMessage(0, "", var7); + return 1; } else if (var0 == ScriptOpcodes.ANIM) { - IsaacCipher.Interpreter_intStackSize -= 2; // L: 1415 - class125.performPlayerAnimation(class340.localPlayer, Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize], Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]); // L: 1416 - return 1; // L: 1417 + IsaacCipher.Interpreter_intStackSize -= 2; + class125.performPlayerAnimation(class340.localPlayer, Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize], Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]); + return 1; } else if (var0 == ScriptOpcodes.IF_CLOSE) { - if (!Interpreter.field816) { // L: 1420 - Interpreter.field818 = true; // L: 1421 + if (!Interpreter.field816) { + Interpreter.field818 = true; } - return 1; // L: 1423 + return 1; } else { int var16; if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { - var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 1426 - var16 = 0; // L: 1427 - if (ClanSettings.isNumber(var7)) { // L: 1428 + var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + var16 = 0; + if (ClanSettings.isNumber(var7)) { var16 = ClanChannelMember.method2778(var7); } - PacketBufferNode var14 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2862, Client.packetWriter.isaacCipher); // L: 1430 - var14.packetBuffer.writeInt(var16); // L: 1431 - Client.packetWriter.addNode(var14); // L: 1432 - return 1; // L: 1433 + PacketBufferNode var14 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2862, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeInt(var16); + Client.packetWriter.addNode(var14); + return 1; } else { PacketBufferNode var12; if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { - var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 1436 - var12 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2845, Client.packetWriter.isaacCipher); // L: 1438 - var12.packetBuffer.writeByte(var7.length() + 1); // L: 1439 - var12.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1440 - Client.packetWriter.addNode(var12); // L: 1441 - return 1; // L: 1442 + var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + var12 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2845, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeByte(var7.length() + 1); + var12.packetBuffer.writeStringCp1252NullTerminated(var7); + Client.packetWriter.addNode(var12); + return 1; } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) { - var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 1445 - var12 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2893, Client.packetWriter.isaacCipher); // L: 1447 - var12.packetBuffer.writeByte(var7.length() + 1); // L: 1448 - var12.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1449 - Client.packetWriter.addNode(var12); // L: 1450 - return 1; // L: 1451 + var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + var12 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2893, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeByte(var7.length() + 1); + var12.packetBuffer.writeStringCp1252NullTerminated(var7); + Client.packetWriter.addNode(var12); + return 1; } else { String var4; int var10; if (var0 == ScriptOpcodes.OPPLAYER) { - var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1454 - var4 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 1455 - class136.method2840(var10, var4); // L: 1456 - return 1; // L: 1457 + var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + class136.method2840(var10, var4); + return 1; } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { - IsaacCipher.Interpreter_intStackSize -= 3; // L: 1460 - var10 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 1461 - var16 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 1462 - int var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 1463 - Widget var15 = ChatChannel.getWidget(var9); // L: 1464 - class29.clickWidget(var15, var10, var16); // L: 1465 - return 1; // L: 1466 + IsaacCipher.Interpreter_intStackSize -= 3; + var10 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var16 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + int var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; + Widget var15 = ChatChannel.getWidget(var9); + class29.clickWidget(var15, var10, var16); + return 1; } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { - IsaacCipher.Interpreter_intStackSize -= 2; // L: 1469 - var10 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 1470 - var16 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 1471 - Widget var13 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; // L: 1472 - class29.clickWidget(var13, var10, var16); // L: 1473 - return 1; // L: 1474 + IsaacCipher.Interpreter_intStackSize -= 2; + var10 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var16 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + Widget var13 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; + class29.clickWidget(var13, var10, var16); + return 1; } else if (var0 == ScriptOpcodes.MOUSECAM) { - class150.mouseCam = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 1477 - return 1; // L: 1478 + class150.mouseCam = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + return 1; } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = SecureRandomFuture.clientPreferences.roofsHidden ? 1 : 0; // L: 1481 - return 1; // L: 1482 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = SecureRandomFuture.clientPreferences.roofsHidden ? 1 : 0; + return 1; } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { - SecureRandomFuture.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 1485 - class127.savePreferences(); // L: 1486 - return 1; // L: 1487 + SecureRandomFuture.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + class127.savePreferences(); + return 1; } else if (var0 == ScriptOpcodes.OPENURL) { - var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 1490 - boolean var8 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 1491 - WorldMapSprite.openURL(var7, var8, false); // L: 1492 - return 1; // L: 1493 + var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + boolean var8 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + WorldMapSprite.openURL(var7, var8, false); + return 1; } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { - var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1496 - var12 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2808, Client.packetWriter.isaacCipher); // L: 1498 - var12.packetBuffer.writeShort(var10); // L: 1499 - Client.packetWriter.addNode(var12); // L: 1500 - return 1; // L: 1501 + var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + var12 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2808, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeShort(var10); + Client.packetWriter.addNode(var12); + return 1; } else if (var0 == ScriptOpcodes.BUG_REPORT) { - var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1504 - class13.Interpreter_stringStackSize -= 2; // L: 1505 - var4 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; // L: 1506 - String var5 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; // L: 1507 - if (var4.length() > 500) { // L: 1508 + var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + class13.Interpreter_stringStackSize -= 2; + var4 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; + String var5 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; + if (var4.length() > 500) { return 1; - } else if (var5.length() > 500) { // L: 1509 + } else if (var5.length() > 500) { return 1; } else { - PacketBufferNode var6 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2841, Client.packetWriter.isaacCipher); // L: 1510 - var6.packetBuffer.writeShort(1 + class116.stringCp1252NullTerminatedByteSize(var4) + class116.stringCp1252NullTerminatedByteSize(var5)); // L: 1511 - var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 1512 - var6.packetBuffer.method7343(var10); // L: 1513 - var6.packetBuffer.writeStringCp1252NullTerminated(var5); // L: 1514 - Client.packetWriter.addNode(var6); // L: 1515 - return 1; // L: 1516 + PacketBufferNode var6 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2841, Client.packetWriter.isaacCipher); + var6.packetBuffer.writeShort(1 + class116.stringCp1252NullTerminatedByteSize(var4) + class116.stringCp1252NullTerminatedByteSize(var5)); + var6.packetBuffer.writeStringCp1252NullTerminated(var4); + var6.packetBuffer.method7343(var10); + var6.packetBuffer.writeStringCp1252NullTerminated(var5); + Client.packetWriter.addNode(var6); + return 1; } } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { - Client.shiftClickDrop = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 1519 - return 1; // L: 1520 + Client.shiftClickDrop = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + return 1; } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { - Client.showMouseOverText = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 1523 - return 1; // L: 1524 + Client.showMouseOverText = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + return 1; } else if (var0 == ScriptOpcodes.RENDERSELF) { - Client.renderSelf = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 1527 - return 1; // L: 1528 + Client.renderSelf = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + return 1; } else if (var0 == 3120) { - if (Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1) { // L: 1531 + if (Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1) { Client.drawPlayerNames |= 1; } else { - Client.drawPlayerNames &= -2; // L: 1532 + Client.drawPlayerNames &= -2; } - return 1; // L: 1533 + return 1; } else if (var0 == 3121) { - if (Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1) { // L: 1536 + if (Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1) { Client.drawPlayerNames |= 2; } else { - Client.drawPlayerNames &= -3; // L: 1537 + Client.drawPlayerNames &= -3; } - return 1; // L: 1538 + return 1; } else if (var0 == 3122) { - if (Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1) { // L: 1541 + if (Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1) { Client.drawPlayerNames |= 4; } else { - Client.drawPlayerNames &= -5; // L: 1542 + Client.drawPlayerNames &= -5; } - return 1; // L: 1543 + return 1; } else if (var0 == 3123) { - if (Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1) { // L: 1546 + if (Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1) { Client.drawPlayerNames |= 8; } else { - Client.drawPlayerNames &= -9; // L: 1547 + Client.drawPlayerNames &= -9; } - return 1; // L: 1548 + return 1; } else if (var0 == 3124) { - Client.drawPlayerNames = 0; // L: 1551 - return 1; // L: 1552 + Client.drawPlayerNames = 0; + return 1; } else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) { - Client.showMouseCross = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 1555 - return 1; // L: 1556 + Client.showMouseCross = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + return 1; } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { - Client.showLoadingMessages = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 1559 - return 1; // L: 1560 + Client.showLoadingMessages = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + return 1; } else if (var0 == ScriptOpcodes.SETTAPTODROP) { - class12.setTapToDrop(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1); // L: 1563 - return 1; // L: 1564 + class12.setTapToDrop(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1); + return 1; } else if (var0 == ScriptOpcodes.GETTAPTODROP) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Tiles.getTapToDrop() ? 1 : 0; // L: 1567 - return 1; // L: 1568 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Tiles.getTapToDrop() ? 1 : 0; + return 1; } else if (var0 == 3129) { - IsaacCipher.Interpreter_intStackSize -= 2; // L: 1571 - Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 1572 - Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 1573 - return 1; // L: 1574 + IsaacCipher.Interpreter_intStackSize -= 2; + Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + return 1; } else if (var0 == 3130) { - IsaacCipher.Interpreter_intStackSize -= 2; // L: 1577 - return 1; // L: 1578 + IsaacCipher.Interpreter_intStackSize -= 2; + return 1; } else if (var0 == 3131) { - --IsaacCipher.Interpreter_intStackSize; // L: 1581 - return 1; // L: 1582 + --IsaacCipher.Interpreter_intStackSize; + return 1; } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class186.canvasWidth; // L: 1585 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = BoundaryObject.canvasHeight; // L: 1586 - return 1; // L: 1587 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class186.canvasWidth; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = BoundaryObject.canvasHeight; + return 1; } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) { - --IsaacCipher.Interpreter_intStackSize; // L: 1590 - return 1; // L: 1591 + --IsaacCipher.Interpreter_intStackSize; + return 1; } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { - return 1; // L: 1594 + return 1; } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { - IsaacCipher.Interpreter_intStackSize -= 2; // L: 1597 - return 1; // L: 1598 + IsaacCipher.Interpreter_intStackSize -= 2; + return 1; } else if (var0 == 3136) { - Client.field638 = 3; // L: 1601 - Client.field639 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1602 - return 1; // L: 1603 + Client.field638 = 3; + Client.field639 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + return 1; } else if (var0 == 3137) { - Client.field638 = 2; // L: 1606 - Client.field639 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1607 - return 1; // L: 1608 + Client.field638 = 2; + Client.field639 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + return 1; } else if (var0 == 3138) { - Client.field638 = 0; // L: 1611 - return 1; // L: 1612 + Client.field638 = 0; + return 1; } else if (var0 == 3139) { - Client.field638 = 1; // L: 1615 - return 1; // L: 1616 + Client.field638 = 1; + return 1; } else if (var0 == 3140) { - Client.field638 = 3; // L: 1619 - Client.field639 = var2 ? WorldMapArea.scriptDotWidget.id * 1695982371 * 2075239563 : Messages.scriptActiveWidget.id * 1695982371 * 2075239563; // L: 1620 - return 1; // L: 1621 + Client.field638 = 3; + Client.field639 = var2 ? WorldMapArea.scriptDotWidget.id * 1695982371 * 2075239563 : Messages.scriptActiveWidget.id * 1695982371 * 2075239563; + return 1; } else { boolean var11; if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { - var11 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 1624 - SecureRandomFuture.clientPreferences.hideUsername = var11; // L: 1625 - class127.savePreferences(); // L: 1626 - return 1; // L: 1627 + var11 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + SecureRandomFuture.clientPreferences.hideUsername = var11; + class127.savePreferences(); + return 1; } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = SecureRandomFuture.clientPreferences.hideUsername ? 1 : 0; // L: 1630 - return 1; // L: 1631 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = SecureRandomFuture.clientPreferences.hideUsername ? 1 : 0; + return 1; } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { - var11 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 1634 - Client.Login_isUsernameRemembered = var11; // L: 1635 - if (!var11) { // L: 1636 - SecureRandomFuture.clientPreferences.rememberedUsername = ""; // L: 1637 - class127.savePreferences(); // L: 1638 + var11 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + Client.Login_isUsernameRemembered = var11; + if (!var11) { + SecureRandomFuture.clientPreferences.rememberedUsername = ""; + class127.savePreferences(); } - return 1; // L: 1640 + return 1; } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; // L: 1643 - return 1; // L: 1644 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; + return 1; } else if (var0 == ScriptOpcodes.SHOW_IOS_REVIEW) { - return 1; // L: 1647 + return 1; } else if (var0 == 3146) { - var11 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 1650 - if (var11 == SecureRandomFuture.clientPreferences.titleMusicDisabled) { // L: 1651 - SecureRandomFuture.clientPreferences.titleMusicDisabled = !var11; // L: 1652 - class127.savePreferences(); // L: 1653 + var11 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + if (var11 == SecureRandomFuture.clientPreferences.titleMusicDisabled) { + SecureRandomFuture.clientPreferences.titleMusicDisabled = !var11; + class127.savePreferences(); } - return 1; // L: 1655 + return 1; } else if (var0 == 3147) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = SecureRandomFuture.clientPreferences.titleMusicDisabled ? 0 : 1; // L: 1658 - return 1; // L: 1659 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = SecureRandomFuture.clientPreferences.titleMusicDisabled ? 0 : 1; + return 1; } else if (var0 == 3148) { - return 1; // L: 1662 + return 1; } else if (var0 == 3149) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1665 - return 1; // L: 1666 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + return 1; } else if (var0 == 3150) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1669 - return 1; // L: 1670 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + return 1; } else if (var0 == 3151) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1673 - return 1; // L: 1674 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + return 1; } else if (var0 == 3152) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1677 - return 1; // L: 1678 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + return 1; } else if (var0 == 3153) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; // L: 1681 - return 1; // L: 1682 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; + return 1; } else if (var0 == 3154) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = AbstractRasterProvider.method7714(); // L: 1685 - return 1; // L: 1686 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = AbstractRasterProvider.method7714(); + return 1; } else if (var0 == 3155) { - --class13.Interpreter_stringStackSize; // L: 1689 - return 1; // L: 1690 + --class13.Interpreter_stringStackSize; + return 1; } else if (var0 == 3156) { - return 1; // L: 1693 + return 1; } else if (var0 == 3157) { - IsaacCipher.Interpreter_intStackSize -= 2; // L: 1696 - return 1; // L: 1697 + IsaacCipher.Interpreter_intStackSize -= 2; + return 1; } else if (var0 == 3158) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1700 - return 1; // L: 1701 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + return 1; } else if (var0 == 3159) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1704 - return 1; // L: 1705 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + return 1; } else if (var0 == 3160) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1708 - return 1; // L: 1709 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + return 1; } else if (var0 == 3161) { - --IsaacCipher.Interpreter_intStackSize; // L: 1712 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1713 - return 1; // L: 1714 + --IsaacCipher.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + return 1; } else if (var0 == 3162) { - --IsaacCipher.Interpreter_intStackSize; // L: 1717 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1718 - return 1; // L: 1719 + --IsaacCipher.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + return 1; } else if (var0 == 3163) { - --class13.Interpreter_stringStackSize; // L: 1722 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1723 - return 1; // L: 1724 + --class13.Interpreter_stringStackSize; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + return 1; } else if (var0 == 3164) { - --IsaacCipher.Interpreter_intStackSize; // L: 1727 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1728 - return 1; // L: 1729 + --IsaacCipher.Interpreter_intStackSize; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + return 1; } else if (var0 == 3165) { - --IsaacCipher.Interpreter_intStackSize; // L: 1732 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1733 - return 1; // L: 1734 + --IsaacCipher.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + return 1; } else if (var0 == 3166) { - IsaacCipher.Interpreter_intStackSize -= 2; // L: 1737 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1738 - return 1; // L: 1739 + IsaacCipher.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + return 1; } else if (var0 == 3167) { - IsaacCipher.Interpreter_intStackSize -= 2; // L: 1742 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1743 - return 1; // L: 1744 + IsaacCipher.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + return 1; } else if (var0 == 3168) { - IsaacCipher.Interpreter_intStackSize -= 2; // L: 1747 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1748 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1749 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1750 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1751 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1752 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1753 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1754 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1755 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1756 - return 1; // L: 1757 + IsaacCipher.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + return 1; } else if (var0 == 3169) { - return 1; // L: 1760 + return 1; } else if (var0 == 3170) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1763 - return 1; // L: 1764 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + return 1; } else if (var0 == 3171) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1767 - return 1; // L: 1768 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + return 1; } else if (var0 == 3172) { - --IsaacCipher.Interpreter_intStackSize; // L: 1771 - return 1; // L: 1772 + --IsaacCipher.Interpreter_intStackSize; + return 1; } else if (var0 == 3173) { - --IsaacCipher.Interpreter_intStackSize; // L: 1775 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1776 - return 1; // L: 1777 + --IsaacCipher.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + return 1; } else if (var0 == 3174) { - --IsaacCipher.Interpreter_intStackSize; // L: 1780 - return 1; // L: 1781 + --IsaacCipher.Interpreter_intStackSize; + return 1; } else if (var0 == 3175) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1784 - return 1; // L: 1785 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + return 1; } else if (var0 == 3176) { - return 1; // L: 1788 + return 1; } else if (var0 == 3177) { - return 1; // L: 1791 + return 1; } else if (var0 == 3178) { - --class13.Interpreter_stringStackSize; // L: 1794 - return 1; // L: 1795 + --class13.Interpreter_stringStackSize; + return 1; } else if (var0 == 3179) { - return 1; // L: 1798 + return 1; } else if (var0 == 3180) { - --class13.Interpreter_stringStackSize; // L: 1801 - return 1; // L: 1802 + --class13.Interpreter_stringStackSize; + return 1; } else if (var0 == 3181) { - var10 = 100 - Math.min(Math.max(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize], 0), 100); // L: 1805 - InterfaceParent.method2142((double)(0.5F + (float)var10 / 200.0F)); // L: 1806 - return 1; // L: 1807 + var10 = 100 - Math.min(Math.max(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize], 0), 100); + InterfaceParent.method2142((double)(0.5F + (float)var10 / 200.0F)); + return 1; } else if (var0 == 3182) { - float var3 = ((float)SecureRandomFuture.clientPreferences.brightness - 0.5F) * 200.0F; // L: 1810 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 100 - Math.round(var3); // L: 1811 - return 1; // L: 1812 + float var3 = ((float)SecureRandomFuture.clientPreferences.brightness - 0.5F) * 200.0F; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 100 - Math.round(var3); + return 1; } else if (var0 != 3183 && var0 != 3184) { - return 2; // L: 1818 + return 2; } else { - --IsaacCipher.Interpreter_intStackSize; // L: 1815 - return 1; // L: 1816 + --IsaacCipher.Interpreter_intStackSize; + return 1; } } } @@ -442,29 +442,29 @@ public class ArchiveLoader { garbageValue = "1046590636" ) static int method2120(int var0, Script var1, boolean var2) { - if (var0 >= 7200 && var0 < 7204) { // L: 4429 - IsaacCipher.Interpreter_intStackSize -= 5; // L: 4430 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4431 - return 1; // L: 4432 - } else if (var0 == 7204) { // L: 4434 - IsaacCipher.Interpreter_intStackSize -= 6; // L: 4435 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4436 - return 1; // L: 4437 - } else if (var0 >= 7205 && var0 < 7209) { // L: 4439 - Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4440 - return 1; // L: 4441 - } else if (var0 == 7209) { // L: 4443 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 4444 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4445 - return 1; // L: 4446 - } else if (var0 >= 7210 && var0 < 7214) { // L: 4448 - --IsaacCipher.Interpreter_intStackSize; // L: 4449 - return 1; // L: 4450 - } else if (var0 == 7214) { // L: 4452 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 4453 - return 1; // L: 4454 + if (var0 >= 7200 && var0 < 7204) { + IsaacCipher.Interpreter_intStackSize -= 5; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; + return 1; + } else if (var0 == 7204) { + IsaacCipher.Interpreter_intStackSize -= 6; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; + return 1; + } else if (var0 >= 7205 && var0 < 7209) { + Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1] = -1; + return 1; + } else if (var0 == 7209) { + IsaacCipher.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; + return 1; + } else if (var0 >= 7210 && var0 < 7214) { + --IsaacCipher.Interpreter_intStackSize; + return 1; + } else if (var0 == 7214) { + IsaacCipher.Interpreter_intStackSize -= 2; + return 1; } else { - return 2; // L: 4456 + return 2; } } @@ -474,6 +474,6 @@ public class ArchiveLoader { garbageValue = "-47" ) static boolean method2125() { - return Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; // L: 11376 + return Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; } } diff --git a/runescape-client/src/main/java/AttackOption.java b/runescape-client/src/main/java/AttackOption.java index 966c656a2b..0dc46d03bd 100644 --- a/runescape-client/src/main/java/AttackOption.java +++ b/runescape-client/src/main/java/AttackOption.java @@ -44,8 +44,8 @@ public enum AttackOption implements MouseWheel { final int id; AttackOption(int var3) { - this.id = var3; // L: 12752 - } // L: 12753 + this.id = var3; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -54,7 +54,7 @@ public enum AttackOption implements MouseWheel { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 12757 + return this.id; } @ObfuscatedName("lg") @@ -63,6 +63,6 @@ public enum AttackOption implements MouseWheel { garbageValue = "-379261507" ) static boolean method2356() { - return SecureRandomFuture.clientPreferences.field1197 >= Client.field473; // L: 12724 + return SecureRandomFuture.clientPreferences.field1197 >= Client.field473; } } diff --git a/runescape-client/src/main/java/AudioFilter.java b/runescape-client/src/main/java/AudioFilter.java index 34c6c8455c..385823aa91 100644 --- a/runescape-client/src/main/java/AudioFilter.java +++ b/runescape-client/src/main/java/AudioFilter.java @@ -27,81 +27,81 @@ public class AudioFilter { int[] field406; static { - field407 = new float[2][8]; // L: 13 - coefficients = new int[2][8]; // L: 14 + field407 = new float[2][8]; + coefficients = new int[2][8]; } AudioFilter() { - this.pairs = new int[2]; // L: 8 - this.field404 = new int[2][2][4]; // L: 10 - this.field405 = new int[2][2][4]; // L: 11 - this.field406 = new int[2]; // L: 12 - } // L: 21 + this.pairs = new int[2]; + this.field404 = new int[2][2][4]; + this.field405 = new int[2][2][4]; + this.field406 = new int[2]; + } @ObfuscatedName("c") float method1097(int var1, int var2, float var3) { - float var4 = (float)this.field405[var1][0][var2] + var3 * (float)(this.field405[var1][1][var2] - this.field405[var1][0][var2]); // L: 24 - var4 *= 0.0015258789F; // L: 25 - return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F)); // L: 26 + float var4 = (float)this.field405[var1][0][var2] + var3 * (float)(this.field405[var1][1][var2] - this.field405[var1][0][var2]); + var4 *= 0.0015258789F; + return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F)); } @ObfuscatedName("p") float method1091(int var1, int var2, float var3) { - float var4 = (float)this.field404[var1][0][var2] + var3 * (float)(this.field404[var1][1][var2] - this.field404[var1][0][var2]); // L: 35 - var4 *= 1.2207031E-4F; // L: 36 - return normalize(var4); // L: 37 + float var4 = (float)this.field404[var1][0][var2] + var3 * (float)(this.field404[var1][1][var2] - this.field404[var1][0][var2]); + var4 *= 1.2207031E-4F; + return normalize(var4); } @ObfuscatedName("m") @Export("compute") int compute(int var1, float var2) { float var3; - if (var1 == 0) { // L: 41 - var3 = (float)this.field406[0] + (float)(this.field406[1] - this.field406[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 + if (var1 == 0) { + var3 = (float)this.field406[0] + (float)(this.field406[1] - this.field406[0]) * var2; + var3 *= 0.0030517578F; + field409 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); + forwardMultiplier = (int)(field409 * 65536.0F); } - if (this.pairs[var1] == 0) { // L: 47 + if (this.pairs[var1] == 0) { return 0; } else { - var3 = this.method1097(var1, 0, var2); // L: 48 - field407[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method1091(var1, 0, var2)); // L: 49 - field407[var1][1] = var3 * var3; // L: 50 + var3 = this.method1097(var1, 0, var2); + field407[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method1091(var1, 0, var2)); + field407[var1][1] = var3 * var3; float[] var10000; int var4; - for (var4 = 1; var4 < this.pairs[var1]; ++var4) { // L: 51 - var3 = this.method1097(var1, var4, var2); // L: 52 - float var5 = -2.0F * var3 * (float)Math.cos((double)this.method1091(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 + for (var4 = 1; var4 < this.pairs[var1]; ++var4) { + var3 = this.method1097(var1, var4, var2); + float var5 = -2.0F * var3 * (float)Math.cos((double)this.method1091(var1, var4, var2)); + float var6 = var3 * var3; + field407[var1][var4 * 2 + 1] = field407[var1][var4 * 2 - 1] * var6; + field407[var1][var4 * 2] = field407[var1][var4 * 2 - 1] * var5 + field407[var1][var4 * 2 - 2] * var6; - for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { // L: 57 + for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { var10000 = field407[var1]; var10000[var7] += field407[var1][var7 - 1] * var5 + field407[var1][var7 - 2] * var6; } - var10000 = field407[var1]; // L: 58 + var10000 = field407[var1]; var10000[1] += field407[var1][0] * var5 + var6; - var10000 = field407[var1]; // L: 59 + var10000 = field407[var1]; var10000[0] += var5; } - if (var1 == 0) { // L: 61 + if (var1 == 0) { for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) { var10000 = field407[0]; var10000[var4] *= field409; } } - for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) { // L: 62 + for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) { coefficients[var1][var4] = (int)(field407[var1][var4] * 65536.0F); } - return this.pairs[var1] * 2; // L: 63 + return this.pairs[var1] * 2; } } @@ -110,50 +110,50 @@ public class AudioFilter { descriptor = "(Lpi;Lag;)V" ) final void method1089(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.field406[0] = var1.readUnsignedShort(); // L: 71 - this.field406[1] = var1.readUnsignedShort(); // L: 72 - int var7 = var1.readUnsignedByte(); // L: 73 + int var3 = var1.readUnsignedByte(); + this.pairs[0] = var3 >> 4; + this.pairs[1] = var3 & 15; + if (var3 != 0) { + this.field406[0] = var1.readUnsignedShort(); + this.field406[1] = var1.readUnsignedShort(); + int var7 = var1.readUnsignedByte(); int var5; int var6; - for (var5 = 0; var5 < 2; ++var5) { // L: 74 - for (var6 = 0; var6 < this.pairs[var5]; ++var6) { // L: 75 - this.field404[var5][0][var6] = var1.readUnsignedShort(); // L: 76 - this.field405[var5][0][var6] = var1.readUnsignedShort(); // L: 77 + for (var5 = 0; var5 < 2; ++var5) { + for (var6 = 0; var6 < this.pairs[var5]; ++var6) { + this.field404[var5][0][var6] = var1.readUnsignedShort(); + this.field405[var5][0][var6] = var1.readUnsignedShort(); } } - 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.field404[var5][1][var6] = var1.readUnsignedShort(); // L: 83 - this.field405[var5][1][var6] = var1.readUnsignedShort(); // L: 84 + for (var5 = 0; var5 < 2; ++var5) { + for (var6 = 0; var6 < this.pairs[var5]; ++var6) { + if ((var7 & 1 << var5 * 4 << var6) != 0) { + this.field404[var5][1][var6] = var1.readUnsignedShort(); + this.field405[var5][1][var6] = var1.readUnsignedShort(); } else { - this.field404[var5][1][var6] = this.field404[var5][0][var6]; // L: 87 - this.field405[var5][1][var6] = this.field405[var5][0][var6]; // L: 88 + this.field404[var5][1][var6] = this.field404[var5][0][var6]; + this.field405[var5][1][var6] = this.field405[var5][0][var6]; } } } - if (var7 != 0 || this.field406[1] != this.field406[0]) { // L: 92 + if (var7 != 0 || this.field406[1] != this.field406[0]) { var2.decodeSegments(var1); } } else { - int[] var4 = this.field406; // L: 95 - this.field406[1] = 0; // L: 96 - var4[0] = 0; // L: 97 + int[] var4 = this.field406; + this.field406[1] = 0; + var4[0] = 0; } - } // L: 99 + } @ObfuscatedName("b") @Export("normalize") static float normalize(float var0) { - float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0); // L: 30 - return var1 * 3.1415927F / 11025.0F; // L: 31 + float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0); + return var1 * 3.1415927F / 11025.0F; } } diff --git a/runescape-client/src/main/java/BZip2Decompressor.java b/runescape-client/src/main/java/BZip2Decompressor.java index 1927959473..5cffa13425 100644 --- a/runescape-client/src/main/java/BZip2Decompressor.java +++ b/runescape-client/src/main/java/BZip2Decompressor.java @@ -14,27 +14,27 @@ public final class BZip2Decompressor { static BZip2State BZip2Decompressor_state; static { - BZip2Decompressor_state = new BZip2State(); // L: 13 + BZip2Decompressor_state = new BZip2State(); } @ObfuscatedName("c") @Export("BZip2Decompressor_decompress") public static int BZip2Decompressor_decompress(byte[] var0, int var1, byte[] var2, int var3, int var4) { - synchronized(BZip2Decompressor_state) { // L: 20 - BZip2Decompressor_state.inputArray = var2; // L: 21 - BZip2Decompressor_state.nextByte = var4; // L: 22 - BZip2Decompressor_state.outputArray = var0; // L: 23 - BZip2Decompressor_state.next_out = 0; // L: 24 - BZip2Decompressor_state.outputLength = var1; // L: 25 - BZip2Decompressor_state.bsLive = 0; // L: 26 - BZip2Decompressor_state.bsBuff = 0; // L: 27 - BZip2Decompressor_state.nextBit_unused = 0; // L: 28 - BZip2Decompressor_state.field4489 = 0; // L: 29 - BZip2Decompressor_decompress(BZip2Decompressor_state); // L: 30 - var1 -= BZip2Decompressor_state.outputLength; // L: 31 - BZip2Decompressor_state.inputArray = null; // L: 32 - BZip2Decompressor_state.outputArray = null; // L: 33 - return var1; // L: 34 + synchronized(BZip2Decompressor_state) { + BZip2Decompressor_state.inputArray = var2; + BZip2Decompressor_state.nextByte = var4; + BZip2Decompressor_state.outputArray = var0; + BZip2Decompressor_state.next_out = 0; + BZip2Decompressor_state.outputLength = var1; + BZip2Decompressor_state.bsLive = 0; + BZip2Decompressor_state.bsBuff = 0; + BZip2Decompressor_state.nextBit_unused = 0; + BZip2Decompressor_state.field4489 = 0; + BZip2Decompressor_decompress(BZip2Decompressor_state); + var1 -= BZip2Decompressor_state.outputLength; + BZip2Decompressor_state.inputArray = null; + BZip2Decompressor_state.outputArray = null; + return var1; } } @@ -43,89 +43,89 @@ public final class BZip2Decompressor { descriptor = "(Lpk;)V" ) static void method7574(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 = class12.BZip2Decompressor_block; // L: 44 - int var7 = var0.field4484; // L: 45 - byte[] var8 = var0.outputArray; // L: 46 - int var9 = var0.next_out; // L: 47 - int var10 = var0.outputLength; // L: 48 - int var12 = var0.field4478 + 1; // L: 50 + byte var2 = var0.out_char; + int var3 = var0.su_rNToGo; + int var4 = var0.nblocks_used; + int var5 = var0.su_ch2; + int[] var6 = class12.BZip2Decompressor_block; + int var7 = var0.field4484; + byte[] var8 = var0.outputArray; + int var9 = var0.next_out; + int var10 = var0.outputLength; + int var12 = var0.field4478 + 1; label70: while (true) { - if (var3 > 0) { // L: 53 + if (var3 > 0) { while (true) { - if (var10 == 0) { // L: 55 + if (var10 == 0) { break label70; } - if (var3 == 1) { // L: 56 - if (var10 == 0) { // L: 62 - var3 = 1; // L: 63 + if (var3 == 1) { + if (var10 == 0) { + var3 = 1; break label70; } - var8[var9] = var2; // L: 66 - ++var9; // L: 67 - --var10; // L: 68 + var8[var9] = var2; + ++var9; + --var10; break; } - var8[var9] = var2; // L: 57 - --var3; // L: 58 - ++var9; // L: 59 - --var10; // L: 60 + var8[var9] = var2; + --var3; + ++var9; + --var10; } } - while (var4 != var12) { // L: 71 - var2 = (byte)var5; // L: 75 - var7 = var6[var7]; // L: 76 - byte var1 = (byte)var7; // L: 77 - var7 >>= 8; // L: 78 - ++var4; // L: 79 - if (var1 != var5) { // L: 80 - var5 = var1; // L: 81 - if (var10 == 0) { // L: 82 - var3 = 1; // L: 83 - break label70; // L: 84 + while (var4 != var12) { + var2 = (byte)var5; + var7 = var6[var7]; + byte var1 = (byte)var7; + var7 >>= 8; + ++var4; + if (var1 != var5) { + var5 = var1; + if (var10 == 0) { + var3 = 1; + break label70; } - var8[var9] = var2; // L: 86 - ++var9; // L: 87 - --var10; // L: 88 + var8[var9] = var2; + ++var9; + --var10; } else { - if (var4 != var12) { // L: 91 - var3 = 2; // L: 103 - var7 = var6[var7]; // L: 104 - var1 = (byte)var7; // L: 105 - var7 >>= 8; // L: 106 - ++var4; // L: 107 - if (var4 != var12) { // L: 108 - if (var1 != var5) { // L: 109 - var5 = var1; // L: 110 + if (var4 != var12) { + var3 = 2; + var7 = var6[var7]; + var1 = (byte)var7; + var7 >>= 8; + ++var4; + if (var4 != var12) { + if (var1 != var5) { + var5 = var1; } else { - var3 = 3; // L: 113 - var7 = var6[var7]; // L: 114 - var1 = (byte)var7; // L: 115 - var7 >>= 8; // L: 116 - ++var4; // L: 117 - if (var4 != var12) { // L: 118 - if (var1 != var5) { // L: 119 - var5 = var1; // L: 120 + var3 = 3; + var7 = var6[var7]; + var1 = (byte)var7; + var7 >>= 8; + ++var4; + if (var4 != var12) { + if (var1 != var5) { + var5 = var1; } else { - var7 = var6[var7]; // L: 123 - var1 = (byte)var7; // L: 124 - var7 >>= 8; // L: 125 - ++var4; // L: 126 - var3 = (var1 & 255) + 4; // L: 127 - var7 = var6[var7]; // L: 128 - var5 = (byte)var7; // L: 129 - var7 >>= 8; // L: 130 - ++var4; // L: 131 + var7 = var6[var7]; + var1 = (byte)var7; + var7 >>= 8; + ++var4; + var3 = (var1 & 255) + 4; + var7 = var6[var7]; + var5 = (byte)var7; + var7 >>= 8; + ++var4; } } } @@ -133,36 +133,36 @@ public final class BZip2Decompressor { continue label70; } - if (var10 == 0) { // L: 92 - var3 = 1; // L: 93 - break label70; // L: 94 + if (var10 == 0) { + var3 = 1; + break label70; } - var8[var9] = var2; // L: 96 - ++var9; // L: 97 - --var10; // L: 98 + var8[var9] = var2; + ++var9; + --var10; } } - var3 = 0; // L: 72 - break; // L: 73 + var3 = 0; + break; } - int var13 = var0.field4489; // L: 133 - var0.field4489 += var10 - var10; // L: 134 - if (var0.field4489 < var13) { // L: 135 + int var13 = var0.field4489; + var0.field4489 += var10 - var10; + if (var0.field4489 < var13) { } - var0.out_char = var2; // L: 136 - var0.su_rNToGo = var3; // L: 137 - var0.nblocks_used = var4; // L: 138 - var0.su_ch2 = var5; // L: 139 - class12.BZip2Decompressor_block = var6; // L: 140 - var0.field4484 = var7; // L: 141 - var0.outputArray = var8; // L: 142 - var0.next_out = var9; // L: 143 - var0.outputLength = var10; // L: 144 - } // L: 145 + var0.out_char = var2; + var0.su_rNToGo = var3; + var0.nblocks_used = var4; + var0.su_ch2 = var5; + class12.BZip2Decompressor_block = var6; + var0.field4484 = var7; + var0.outputArray = var8; + var0.next_out = var9; + var0.outputLength = var10; + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -170,371 +170,371 @@ public final class BZip2Decompressor { ) @Export("BZip2Decompressor_decompress") static void BZip2Decompressor_decompress(BZip2State var0) { - boolean var4 = false; // L: 151 - boolean var5 = false; // L: 152 - boolean var6 = false; // L: 153 - boolean var7 = false; // L: 154 - boolean var8 = false; // L: 155 - boolean var9 = false; // L: 156 - boolean var10 = false; // L: 157 - boolean var11 = false; // L: 158 - boolean var12 = false; // L: 159 - boolean var13 = false; // L: 160 - boolean var14 = false; // L: 161 - boolean var15 = false; // L: 162 - boolean var16 = false; // L: 163 - boolean var17 = false; // L: 164 - boolean var18 = false; // L: 165 - boolean var19 = false; // L: 166 - boolean var20 = false; // L: 167 - boolean var21 = false; // L: 168 - int var22 = 0; // L: 169 - int[] var23 = null; // L: 170 - int[] var24 = null; // L: 171 - int[] var25 = null; // L: 172 - var0.blockSize100k = 32259791; // L: 173 - if (class12.BZip2Decompressor_block == null) { // L: 174 + boolean var4 = false; + boolean var5 = false; + boolean var6 = false; + boolean var7 = false; + boolean var8 = false; + boolean var9 = false; + boolean var10 = false; + boolean var11 = false; + boolean var12 = false; + boolean var13 = false; + boolean var14 = false; + boolean var15 = false; + boolean var16 = false; + boolean var17 = false; + boolean var18 = false; + boolean var19 = false; + boolean var20 = false; + boolean var21 = false; + int var22 = 0; + int[] var23 = null; + int[] var24 = null; + int[] var25 = null; + var0.blockSize100k = 32259791; + if (class12.BZip2Decompressor_block == null) { class12.BZip2Decompressor_block = new int[var0.blockSize100k * -230901920]; } - boolean var26 = true; // L: 175 + boolean var26 = true; while (true) { while (var26) { - byte var1 = BZip2Decompressor_readNextByte(var0); // L: 177 - if (var1 == 23) { // L: 178 + byte var1 = BZip2Decompressor_readNextByte(var0); + if (var1 == 23) { return; } - var1 = BZip2Decompressor_readNextByte(var0); // L: 179 - var1 = BZip2Decompressor_readNextByte(var0); // L: 180 - var1 = BZip2Decompressor_readNextByte(var0); // L: 181 - var1 = BZip2Decompressor_readNextByte(var0); // L: 182 - var1 = BZip2Decompressor_readNextByte(var0); // L: 183 - var1 = BZip2Decompressor_readNextByte(var0); // L: 184 - var1 = BZip2Decompressor_readNextByte(var0); // L: 185 - var1 = BZip2Decompressor_readNextByte(var0); // L: 186 - var1 = BZip2Decompressor_readNextByte(var0); // L: 187 - var1 = BZip2Decompressor_readNextBit(var0); // L: 188 - if (var1 != 0) { // L: 189 + var1 = BZip2Decompressor_readNextByte(var0); + var1 = BZip2Decompressor_readNextByte(var0); + var1 = BZip2Decompressor_readNextByte(var0); + var1 = BZip2Decompressor_readNextByte(var0); + var1 = BZip2Decompressor_readNextByte(var0); + var1 = BZip2Decompressor_readNextByte(var0); + var1 = BZip2Decompressor_readNextByte(var0); + var1 = BZip2Decompressor_readNextByte(var0); + var1 = BZip2Decompressor_readNextByte(var0); + var1 = BZip2Decompressor_readNextBit(var0); + if (var1 != 0) { } - var0.originalPointer = 0; // L: 191 - var1 = BZip2Decompressor_readNextByte(var0); // L: 192 - var0.originalPointer = var0.originalPointer << 8 | var1 & 255; // L: 193 - var1 = BZip2Decompressor_readNextByte(var0); // L: 194 - var0.originalPointer = var0.originalPointer << 8 | var1 & 255; // L: 195 - var1 = BZip2Decompressor_readNextByte(var0); // L: 196 - var0.originalPointer = var0.originalPointer << 8 | var1 & 255; // L: 197 + var0.originalPointer = 0; + var1 = BZip2Decompressor_readNextByte(var0); + var0.originalPointer = var0.originalPointer << 8 | var1 & 255; + var1 = BZip2Decompressor_readNextByte(var0); + var0.originalPointer = var0.originalPointer << 8 | var1 & 255; + var1 = BZip2Decompressor_readNextByte(var0); + var0.originalPointer = var0.originalPointer << 8 | var1 & 255; int var36; - for (var36 = 0; var36 < 16; ++var36) { // L: 198 - var1 = BZip2Decompressor_readNextBit(var0); // L: 199 - if (var1 == 1) { // L: 200 + for (var36 = 0; var36 < 16; ++var36) { + var1 = BZip2Decompressor_readNextBit(var0); + if (var1 == 1) { var0.inUse16[var36] = true; } else { - var0.inUse16[var36] = false; // L: 201 + var0.inUse16[var36] = false; } } - for (var36 = 0; var36 < 256; ++var36) { // L: 203 + for (var36 = 0; var36 < 256; ++var36) { var0.inUse[var36] = false; } int var37; - for (var36 = 0; var36 < 16; ++var36) { // L: 204 - if (var0.inUse16[var36]) { // L: 205 - for (var37 = 0; var37 < 16; ++var37) { // L: 206 - var1 = BZip2Decompressor_readNextBit(var0); // L: 207 - if (var1 == 1) { // L: 208 + for (var36 = 0; var36 < 16; ++var36) { + if (var0.inUse16[var36]) { + for (var37 = 0; var37 < 16; ++var37) { + var1 = BZip2Decompressor_readNextBit(var0); + if (var1 == 1) { var0.inUse[var37 + var36 * 16] = true; } } } } - makeMaps(var0); // L: 212 - int var39 = var0.nInUse + 2; // L: 213 - int var40 = BZip2Decompressor_readBits(3, var0); // L: 214 - int var41 = BZip2Decompressor_readBits(15, var0); // L: 215 + makeMaps(var0); + int var39 = var0.nInUse + 2; + int var40 = BZip2Decompressor_readBits(3, var0); + int var41 = BZip2Decompressor_readBits(15, var0); - for (var36 = 0; var36 < var41; ++var36) { // L: 216 - var37 = 0; // L: 217 + for (var36 = 0; var36 < var41; ++var36) { + var37 = 0; while (true) { - var1 = BZip2Decompressor_readNextBit(var0); // L: 219 - if (var1 == 0) { // L: 220 - var0.selectorMtf[var36] = (byte)var37; // L: 223 + var1 = BZip2Decompressor_readNextBit(var0); + if (var1 == 0) { + var0.selectorMtf[var36] = (byte)var37; break; } - ++var37; // L: 221 + ++var37; } } - byte[] var27 = new byte[6]; // L: 226 + byte[] var27 = new byte[6]; byte var29; - for (var29 = 0; var29 < var40; var27[var29] = var29++) { // L: 229 + for (var29 = 0; var29 < var40; var27[var29] = var29++) { } - for (var36 = 0; var36 < var41; ++var36) { // L: 230 - var29 = var0.selectorMtf[var36]; // L: 231 + for (var36 = 0; var36 < var41; ++var36) { + var29 = var0.selectorMtf[var36]; byte var28; - for (var28 = var27[var29]; var29 > 0; --var29) { // L: 232 233 235 - var27[var29] = var27[var29 - 1]; // L: 234 + for (var28 = var27[var29]; var29 > 0; --var29) { + var27[var29] = var27[var29 - 1]; } - var27[0] = var28; // L: 237 - var0.selector[var36] = var28; // L: 238 + var27[0] = var28; + var0.selector[var36] = var28; } int var38; - for (var38 = 0; var38 < var40; ++var38) { // L: 241 - int var50 = BZip2Decompressor_readBits(5, var0); // L: 242 + for (var38 = 0; var38 < var40; ++var38) { + int var50 = BZip2Decompressor_readBits(5, var0); - for (var36 = 0; var36 < var39; ++var36) { // L: 243 + for (var36 = 0; var36 < var39; ++var36) { while (true) { - var1 = BZip2Decompressor_readNextBit(var0); // L: 245 - if (var1 == 0) { // L: 246 - var0.temp_charArray2d[var38][var36] = (byte)var50; // L: 251 + var1 = BZip2Decompressor_readNextBit(var0); + if (var1 == 0) { + var0.temp_charArray2d[var38][var36] = (byte)var50; break; } - var1 = BZip2Decompressor_readNextBit(var0); // L: 247 - if (var1 == 0) { // L: 248 + var1 = BZip2Decompressor_readNextBit(var0); + if (var1 == 0) { ++var50; } else { - --var50; // L: 249 + --var50; } } } } - for (var38 = 0; var38 < var40; ++var38) { // L: 254 - byte var2 = 32; // L: 255 - byte var3 = 0; // L: 256 + for (var38 = 0; var38 < var40; ++var38) { + byte var2 = 32; + byte var3 = 0; - for (var36 = 0; var36 < var39; ++var36) { // L: 257 - if (var0.temp_charArray2d[var38][var36] > var3) { // L: 258 + for (var36 = 0; var36 < var39; ++var36) { + if (var0.temp_charArray2d[var38][var36] > var3) { var3 = var0.temp_charArray2d[var38][var36]; } - if (var0.temp_charArray2d[var38][var36] < var2) { // L: 259 + if (var0.temp_charArray2d[var38][var36] < var2) { var2 = var0.temp_charArray2d[var38][var36]; } } - BZip2Decompressor_createHuffmanTables(var0.limit[var38], var0.base[var38], var0.perm[var38], var0.temp_charArray2d[var38], var2, var3, var39); // L: 261 - var0.minLens[var38] = var2; // L: 262 + BZip2Decompressor_createHuffmanTables(var0.limit[var38], var0.base[var38], var0.perm[var38], var0.temp_charArray2d[var38], var2, var3, var39); + var0.minLens[var38] = var2; } - int var42 = var0.nInUse + 1; // L: 264 - int var43 = -1; // L: 265 - byte var44 = 0; // L: 266 + int var42 = var0.nInUse + 1; + int var43 = -1; + byte var44 = 0; - for (var36 = 0; var36 <= 255; ++var36) { // L: 267 + for (var36 = 0; var36 <= 255; ++var36) { var0.unzftab[var36] = 0; } - int var56 = 4095; // L: 272 + int var56 = 4095; int var35; int var55; - for (var35 = 15; var35 >= 0; --var35) { // L: 273 - for (var55 = 15; var55 >= 0; --var55) { // L: 274 - var0.ll8[var56] = (byte)(var55 + var35 * 16); // L: 275 - --var56; // L: 276 + for (var35 = 15; var35 >= 0; --var35) { + for (var55 = 15; var55 >= 0; --var55) { + var0.ll8[var56] = (byte)(var55 + var35 * 16); + --var56; } - var0.getAndMoveToFrontDecode_yy[var35] = var56 + 1; // L: 278 + var0.getAndMoveToFrontDecode_yy[var35] = var56 + 1; } - int var47 = 0; // L: 281 + int var47 = 0; byte var54; - if (var44 == 0) { // L: 282 - ++var43; // L: 283 - var44 = 50; // L: 284 - var54 = var0.selector[var43]; // L: 285 - var22 = var0.minLens[var54]; // L: 286 - var23 = var0.limit[var54]; // L: 287 - var25 = var0.perm[var54]; // L: 288 - var24 = var0.base[var54]; // L: 289 + if (var44 == 0) { + ++var43; + var44 = 50; + var54 = var0.selector[var43]; + var22 = var0.minLens[var54]; + var23 = var0.limit[var54]; + var25 = var0.perm[var54]; + var24 = var0.base[var54]; } - int var45 = var44 - 1; // L: 291 - int var51 = var22; // L: 292 + int var45 = var44 - 1; + int var51 = var22; int var52; byte var53; - for (var52 = BZip2Decompressor_readBits(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) { // L: 293 295 298 - ++var51; // L: 296 - var53 = BZip2Decompressor_readNextBit(var0); // L: 297 + for (var52 = BZip2Decompressor_readBits(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) { + ++var51; + var53 = BZip2Decompressor_readNextBit(var0); } - int var46 = var25[var52 - var24[var51]]; // L: 300 + int var46 = var25[var52 - var24[var51]]; while (true) { int[] var10000; int var10002; - while (var46 != var42) { // L: 302 - if (var46 != 0 && var46 != 1) { // L: 303 - int var33 = var46 - 1; // L: 349 + while (var46 != var42) { + if (var46 != 0 && var46 != 1) { + int var33 = var46 - 1; int var30; - if (var33 < 16) { // L: 350 - var30 = var0.getAndMoveToFrontDecode_yy[0]; // L: 351 + if (var33 < 16) { + var30 = var0.getAndMoveToFrontDecode_yy[0]; - for (var1 = var0.ll8[var30 + var33]; var33 > 3; var33 -= 4) { // L: 352 353 359 - int var34 = var30 + var33; // L: 354 - var0.ll8[var34] = var0.ll8[var34 - 1]; // L: 355 - var0.ll8[var34 - 1] = var0.ll8[var34 - 2]; // L: 356 - var0.ll8[var34 - 2] = var0.ll8[var34 - 3]; // L: 357 - var0.ll8[var34 - 3] = var0.ll8[var34 - 4]; // L: 358 + for (var1 = var0.ll8[var30 + var33]; var33 > 3; var33 -= 4) { + int var34 = var30 + var33; + var0.ll8[var34] = var0.ll8[var34 - 1]; + var0.ll8[var34 - 1] = var0.ll8[var34 - 2]; + var0.ll8[var34 - 2] = var0.ll8[var34 - 3]; + var0.ll8[var34 - 3] = var0.ll8[var34 - 4]; } - while (var33 > 0) { // L: 361 - var0.ll8[var30 + var33] = var0.ll8[var30 + var33 - 1]; // L: 362 - --var33; // L: 363 + while (var33 > 0) { + var0.ll8[var30 + var33] = var0.ll8[var30 + var33 - 1]; + --var33; } - var0.ll8[var30] = var1; // L: 365 + var0.ll8[var30] = var1; } else { - int var31 = var33 / 16; // L: 368 - int var32 = var33 % 16; // L: 369 - var30 = var0.getAndMoveToFrontDecode_yy[var31] + var32; // L: 370 + int var31 = var33 / 16; + int var32 = var33 % 16; + var30 = var0.getAndMoveToFrontDecode_yy[var31] + var32; - for (var1 = var0.ll8[var30]; var30 > var0.getAndMoveToFrontDecode_yy[var31]; --var30) { // L: 371 372 374 - var0.ll8[var30] = var0.ll8[var30 - 1]; // L: 373 + for (var1 = var0.ll8[var30]; var30 > var0.getAndMoveToFrontDecode_yy[var31]; --var30) { + var0.ll8[var30] = var0.ll8[var30 - 1]; } - for (var10002 = var0.getAndMoveToFrontDecode_yy[var31]++; var31 > 0; --var31) { // L: 376 377 380 - var10002 = var0.getAndMoveToFrontDecode_yy[var31]--; // L: 378 - var0.ll8[var0.getAndMoveToFrontDecode_yy[var31]] = var0.ll8[var0.getAndMoveToFrontDecode_yy[var31 - 1] + 16 - 1]; // L: 379 + for (var10002 = var0.getAndMoveToFrontDecode_yy[var31]++; var31 > 0; --var31) { + var10002 = var0.getAndMoveToFrontDecode_yy[var31]--; + var0.ll8[var0.getAndMoveToFrontDecode_yy[var31]] = var0.ll8[var0.getAndMoveToFrontDecode_yy[var31 - 1] + 16 - 1]; } - var10002 = var0.getAndMoveToFrontDecode_yy[0]--; // L: 382 - var0.ll8[var0.getAndMoveToFrontDecode_yy[0]] = var1; // L: 383 - if (var0.getAndMoveToFrontDecode_yy[0] == 0) { // L: 384 - var56 = 4095; // L: 385 + var10002 = var0.getAndMoveToFrontDecode_yy[0]--; + var0.ll8[var0.getAndMoveToFrontDecode_yy[0]] = var1; + if (var0.getAndMoveToFrontDecode_yy[0] == 0) { + var56 = 4095; - for (var35 = 15; var35 >= 0; --var35) { // L: 386 - for (var55 = 15; var55 >= 0; --var55) { // L: 387 - var0.ll8[var56] = var0.ll8[var0.getAndMoveToFrontDecode_yy[var35] + var55]; // L: 388 - --var56; // L: 389 + for (var35 = 15; var35 >= 0; --var35) { + for (var55 = 15; var55 >= 0; --var55) { + var0.ll8[var56] = var0.ll8[var0.getAndMoveToFrontDecode_yy[var35] + var55]; + --var56; } - var0.getAndMoveToFrontDecode_yy[var35] = var56 + 1; // L: 391 + var0.getAndMoveToFrontDecode_yy[var35] = var56 + 1; } } } - var10002 = var0.unzftab[var0.seqToUnseq[var1 & 255] & 255]++; // L: 396 - class12.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; // L: 397 - ++var47; // L: 398 - if (var45 == 0) { // L: 399 - ++var43; // L: 400 - var45 = 50; // L: 401 - var54 = var0.selector[var43]; // L: 402 - var22 = var0.minLens[var54]; // L: 403 - var23 = var0.limit[var54]; // L: 404 - var25 = var0.perm[var54]; // L: 405 - var24 = var0.base[var54]; // L: 406 + var10002 = var0.unzftab[var0.seqToUnseq[var1 & 255] & 255]++; + class12.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; + ++var47; + if (var45 == 0) { + ++var43; + var45 = 50; + var54 = var0.selector[var43]; + var22 = var0.minLens[var54]; + var23 = var0.limit[var54]; + var25 = var0.perm[var54]; + var24 = var0.base[var54]; } - --var45; // L: 408 - var51 = var22; // L: 409 + --var45; + var51 = var22; - for (var52 = BZip2Decompressor_readBits(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) { // L: 410 412 415 - ++var51; // L: 413 - var53 = BZip2Decompressor_readNextBit(var0); // L: 414 + for (var52 = BZip2Decompressor_readBits(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) { + ++var51; + var53 = BZip2Decompressor_readNextBit(var0); } - var46 = var25[var52 - var24[var51]]; // L: 417 + var46 = var25[var52 - var24[var51]]; } else { - int var48 = -1; // L: 304 - int var49 = 1; // L: 305 + int var48 = -1; + int var49 = 1; do { - if (var46 == 0) { // L: 307 + if (var46 == 0) { var48 += var49; - } else if (var46 == 1) { // L: 308 + } else if (var46 == 1) { var48 += var49 * 2; } - var49 *= 2; // L: 309 - if (var45 == 0) { // L: 310 - ++var43; // L: 311 - var45 = 50; // L: 312 - var54 = var0.selector[var43]; // L: 313 - var22 = var0.minLens[var54]; // L: 314 - var23 = var0.limit[var54]; // L: 315 - var25 = var0.perm[var54]; // L: 316 - var24 = var0.base[var54]; // L: 317 + var49 *= 2; + if (var45 == 0) { + ++var43; + var45 = 50; + var54 = var0.selector[var43]; + var22 = var0.minLens[var54]; + var23 = var0.limit[var54]; + var25 = var0.perm[var54]; + var24 = var0.base[var54]; } - --var45; // L: 319 - var51 = var22; // L: 320 + --var45; + var51 = var22; - for (var52 = BZip2Decompressor_readBits(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) { // L: 321 323 326 - ++var51; // L: 324 - var53 = BZip2Decompressor_readNextBit(var0); // L: 325 + for (var52 = BZip2Decompressor_readBits(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) { + ++var51; + var53 = BZip2Decompressor_readNextBit(var0); } - var46 = var25[var52 - var24[var51]]; // L: 328 - } while(var46 == 0 || var46 == 1); // L: 329 + var46 = var25[var52 - var24[var51]]; + } while(var46 == 0 || var46 == 1); - ++var48; // L: 330 - var1 = var0.seqToUnseq[var0.ll8[var0.getAndMoveToFrontDecode_yy[0]] & 255]; // L: 331 - var10000 = var0.unzftab; // L: 332 + ++var48; + var1 = var0.seqToUnseq[var0.ll8[var0.getAndMoveToFrontDecode_yy[0]] & 255]; + var10000 = var0.unzftab; - for (var10000[var1 & 255] += var48; var48 > 0; --var48) { // L: 333 336 - class12.BZip2Decompressor_block[var47] = var1 & 255; // L: 334 - ++var47; // L: 335 + for (var10000[var1 & 255] += var48; var48 > 0; --var48) { + class12.BZip2Decompressor_block[var47] = var1 & 255; + ++var47; } } } - var0.su_rNToGo = 0; // L: 421 - var0.out_char = 0; // L: 422 - var0.cftab[0] = 0; // L: 423 + var0.su_rNToGo = 0; + var0.out_char = 0; + var0.cftab[0] = 0; - for (var36 = 1; var36 <= 256; ++var36) { // L: 424 + for (var36 = 1; var36 <= 256; ++var36) { var0.cftab[var36] = var0.unzftab[var36 - 1]; } - for (var36 = 1; var36 <= 256; ++var36) { // L: 425 + for (var36 = 1; var36 <= 256; ++var36) { var10000 = var0.cftab; var10000[var36] += var0.cftab[var36 - 1]; } - for (var36 = 0; var36 < var47; ++var36) { // L: 426 - var1 = (byte)(class12.BZip2Decompressor_block[var36] & 255); // L: 427 - var10000 = class12.BZip2Decompressor_block; // L: 428 + for (var36 = 0; var36 < var47; ++var36) { + var1 = (byte)(class12.BZip2Decompressor_block[var36] & 255); + var10000 = class12.BZip2Decompressor_block; int var10001 = var0.cftab[var1 & 255]; var10000[var10001] |= var36 << 8; - var10002 = var0.cftab[var1 & 255]++; // L: 429 + var10002 = var0.cftab[var1 & 255]++; } - var0.field4484 = class12.BZip2Decompressor_block[var0.originalPointer] >> 8; // L: 431 - var0.nblocks_used = 0; // L: 432 - var0.field4484 = class12.BZip2Decompressor_block[var0.field4484]; // L: 433 - var0.su_ch2 = (byte)(var0.field4484 & 255); // L: 434 - var0.field4484 >>= 8; // L: 436 - ++var0.nblocks_used; // L: 437 - var0.field4478 = var47; // L: 438 - method7574(var0); // L: 439 - if (var0.field4478 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { // L: 440 + var0.field4484 = class12.BZip2Decompressor_block[var0.originalPointer] >> 8; + var0.nblocks_used = 0; + var0.field4484 = class12.BZip2Decompressor_block[var0.field4484]; + var0.su_ch2 = (byte)(var0.field4484 & 255); + var0.field4484 >>= 8; + ++var0.nblocks_used; + var0.field4478 = var47; + method7574(var0); + if (var0.field4478 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { var26 = true; break; } - var26 = false; // L: 441 + var26 = false; break; } } - return; // L: 443 + return; } } @@ -544,7 +544,7 @@ public final class BZip2Decompressor { ) @Export("BZip2Decompressor_readNextByte") static byte BZip2Decompressor_readNextByte(BZip2State var0) { - return (byte)BZip2Decompressor_readBits(8, var0); // L: 447 + return (byte)BZip2Decompressor_readBits(8, var0); } @ObfuscatedName("t") @@ -553,7 +553,7 @@ public final class BZip2Decompressor { ) @Export("BZip2Decompressor_readNextBit") static byte BZip2Decompressor_readNextBit(BZip2State var0) { - return (byte)BZip2Decompressor_readBits(1, var0); // L: 451 + return (byte)BZip2Decompressor_readBits(1, var0); } @ObfuscatedName("s") @@ -562,18 +562,18 @@ public final class BZip2Decompressor { ) @Export("BZip2Decompressor_readBits") static int BZip2Decompressor_readBits(int var0, BZip2State var1) { - while (var1.bsLive < var0) { // L: 456 - var1.bsBuff = var1.bsBuff << 8 | var1.inputArray[var1.nextByte] & 255; // L: 462 - var1.bsLive += 8; // L: 463 - ++var1.nextByte; // L: 464 - ++var1.nextBit_unused; // L: 465 - if (var1.nextBit_unused == 0) { // L: 466 + while (var1.bsLive < var0) { + var1.bsBuff = var1.bsBuff << 8 | var1.inputArray[var1.nextByte] & 255; + var1.bsLive += 8; + ++var1.nextByte; + ++var1.nextBit_unused; + if (var1.nextBit_unused == 0) { } } - int var2 = var1.bsBuff >> var1.bsLive - var0 & (1 << var0) - 1; // L: 458 - var1.bsLive -= var0; // L: 459 - return var2; // L: 460 + int var2 = var1.bsBuff >> var1.bsLive - var0 & (1 << var0) - 1; + var1.bsLive -= var0; + return var2; } @ObfuscatedName("j") @@ -582,59 +582,59 @@ public final class BZip2Decompressor { ) @Export("makeMaps") static void makeMaps(BZip2State var0) { - var0.nInUse = 0; // L: 472 + var0.nInUse = 0; - for (int var1 = 0; var1 < 256; ++var1) { // L: 473 - if (var0.inUse[var1]) { // L: 474 - var0.seqToUnseq[var0.nInUse] = (byte)var1; // L: 475 - ++var0.nInUse; // L: 476 + for (int var1 = 0; var1 < 256; ++var1) { + if (var0.inUse[var1]) { + var0.seqToUnseq[var0.nInUse] = (byte)var1; + ++var0.nInUse; } } - } // L: 479 + } @ObfuscatedName("w") @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 + int var7 = 0; int var8; - for (var8 = var4; var8 <= var5; ++var8) { // L: 487 - for (int var9 = 0; var9 < var6; ++var9) { // L: 488 - if (var8 == var3[var9]) { // L: 489 - var2[var7] = var9; // L: 490 - ++var7; // L: 491 + for (var8 = var4; var8 <= var5; ++var8) { + for (int var9 = 0; var9 < var6; ++var9) { + if (var8 == var3[var9]) { + var2[var7] = var9; + ++var7; } } } - for (var8 = 0; var8 < 23; ++var8) { // L: 495 + for (var8 = 0; var8 < 23; ++var8) { var1[var8] = 0; } - for (var8 = 0; var8 < var6; ++var8) { // L: 496 + for (var8 = 0; var8 < var6; ++var8) { ++var1[var3[var8] + 1]; } - for (var8 = 1; var8 < 23; ++var8) { // L: 497 + for (var8 = 1; var8 < 23; ++var8) { var1[var8] += var1[var8 - 1]; } - for (var8 = 0; var8 < 23; ++var8) { // L: 498 + for (var8 = 0; var8 < 23; ++var8) { var0[var8] = 0; } - int var10 = 0; // L: 499 + int var10 = 0; - for (var8 = var4; var8 <= var5; ++var8) { // L: 500 - var10 += var1[var8 + 1] - var1[var8]; // L: 501 - var0[var8] = var10 - 1; // L: 502 - var10 <<= 1; // L: 503 + for (var8 = var4; var8 <= var5; ++var8) { + var10 += var1[var8 + 1] - var1[var8]; + var0[var8] = var10 - 1; + var10 <<= 1; } - for (var8 = var4 + 1; var8 <= var5; ++var8) { // L: 505 - var1[var8] = (var0[var8 - 1] + 1 << 1) - var1[var8]; // L: 506 + for (var8 = var4 + 1; var8 <= var5; ++var8) { + var1[var8] = (var0[var8 - 1] + 1 << 1) - var1[var8]; } - } // L: 508 + } } diff --git a/runescape-client/src/main/java/BZip2State.java b/runescape-client/src/main/java/BZip2State.java index 538fa333ff..8cd811d0f5 100644 --- a/runescape-client/src/main/java/BZip2State.java +++ b/runescape-client/src/main/java/BZip2State.java @@ -156,29 +156,29 @@ public final class BZip2State { int field4478; BZip2State() { - this.field4513 = 4096; // L: 4 - this.field4481 = 16; // L: 5 - this.field4479 = 258; // L: 6 - this.field4480 = 6; // L: 7 - this.field4502 = 50; // L: 8 - this.field4482 = 18002; // L: 9 - this.nextByte = 0; // L: 11 - this.next_out = 0; // L: 14 - this.unzftab = new int[256]; // L: 25 - this.cftab = new int[257]; // L: 27 - this.inUse = new boolean[256]; // L: 30 - this.inUse16 = new boolean[16]; // L: 31 - this.seqToUnseq = new byte[256]; // L: 32 - this.ll8 = new byte[4096]; // L: 33 - this.getAndMoveToFrontDecode_yy = new int[16]; // L: 34 - this.selector = new byte[18002]; // L: 35 - this.selectorMtf = new byte[18002]; // L: 36 - this.temp_charArray2d = new byte[6][258]; // L: 37 - this.limit = new int[6][258]; // L: 38 - this.base = new int[6][258]; // L: 39 - this.perm = new int[6][258]; // L: 40 - this.minLens = new int[6]; // L: 41 - } // L: 44 + this.field4513 = 4096; + this.field4481 = 16; + this.field4479 = 258; + this.field4480 = 6; + this.field4502 = 50; + this.field4482 = 18002; + this.nextByte = 0; + this.next_out = 0; + this.unzftab = new int[256]; + this.cftab = new int[257]; + this.inUse = new boolean[256]; + this.inUse16 = new boolean[16]; + this.seqToUnseq = new byte[256]; + this.ll8 = new byte[4096]; + this.getAndMoveToFrontDecode_yy = new int[16]; + this.selector = new byte[18002]; + this.selectorMtf = new byte[18002]; + this.temp_charArray2d = new byte[6][258]; + this.limit = new int[6][258]; + this.base = new int[6][258]; + this.perm = new int[6][258]; + this.minLens = new int[6]; + } @ObfuscatedName("js") @ObfuscatedSignature( @@ -186,12 +186,12 @@ public final class BZip2State { garbageValue = "-1894772144" ) static boolean method7571(int var0) { - for (int var1 = 0; var1 < Client.field701; ++var1) { // L: 11872 - if (Client.field522[var1] == var0) { // L: 11873 + for (int var1 = 0; var1 < Client.field701; ++var1) { + if (Client.field522[var1] == var0) { return true; } } - return false; // L: 11875 + return false; } } diff --git a/runescape-client/src/main/java/BoundaryObject.java b/runescape-client/src/main/java/BoundaryObject.java index a0c1b89785..7a71589881 100644 --- a/runescape-client/src/main/java/BoundaryObject.java +++ b/runescape-client/src/main/java/BoundaryObject.java @@ -77,9 +77,9 @@ public final class BoundaryObject { int flags; BoundaryObject() { - this.tag = 0L; // L: 11 - this.flags = 0; // L: 12 - } // L: 14 + this.tag = 0L; + this.flags = 0; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -88,19 +88,19 @@ public final class BoundaryObject { ) public static boolean method4321(File var0, boolean var1) { try { - RandomAccessFile var2 = new RandomAccessFile(var0, "rw"); // L: 58 - int var3 = var2.read(); // L: 59 - var2.seek(0L); // L: 60 - var2.write(var3); // L: 61 - var2.seek(0L); // L: 62 - var2.close(); // L: 63 - if (var1) { // L: 64 + RandomAccessFile var2 = new RandomAccessFile(var0, "rw"); + int var3 = var2.read(); + var2.seek(0L); + var2.write(var3); + var2.seek(0L); + var2.close(); + if (var1) { var0.delete(); } - return true; // L: 65 - } catch (Exception var4) { // L: 67 - return false; // L: 68 + return true; + } catch (Exception var4) { + return false; } } @@ -111,28 +111,28 @@ public final class BoundaryObject { ) @Export("changeWorld") static void changeWorld(World var0) { - if (var0.isMembersOnly() != Client.isMembersWorld) { // L: 1958 - Client.isMembersWorld = var0.isMembersOnly(); // L: 1959 - UserComparator6.method2552(var0.isMembersOnly()); // L: 1960 + if (var0.isMembersOnly() != Client.isMembersWorld) { + Client.isMembersWorld = var0.isMembersOnly(); + UserComparator6.method2552(var0.isMembersOnly()); } - if (var0.properties != Client.worldProperties) { // L: 1962 - Archive var1 = UserComparator6.archive8; // L: 1963 - int var2 = var0.properties; // L: 1964 - if ((var2 & 536870912) != 0) { // L: 1966 - Login.logoSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); // L: 1967 - } else if ((var2 & 1073741824) != 0) { // L: 1969 - Login.logoSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); // L: 1970 + if (var0.properties != Client.worldProperties) { + Archive var1 = UserComparator6.archive8; + int var2 = var0.properties; + if ((var2 & 536870912) != 0) { + Login.logoSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); + } else if ((var2 & 1073741824) != 0) { + Login.logoSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); } else { - Login.logoSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); // L: 1973 + Login.logoSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); } } - class185.worldHost = var0.host; // L: 1977 - Client.worldId = var0.id; // L: 1978 - Client.worldProperties = var0.properties; // L: 1979 - GameObject.worldPort = Client.gameBuild == 0 ? 43594 : var0.id + 40000; // L: 1980 - class133.js5Port = Client.gameBuild == 0 ? 443 : var0.id + 50000; // L: 1981 - class129.currentPort = GameObject.worldPort; // L: 1982 - } // L: 1983 + class185.worldHost = var0.host; + Client.worldId = var0.id; + Client.worldProperties = var0.properties; + GameObject.worldPort = Client.gameBuild == 0 ? 43594 : var0.id + 40000; + class133.js5Port = Client.gameBuild == 0 ? 443 : var0.id + 50000; + class129.currentPort = GameObject.worldPort; + } } diff --git a/runescape-client/src/main/java/Bounds.java b/runescape-client/src/main/java/Bounds.java index cdbf6c9d83..51165ab0e4 100644 --- a/runescape-client/src/main/java/Bounds.java +++ b/runescape-client/src/main/java/Bounds.java @@ -35,7 +35,7 @@ public class Bounds { public Bounds(int var1, int var2, int var3, int var4) { this.setLow(var1, var2); this.setHigh(var3, var4); - } // L: 16 + } public Bounds(int var1, int var2) { this(0, 0, var1, var2); @@ -48,9 +48,9 @@ public class Bounds { ) @Export("setLow") public void setLow(int var1, int var2) { - this.lowX = var1; // L: 19 - this.lowY = var2; // L: 20 - } // L: 21 + this.lowX = var1; + this.lowY = var2; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -59,9 +59,9 @@ public class Bounds { ) @Export("setHigh") public void setHigh(int var1, int var2) { - this.highX = var1; // L: 24 - this.highY = var2; // L: 25 - } // L: 26 + this.highX = var1; + this.highY = var2; + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -69,7 +69,7 @@ public class Bounds { garbageValue = "922229094" ) public boolean method6577(int var1, int var2) { - return var1 >= this.lowX && var1 < this.lowX + this.highX && var2 >= this.lowY && var2 < this.highY + this.lowY; // L: 29 + return var1 >= this.lowX && var1 < this.lowX + this.highX && var2 >= this.lowY && var2 < this.highY + this.lowY; } @ObfuscatedName("m") @@ -78,9 +78,9 @@ public class Bounds { garbageValue = "3129" ) public void method6578(Bounds var1, Bounds var2) { - this.method6579(var1, var2); // L: 37 - this.method6574(var1, var2); // L: 38 - } // L: 39 + this.method6579(var1, var2); + this.method6574(var1, var2); + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -88,22 +88,22 @@ public class Bounds { garbageValue = "381" ) void method6579(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 * 288726831 - (var1.lowX * 288726831 - this.lowX * 288726831)) * 64358351; // L: 45 - var2.lowX = var1.lowX; // L: 46 + var2.lowX = this.lowX; + var2.highX = this.highX; + if (this.lowX < var1.lowX) { + var2.highX = (var2.highX * 288726831 - (var1.lowX * 288726831 - this.lowX * 288726831)) * 64358351; + var2.lowX = var1.lowX; } - if (var2.method6581() > var1.method6581()) { // L: 48 - var2.highX -= var2.method6581() - var1.method6581(); // L: 49 + if (var2.method6581() > var1.method6581()) { + var2.highX -= var2.method6581() - var1.method6581(); } - if (var2.highX < 0) { // L: 51 + if (var2.highX < 0) { var2.highX = 0; } - } // L: 52 + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -111,22 +111,22 @@ public class Bounds { garbageValue = "-1164608832" ) void method6574(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 * -327903587 - (var1.lowY * -327903587 - this.lowY * -327903587)) * 1178509237; // L: 58 - var2.lowY = var1.lowY; // L: 59 + var2.lowY = this.lowY; + var2.highY = this.highY; + if (this.lowY < var1.lowY) { + var2.highY = (var2.highY * -327903587 - (var1.lowY * -327903587 - this.lowY * -327903587)) * 1178509237; + var2.lowY = var1.lowY; } - if (var2.method6582() > var1.method6582()) { // L: 61 - var2.highY -= var2.method6582() - var1.method6582(); // L: 62 + if (var2.method6582() > var1.method6582()) { + var2.highY -= var2.method6582() - var1.method6582(); } - if (var2.highY < 0) { // L: 64 + if (var2.highY < 0) { var2.highY = 0; } - } // L: 65 + } @ObfuscatedName("j") @ObfuscatedSignature( @@ -134,7 +134,7 @@ public class Bounds { garbageValue = "-1484273265" ) int method6581() { - return this.lowX + this.highX; // L: 68 + return this.lowX + this.highX; } @ObfuscatedName("w") @@ -143,23 +143,23 @@ public class Bounds { garbageValue = "-8" ) int method6582() { - return this.lowY + this.highY; // L: 72 + return this.lowY + this.highY; } public String toString() { - return null; // L: 33 + return null; } @ObfuscatedName("c") public static final void method6608(long var0) { - if (var0 > 0L) { // L: 9 - if (var0 % 10L == 0L) { // L: 10 - class411.method7280(var0 - 1L); // L: 11 - class411.method7280(1L); // L: 12 + if (var0 > 0L) { + if (var0 % 10L == 0L) { + class411.method7280(var0 - 1L); + class411.method7280(1L); } else { - class411.method7280(var0); // L: 14 + class411.method7280(var0); } } - } // L: 15 + } } diff --git a/runescape-client/src/main/java/Buddy.java b/runescape-client/src/main/java/Buddy.java index 56395f6f8e..2d77cbc4dc 100644 --- a/runescape-client/src/main/java/Buddy.java +++ b/runescape-client/src/main/java/Buddy.java @@ -27,8 +27,8 @@ public class Buddy extends User { public int rank; Buddy() { - this.world = -1; // L: 4 - } // L: 8 + this.world = -1; + } @ObfuscatedName("aa") @ObfuscatedSignature( @@ -37,9 +37,9 @@ public class Buddy extends User { ) @Export("set") void set(int var1, int var2) { - this.world = var1; // L: 11 - this.int2 = var2; // L: 12 - } // L: 13 + this.world = var1; + this.int2 = var2; + } @ObfuscatedName("as") @ObfuscatedSignature( @@ -48,7 +48,7 @@ public class Buddy extends User { ) @Export("getWorld") public int getWorld() { - return this.world; // L: 16 + return this.world; } @ObfuscatedName("at") @@ -58,7 +58,7 @@ public class Buddy extends User { ) @Export("hasWorld") public boolean hasWorld() { - return this.world > 0; // L: 20 + return this.world > 0; } @ObfuscatedName("ga") @@ -68,36 +68,36 @@ public class Buddy extends User { ) @Export("addPlayerToScene") static void addPlayerToScene(Player var0, boolean var1) { - if (var0 != null && var0.isVisible() && !var0.isHidden) { // L: 5447 - var0.isUnanimated = false; // L: 5448 - if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.idleSequence == var0.movementSequence) { // L: 5449 5450 + if (var0 != null && var0.isVisible() && !var0.isHidden) { + var0.isUnanimated = false; + if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.idleSequence == var0.movementSequence) { var0.isUnanimated = true; } - int var2 = var0.x >> 7; // L: 5452 - int var3 = var0.y >> 7; // L: 5453 - if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 5454 - long var4 = SecureRandomFuture.calculateTag(0, 0, 0, false, var0.index); // L: 5455 - if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { // L: 5456 - var0.isUnanimated = false; // L: 5457 - var0.tileHeight = FaceNormal.getTileHeight(var0.x, var0.y, class20.Client_plane); // L: 5458 - var0.playerCycle = Client.cycle; // L: 5459 - class7.scene.addNullableObject(class20.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.minX, var0.minY, var0.maxX, var0.maxY); // L: 5460 + int var2 = var0.x >> 7; + int var3 = var0.y >> 7; + if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { + long var4 = SecureRandomFuture.calculateTag(0, 0, 0, false, var0.index); + if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { + var0.isUnanimated = false; + var0.tileHeight = FaceNormal.getTileHeight(var0.x, var0.y, class20.Client_plane); + var0.playerCycle = Client.cycle; + class7.scene.addNullableObject(class20.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.minX, var0.minY, var0.maxX, var0.maxY); } else { - if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { // L: 5463 - if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { // L: 5464 + if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { + if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { return; } - Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; // L: 5465 + Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; } - var0.tileHeight = FaceNormal.getTileHeight(var0.x, var0.y, class20.Client_plane); // L: 5467 - var0.playerCycle = Client.cycle; // L: 5468 - class7.scene.drawEntity(class20.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); // L: 5469 + var0.tileHeight = FaceNormal.getTileHeight(var0.x, var0.y, class20.Client_plane); + var0.playerCycle = Client.cycle; + class7.scene.drawEntity(class20.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); } } } - } // L: 5473 + } } diff --git a/runescape-client/src/main/java/BuddyRankComparator.java b/runescape-client/src/main/java/BuddyRankComparator.java index ffb6a76633..be0cf74117 100644 --- a/runescape-client/src/main/java/BuddyRankComparator.java +++ b/runescape-client/src/main/java/BuddyRankComparator.java @@ -16,8 +16,8 @@ public class BuddyRankComparator extends AbstractUserComparator { final boolean reversed; public BuddyRankComparator(boolean var1) { - this.reversed = var1; // L: 10 - } // L: 11 + this.reversed = var1; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -26,15 +26,15 @@ public class BuddyRankComparator extends AbstractUserComparator { ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (var2.rank != var1.rank) { // L: 14 - return this.reversed ? var1.rank - var2.rank : var2.rank - var1.rank; // L: 15 + if (var2.rank != var1.rank) { + return this.reversed ? var1.rank - var2.rank : var2.rank - var1.rank; } else { - return this.compareUser(var1, var2); // L: 17 + return this.compareUser(var1, var2); } } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 + return this.compareBuddy((Buddy)var1, (Buddy)var2); } @ObfuscatedName("ld") @@ -43,11 +43,11 @@ public class BuddyRankComparator extends AbstractUserComparator { garbageValue = "1683360444" ) public static void method2547(int var0, int var1, int var2, boolean var3) { - PacketBufferNode var4 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2819, Client.packetWriter.isaacCipher); // L: 12675 - var4.packetBuffer.method7527(var3 ? Client.field607 * 1420477321 * -1761828167 : 0); // L: 12676 - var4.packetBuffer.method7349(var0); // L: 12677 - var4.packetBuffer.method7343(var2); // L: 12678 - var4.packetBuffer.writeShort(var1); // L: 12679 - Client.packetWriter.addNode(var4); // L: 12680 - } // L: 12681 + PacketBufferNode var4 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2819, Client.packetWriter.isaacCipher); + var4.packetBuffer.method7527(var3 ? Client.field607 * 1420477321 * -1761828167 : 0); + var4.packetBuffer.method7349(var0); + var4.packetBuffer.method7343(var2); + var4.packetBuffer.writeShort(var1); + Client.packetWriter.addNode(var4); + } } diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java index 12c6b2f5f2..c6d991ba36 100644 --- a/runescape-client/src/main/java/Buffer.java +++ b/runescape-client/src/main/java/Buffer.java @@ -25,50 +25,50 @@ public class Buffer extends Node { public int offset; static { - crc32Table = new int[256]; // L: 16 + crc32Table = new int[256]; int var2; - for (int var1 = 0; var1 < 256; ++var1) { // L: 21 - int var4 = var1; // L: 22 + for (int var1 = 0; var1 < 256; ++var1) { + int var4 = var1; - for (var2 = 0; var2 < 8; ++var2) { // L: 23 - if ((var4 & 1) == 1) { // L: 24 + for (var2 = 0; var2 < 8; ++var2) { + if ((var4 & 1) == 1) { var4 = var4 >>> 1 ^ -306674912; } else { - var4 >>>= 1; // L: 25 + var4 >>>= 1; } } - crc32Table[var1] = var4; // L: 27 + crc32Table[var1] = var4; } - crc64Table = new long[256]; // L: 31 + crc64Table = new long[256]; - for (var2 = 0; var2 < 256; ++var2) { // L: 36 - long var0 = (long)var2; // L: 37 + for (var2 = 0; var2 < 256; ++var2) { + long var0 = (long)var2; - for (int var3 = 0; var3 < 8; ++var3) { // L: 38 - if (1L == (var0 & 1L)) { // L: 39 + for (int var3 = 0; var3 < 8; ++var3) { + if (1L == (var0 & 1L)) { var0 = var0 >>> 1 ^ -3932672073523589310L; } else { - var0 >>>= 1; // L: 40 + var0 >>>= 1; } } - crc64Table[var2] = var0; // L: 42 + crc64Table[var2] = var0; } - } // L: 44 + } public Buffer(int var1) { - this.array = class285.ByteArrayPool_getArray(var1); // L: 56 - this.offset = 0; // L: 57 - } // L: 58 + this.array = class285.ByteArrayPool_getArray(var1); + this.offset = 0; + } public Buffer(byte[] var1) { - this.array = var1; // L: 61 - this.offset = 0; // L: 62 - } // L: 63 + this.array = var1; + this.offset = 0; + } @ObfuscatedName("aj") @ObfuscatedSignature( @@ -77,12 +77,12 @@ public class Buffer extends Node { ) @Export("releaseArray") public void releaseArray() { - if (this.array != null) { // L: 66 + if (this.array != null) { class144.ByteArrayPool_release(this.array); } - this.array = null; // L: 67 - } // L: 68 + this.array = null; + } @ObfuscatedName("af") @ObfuscatedSignature( @@ -91,8 +91,8 @@ public class Buffer extends Node { ) @Export("writeByte") public void writeByte(int var1) { - this.array[++this.offset - 1] = (byte)var1; // L: 71 - } // L: 72 + this.array[++this.offset - 1] = (byte)var1; + } @ObfuscatedName("ar") @ObfuscatedSignature( @@ -101,9 +101,9 @@ public class Buffer extends Node { ) @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 + this.array[++this.offset - 1] = (byte)(var1 >> 8); + this.array[++this.offset - 1] = (byte)var1; + } @ObfuscatedName("ag") @ObfuscatedSignature( @@ -112,10 +112,10 @@ public class Buffer extends Node { ) @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 + this.array[++this.offset - 1] = (byte)(var1 >> 16); + this.array[++this.offset - 1] = (byte)(var1 >> 8); + this.array[++this.offset - 1] = (byte)var1; + } @ObfuscatedName("al") @ObfuscatedSignature( @@ -124,35 +124,35 @@ public class Buffer extends Node { ) @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 + this.array[++this.offset - 1] = (byte)(var1 >> 24); + this.array[++this.offset - 1] = (byte)(var1 >> 16); + this.array[++this.offset - 1] = (byte)(var1 >> 8); + this.array[++this.offset - 1] = (byte)var1; + } @ObfuscatedName("aa") @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 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); + this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); + this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); + this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); + this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); + this.array[++this.offset - 1] = (byte)((int)var1); + } @ObfuscatedName("as") @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)((int)(var1 >> 56)); + this.array[++this.offset - 1] = (byte)((int)(var1 >> 48)); + this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); + this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); + this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); + this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); + this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); + this.array[++this.offset - 1] = (byte)((int)var1); + } @ObfuscatedName("at") @ObfuscatedSignature( @@ -161,8 +161,8 @@ public class Buffer extends Node { ) @Export("writeBoolean") public void writeBoolean(boolean var1) { - this.writeByte(var1 ? 1 : 0); // L: 113 - } // L: 114 + this.writeByte(var1 ? 1 : 0); + } @ObfuscatedName("aq") @ObfuscatedSignature( @@ -171,14 +171,14 @@ public class Buffer extends Node { ) @Export("writeStringCp1252NullTerminated") public void writeStringCp1252NullTerminated(String var1) { - int var2 = var1.indexOf(0); // L: 121 - if (var2 >= 0) { // L: 122 + int var2 = var1.indexOf(0); + if (var2 >= 0) { throw new IllegalArgumentException(""); } else { - this.offset += HitSplatDefinition.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 123 - this.array[++this.offset - 1] = 0; // L: 124 + this.offset += HitSplatDefinition.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); + this.array[++this.offset - 1] = 0; } - } // L: 125 + } @ObfuscatedName("aw") @ObfuscatedSignature( @@ -187,15 +187,15 @@ public class Buffer extends Node { ) @Export("writeStringCp1252NullCircumfixed") public void writeStringCp1252NullCircumfixed(String var1) { - int var2 = var1.indexOf(0); // L: 128 - if (var2 >= 0) { // L: 129 + int var2 = var1.indexOf(0); + if (var2 >= 0) { throw new IllegalArgumentException(""); } else { - this.array[++this.offset - 1] = 0; // L: 130 - this.offset += HitSplatDefinition.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 131 - this.array[++this.offset - 1] = 0; // L: 132 + this.array[++this.offset - 1] = 0; + this.offset += HitSplatDefinition.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); + this.array[++this.offset - 1] = 0; } - } // L: 133 + } @ObfuscatedName("ay") @ObfuscatedSignature( @@ -204,24 +204,24 @@ public class Buffer extends Node { ) @Export("writeCESU8") public void writeCESU8(CharSequence var1) { - int var3 = var1.length(); // L: 138 - int var4 = 0; // L: 139 + int var3 = var1.length(); + int var4 = 0; - for (int var5 = 0; var5 < var3; ++var5) { // L: 140 - char var6 = var1.charAt(var5); // L: 141 - if (var6 <= 127) { // L: 142 + for (int var5 = 0; var5 < var3; ++var5) { + char var6 = var1.charAt(var5); + if (var6 <= 127) { ++var4; - } else if (var6 <= 2047) { // L: 143 + } else if (var6 <= 2047) { var4 += 2; } else { - var4 += 3; // L: 144 + var4 += 3; } } - this.array[++this.offset - 1] = 0; // L: 149 - this.writeVarInt(var4); // L: 150 - this.offset += class400.method7147(this.array, this.offset, var1); // L: 151 - } // L: 152 + this.array[++this.offset - 1] = 0; + this.writeVarInt(var4); + this.offset += class400.method7147(this.array, this.offset, var1); + } @ObfuscatedName("ae") @ObfuscatedSignature( @@ -230,11 +230,11 @@ public class Buffer extends Node { ) @Export("writeBytes") public void writeBytes(byte[] var1, int var2, int var3) { - for (int var4 = var2; var4 < var3 + var2; ++var4) { // L: 155 + for (int var4 = var2; var4 < var3 + var2; ++var4) { this.array[++this.offset - 1] = var1[var4]; } - } // L: 156 + } @ObfuscatedName("ak") @ObfuscatedSignature( @@ -242,8 +242,8 @@ public class Buffer extends Node { garbageValue = "55" ) public void method7356(Buffer var1) { - this.writeBytes(var1.array, 0, var1.offset); // L: 159 - } // L: 160 + this.writeBytes(var1.array, 0, var1.offset); + } @ObfuscatedName("ad") @ObfuscatedSignature( @@ -252,15 +252,15 @@ public class Buffer extends Node { ) @Export("writeLengthInt") public void writeLengthInt(int var1) { - if (var1 < 0) { // L: 163 - throw new IllegalArgumentException(); // L: 164 + if (var1 < 0) { + throw new IllegalArgumentException(); } 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 + this.array[this.offset - var1 - 4] = (byte)(var1 >> 24); + this.array[this.offset - var1 - 3] = (byte)(var1 >> 16); + this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); + this.array[this.offset - var1 - 1] = (byte)var1; } - } // L: 170 + } @ObfuscatedName("bp") @ObfuscatedSignature( @@ -269,13 +269,13 @@ public class Buffer extends Node { ) @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 + if (var1 >= 0 && var1 <= 65535) { + this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); + this.array[this.offset - var1 - 1] = (byte)var1; } else { - throw new IllegalArgumentException(); // L: 174 + throw new IllegalArgumentException(); } - } // L: 178 + } @ObfuscatedName("bd") @ObfuscatedSignature( @@ -283,12 +283,12 @@ public class Buffer extends Node { garbageValue = "852369875" ) public void method7357(int var1) { - if (var1 >= 0 && var1 <= 255) { // L: 181 - this.array[this.offset - var1 - 1] = (byte)var1; // L: 184 + if (var1 >= 0 && var1 <= 255) { + this.array[this.offset - var1 - 1] = (byte)var1; } else { - throw new IllegalArgumentException(); // L: 182 + throw new IllegalArgumentException(); } - } // L: 185 + } @ObfuscatedName("ba") @ObfuscatedSignature( @@ -297,14 +297,14 @@ public class Buffer extends Node { ) @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 + if (var1 >= 0 && var1 < 128) { + this.writeByte(var1); + } else if (var1 >= 0 && var1 < 32768) { + this.writeShort(var1 + 32768); } else { - throw new IllegalArgumentException(); // L: 196 + throw new IllegalArgumentException(); } - } // L: 190 194 + } @ObfuscatedName("bq") @ObfuscatedSignature( @@ -313,24 +313,24 @@ public class Buffer extends Node { ) @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 + if ((var1 & -128) != 0) { + if ((var1 & -16384) != 0) { + if ((var1 & -2097152) != 0) { + if ((var1 & -268435456) != 0) { this.writeByte(var1 >>> 28 | 128); } - this.writeByte(var1 >>> 21 | 128); // L: 204 + this.writeByte(var1 >>> 21 | 128); } - this.writeByte(var1 >>> 14 | 128); // L: 206 + this.writeByte(var1 >>> 14 | 128); } - this.writeByte(var1 >>> 7 | 128); // L: 208 + this.writeByte(var1 >>> 7 | 128); } - this.writeByte(var1 & 127); // L: 210 - } // L: 211 + this.writeByte(var1 & 127); + } @ObfuscatedName("bg") @ObfuscatedSignature( @@ -339,7 +339,7 @@ public class Buffer extends Node { ) @Export("readUnsignedByte") public int readUnsignedByte() { - return this.array[++this.offset - 1] & 255; // L: 214 + return this.array[++this.offset - 1] & 255; } @ObfuscatedName("br") @@ -349,7 +349,7 @@ public class Buffer extends Node { ) @Export("readByte") public byte readByte() { - return this.array[++this.offset - 1]; // L: 218 + return this.array[++this.offset - 1]; } @ObfuscatedName("bi") @@ -359,8 +359,8 @@ public class Buffer extends Node { ) @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 + this.offset += 2; + return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); } @ObfuscatedName("bm") @@ -370,13 +370,13 @@ public class Buffer extends Node { ) @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 + this.offset += 2; + int var1 = (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); + if (var1 > 32767) { var1 -= 65536; } - return var1; // L: 230 + return var1; } @ObfuscatedName("bs") @@ -386,8 +386,8 @@ public class Buffer extends Node { ) @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 + this.offset += 3; + return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); } @ObfuscatedName("bv") @@ -397,8 +397,8 @@ public class Buffer extends Node { ) @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 + this.offset += 4; + return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 24); } @ObfuscatedName("bb") @@ -408,9 +408,9 @@ public class Buffer extends Node { ) @Export("readLong") public long readLong() { - long var1 = (long)this.readInt() & 4294967295L; // L: 244 - long var3 = (long)this.readInt() & 4294967295L; // L: 245 - return (var1 << 32) + var3; // L: 246 + long var1 = (long)this.readInt() & 4294967295L; + long var3 = (long)this.readInt() & 4294967295L; + return (var1 << 32) + var3; } @ObfuscatedName("bc") @@ -419,7 +419,7 @@ public class Buffer extends Node { garbageValue = "-1631750820" ) public float method7369() { - return Float.intBitsToFloat(this.readInt()); // L: 250 + return Float.intBitsToFloat(this.readInt()); } @ObfuscatedName("bx") @@ -429,7 +429,7 @@ public class Buffer extends Node { ) @Export("readBoolean") public boolean readBoolean() { - return (this.readUnsignedByte() & 1) == 1; // L: 254 + return (this.readUnsignedByte() & 1) == 1; } @ObfuscatedName("bt") @@ -439,11 +439,11 @@ public class Buffer extends Node { ) @Export("readStringCp1252NullTerminatedOrNull") public String readStringCp1252NullTerminatedOrNull() { - if (this.array[this.offset] == 0) { // L: 258 - ++this.offset; // L: 259 - return null; // L: 260 + if (this.array[this.offset] == 0) { + ++this.offset; + return null; } else { - return this.readStringCp1252NullTerminated(); // L: 262 + return this.readStringCp1252NullTerminated(); } } @@ -454,13 +454,13 @@ public class Buffer extends Node { ) @Export("readStringCp1252NullTerminated") public String readStringCp1252NullTerminated() { - int var1 = this.offset; // L: 266 + int var1 = this.offset; - while (this.array[++this.offset - 1] != 0) { // L: 267 + while (this.array[++this.offset - 1] != 0) { } - int var2 = this.offset - var1 - 1; // L: 268 - return var2 == 0 ? "" : PendingSpawn.decodeStringCp1252(this.array, var1, var2); // L: 269 270 + int var2 = this.offset - var1 - 1; + return var2 == 0 ? "" : PendingSpawn.decodeStringCp1252(this.array, var1, var2); } @ObfuscatedName("bn") @@ -470,17 +470,17 @@ public class Buffer extends Node { ) @Export("readStringCp1252NullCircumfixed") public String readStringCp1252NullCircumfixed() { - byte var1 = this.array[++this.offset - 1]; // L: 274 - if (var1 != 0) { // L: 275 + byte var1 = this.array[++this.offset - 1]; + if (var1 != 0) { throw new IllegalStateException(""); } else { - int var2 = this.offset; // L: 276 + int var2 = this.offset; - while (this.array[++this.offset - 1] != 0) { // L: 277 + while (this.array[++this.offset - 1] != 0) { } - int var3 = this.offset - var2 - 1; // L: 278 - return var3 == 0 ? "" : PendingSpawn.decodeStringCp1252(this.array, var2, var3); // L: 279 280 + int var3 = this.offset - var2 - 1; + return var3 == 0 ? "" : PendingSpawn.decodeStringCp1252(this.array, var2, var3); } } @@ -491,17 +491,17 @@ public class Buffer extends Node { ) @Export("readCESU8") public String readCESU8() { - byte var1 = this.array[++this.offset - 1]; // L: 284 - if (var1 != 0) { // L: 285 + byte var1 = this.array[++this.offset - 1]; + if (var1 != 0) { throw new IllegalStateException(""); } else { - int var2 = this.readVarInt(); // L: 286 + int var2 = this.readVarInt(); if (var2 + this.offset > this.array.length) { - throw new IllegalStateException(""); // L: 287 + throw new IllegalStateException(""); } else { - String var3 = MusicPatchNode.method5294(this.array, this.offset, var2); // L: 288 - this.offset += var2; // L: 289 - return var3; // L: 290 + String var3 = MusicPatchNode.method5294(this.array, this.offset, var2); + this.offset += var2; + return var3; } } } @@ -514,10 +514,10 @@ public class Buffer extends Node { @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: 294 + var1[var4] = this.array[++this.offset - 1]; } - } // L: 295 + } @ObfuscatedName("bk") @ObfuscatedSignature( @@ -526,8 +526,8 @@ public class Buffer extends Node { ) @Export("readShortSmart") public int readShortSmart() { - int var1 = this.array[this.offset] & 255; // L: 298 - return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; // L: 299 300 + int var1 = this.array[this.offset] & 255; + return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; } @ObfuscatedName("bo") @@ -537,8 +537,8 @@ public class Buffer extends Node { ) @Export("readUShortSmart") public int readUShortSmart() { - int var1 = this.array[this.offset] & 255; // L: 304 - return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; // L: 305 306 + int var1 = this.array[this.offset] & 255; + return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; } @ObfuscatedName("bf") @@ -547,15 +547,15 @@ public class Buffer extends Node { garbageValue = "-487591152" ) public int method7378() { - int var1 = 0; // L: 310 + int var1 = 0; int var2; - for (var2 = this.readUShortSmart(); var2 == 32767; var2 = this.readUShortSmart()) { // L: 311 312 314 - var1 += 32767; // L: 313 + for (var2 = this.readUShortSmart(); var2 == 32767; var2 = this.readUShortSmart()) { + var1 += 32767; } - var1 += var2; // L: 316 - return var1; // L: 317 + var1 += var2; + return var1; } @ObfuscatedName("be") @@ -564,7 +564,7 @@ public class Buffer extends Node { garbageValue = "-2012313947" ) public int method7561() { - return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); // L: 321 322 + return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); } @ObfuscatedName("ce") @@ -573,11 +573,11 @@ public class Buffer extends Node { garbageValue = "-745038115" ) public int method7400() { - if (this.array[this.offset] < 0) { // L: 326 + if (this.array[this.offset] < 0) { return this.readInt() & Integer.MAX_VALUE; } else { - int var1 = this.readUnsignedShort(); // L: 327 - return var1 == 32767 ? -1 : var1; // L: 328 + int var1 = this.readUnsignedShort(); + return var1 == 32767 ? -1 : var1; } } @@ -588,14 +588,14 @@ public class Buffer extends Node { ) @Export("readVarInt") public int readVarInt() { - byte var1 = this.array[++this.offset - 1]; // L: 333 + byte var1 = this.array[++this.offset - 1]; int var2; - for (var2 = 0; var1 < 0; var1 = this.array[++this.offset - 1]) { // L: 334 335 337 - var2 = (var2 | var1 & 127) << 7; // L: 336 + for (var2 = 0; var1 < 0; var1 = this.array[++this.offset - 1]) { + var2 = (var2 | var1 & 127) << 7; } - return var2 | var1; // L: 339 + return var2 | var1; } @ObfuscatedName("cp") @@ -605,26 +605,26 @@ public class Buffer extends Node { ) @Export("xteaEncryptAll") public void xteaEncryptAll(int[] var1) { - int var2 = this.offset / 8; // L: 343 - this.offset = 0; // L: 344 + int var2 = this.offset / 8; + this.offset = 0; - for (int var3 = 0; var3 < var2; ++var3) { // L: 345 - int var4 = this.readInt(); // L: 346 - int var5 = this.readInt(); // L: 347 - int var6 = 0; // L: 348 - int var7 = -1640531527; // L: 349 + for (int var3 = 0; var3 < var2; ++var3) { + int var4 = this.readInt(); + int var5 = this.readInt(); + int var6 = 0; + int var7 = -1640531527; - for (int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6) { // L: 350 351 354 - var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]; // L: 352 - var6 += var7; // L: 353 + for (int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6) { + var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]; + var6 += var7; } - this.offset -= 8; // L: 356 - this.writeInt(var4); // L: 357 - this.writeInt(var5); // L: 358 + this.offset -= 8; + this.writeInt(var4); + this.writeInt(var5); } - } // L: 360 + } @ObfuscatedName("cd") @ObfuscatedSignature( @@ -633,26 +633,26 @@ public class Buffer extends Node { ) @Export("xteaDecryptAll") public void xteaDecryptAll(int[] var1) { - int var2 = this.offset / 8; // L: 363 - this.offset = 0; // L: 364 + int var2 = this.offset / 8; + this.offset = 0; - for (int var3 = 0; var3 < var2; ++var3) { // L: 365 - int var4 = this.readInt(); // L: 366 - int var5 = this.readInt(); // L: 367 - int var6 = -957401312; // L: 368 - int var7 = -1640531527; // L: 369 + for (int var3 = 0; var3 < var2; ++var3) { + int var4 = this.readInt(); + int var5 = this.readInt(); + int var6 = -957401312; + int var7 = -1640531527; - for (int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]) { // L: 370 371 374 - var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6; // L: 372 - var6 -= var7; // L: 373 + for (int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]) { + var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6; + var6 -= var7; } - this.offset -= 8; // L: 376 - this.writeInt(var4); // L: 377 - this.writeInt(var5); // L: 378 + this.offset -= 8; + this.writeInt(var4); + this.writeInt(var5); } - } // L: 380 + } @ObfuscatedName("ck") @ObfuscatedSignature( @@ -661,28 +661,28 @@ public class Buffer extends Node { ) @Export("xteaEncrypt") public void xteaEncrypt(int[] var1, int var2, int var3) { - int var4 = this.offset; // L: 383 - this.offset = var2; // L: 384 - int var5 = (var3 - var2) / 8; // L: 385 + int var4 = this.offset; + this.offset = var2; + int var5 = (var3 - var2) / 8; - for (int var6 = 0; var6 < var5; ++var6) { // L: 386 - int var7 = this.readInt(); // L: 387 - int var8 = this.readInt(); // L: 388 - int var9 = 0; // L: 389 - int var10 = -1640531527; // L: 390 + for (int var6 = 0; var6 < var5; ++var6) { + int var7 = this.readInt(); + int var8 = this.readInt(); + int var9 = 0; + int var10 = -1640531527; - for (int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9) { // L: 391 392 395 - var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]; // L: 393 - var9 += var10; // L: 394 + for (int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9) { + var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]; + var9 += var10; } - this.offset -= 8; // L: 397 - this.writeInt(var7); // L: 398 - this.writeInt(var8); // L: 399 + this.offset -= 8; + this.writeInt(var7); + this.writeInt(var8); } - this.offset = var4; // L: 401 - } // L: 402 + this.offset = var4; + } @ObfuscatedName("cg") @ObfuscatedSignature( @@ -691,28 +691,28 @@ public class Buffer extends Node { ) @Export("xteaDecrypt") public void xteaDecrypt(int[] var1, int var2, int var3) { - int var4 = this.offset; // L: 405 - this.offset = var2; // L: 406 - int var5 = (var3 - var2) / 8; // L: 407 + int var4 = this.offset; + this.offset = var2; + int var5 = (var3 - var2) / 8; - for (int var6 = 0; var6 < var5; ++var6) { // L: 408 - int var7 = this.readInt(); // L: 409 - int var8 = this.readInt(); // L: 410 - int var9 = -957401312; // L: 411 - int var10 = -1640531527; // L: 412 + for (int var6 = 0; var6 < var5; ++var6) { + int var7 = this.readInt(); + int var8 = this.readInt(); + int var9 = -957401312; + int var10 = -1640531527; - for (int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]) { // L: 413 414 417 - var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9; // L: 415 - var9 -= var10; // L: 416 + for (int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]) { + var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9; + var9 -= var10; } - this.offset -= 8; // L: 419 - this.writeInt(var7); // L: 420 - this.writeInt(var8); // L: 421 + this.offset -= 8; + this.writeInt(var7); + this.writeInt(var8); } - this.offset = var4; // L: 423 - } // L: 424 + this.offset = var4; + } @ObfuscatedName("cy") @ObfuscatedSignature( @@ -721,17 +721,17 @@ public class Buffer extends Node { ) @Export("encryptRsa") public void encryptRsa(BigInteger var1, BigInteger var2) { - int var3 = this.offset; // L: 427 - this.offset = 0; // L: 428 - byte[] var4 = new byte[var3]; // L: 429 - this.readBytes(var4, 0, var3); // L: 430 - BigInteger var5 = new BigInteger(var4); // L: 431 - BigInteger var6 = var5.modPow(var1, var2); // L: 432 - byte[] var7 = var6.toByteArray(); // L: 433 - this.offset = 0; // L: 434 - this.writeShort(var7.length); // L: 435 - this.writeBytes(var7, 0, var7.length); // L: 436 - } // L: 437 + int var3 = this.offset; + this.offset = 0; + byte[] var4 = new byte[var3]; + this.readBytes(var4, 0, var3); + BigInteger var5 = new BigInteger(var4); + BigInteger var6 = var5.modPow(var1, var2); + byte[] var7 = var6.toByteArray(); + this.offset = 0; + this.writeShort(var7.length); + this.writeBytes(var7, 0, var7.length); + } @ObfuscatedName("cn") @ObfuscatedSignature( @@ -740,9 +740,9 @@ public class Buffer extends Node { ) @Export("writeCrc") public int writeCrc(int var1) { - int var2 = Friend.method6298(this.array, var1, this.offset); // L: 440 - this.writeInt(var2); // L: 441 - return var2; // L: 442 + int var2 = Friend.method6298(this.array, var1, this.offset); + this.writeInt(var2); + return var2; } @ObfuscatedName("cv") @@ -752,10 +752,10 @@ public class Buffer extends Node { ) @Export("checkCrc") public boolean checkCrc() { - this.offset -= 4; // L: 446 - int var1 = Friend.method6298(this.array, 0, this.offset); // L: 447 - int var2 = this.readInt(); // L: 448 - return var2 == var1; // L: 449 + this.offset -= 4; + int var1 = Friend.method6298(this.array, 0, this.offset); + int var2 = this.readInt(); + return var2 == var1; } @ObfuscatedName("co") @@ -764,8 +764,8 @@ public class Buffer extends Node { garbageValue = "20" ) public void method7343(int var1) { - this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 454 - } // L: 455 + this.array[++this.offset - 1] = (byte)(var1 + 128); + } @ObfuscatedName("cc") @ObfuscatedSignature( @@ -773,8 +773,8 @@ public class Buffer extends Node { garbageValue = "-1424242195" ) public void method7390(int var1) { - this.array[++this.offset - 1] = (byte)(0 - var1); // L: 458 - } // L: 459 + this.array[++this.offset - 1] = (byte)(0 - var1); + } @ObfuscatedName("cs") @ObfuscatedSignature( @@ -782,8 +782,8 @@ public class Buffer extends Node { garbageValue = "-1515798115" ) public void method7362(int var1) { - this.array[++this.offset - 1] = (byte)(128 - var1); // L: 462 - } // L: 463 + this.array[++this.offset - 1] = (byte)(128 - var1); + } @ObfuscatedName("cr") @ObfuscatedSignature( @@ -791,7 +791,7 @@ public class Buffer extends Node { garbageValue = "786739447" ) public int method7392() { - return this.array[++this.offset - 1] - 128 & 255; // L: 466 + return this.array[++this.offset - 1] - 128 & 255; } @ObfuscatedName("cb") @@ -800,7 +800,7 @@ public class Buffer extends Node { garbageValue = "-61" ) public int method7520() { - return 0 - this.array[++this.offset - 1] & 255; // L: 470 + return 0 - this.array[++this.offset - 1] & 255; } @ObfuscatedName("cj") @@ -809,7 +809,7 @@ public class Buffer extends Node { garbageValue = "100" ) public int method7394() { - return 128 - this.array[++this.offset - 1] & 255; // L: 474 + return 128 - this.array[++this.offset - 1] & 255; } @ObfuscatedName("ca") @@ -818,7 +818,7 @@ public class Buffer extends Node { garbageValue = "-751409747" ) public byte method7465() { - return (byte)(this.array[++this.offset - 1] - 128); // L: 478 + return (byte)(this.array[++this.offset - 1] - 128); } @ObfuscatedName("cz") @@ -827,7 +827,7 @@ public class Buffer extends Node { garbageValue = "91" ) public byte method7396() { - return (byte)(0 - this.array[++this.offset - 1]); // L: 482 + return (byte)(0 - this.array[++this.offset - 1]); } @ObfuscatedName("cw") @@ -836,7 +836,7 @@ public class Buffer extends Node { garbageValue = "31" ) public byte method7397() { - return (byte)(128 - this.array[++this.offset - 1]); // L: 486 + return (byte)(128 - this.array[++this.offset - 1]); } @ObfuscatedName("ct") @@ -845,9 +845,9 @@ public class Buffer extends Node { garbageValue = "-546649284" ) public void method7398(int var1) { - this.array[++this.offset - 1] = (byte)var1; // L: 490 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 491 - } // L: 492 + this.array[++this.offset - 1] = (byte)var1; + this.array[++this.offset - 1] = (byte)(var1 >> 8); + } @ObfuscatedName("ci") @ObfuscatedSignature( @@ -855,9 +855,9 @@ public class Buffer extends Node { garbageValue = "1845210605" ) public void method7349(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 495 - this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 496 - } // L: 497 + this.array[++this.offset - 1] = (byte)(var1 >> 8); + this.array[++this.offset - 1] = (byte)(var1 + 128); + } @ObfuscatedName("ch") @ObfuscatedSignature( @@ -865,9 +865,9 @@ public class Buffer extends Node { garbageValue = "719222907" ) public void method7493(int var1) { - this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 500 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 501 - } // L: 502 + this.array[++this.offset - 1] = (byte)(var1 + 128); + this.array[++this.offset - 1] = (byte)(var1 >> 8); + } @ObfuscatedName("cq") @ObfuscatedSignature( @@ -875,8 +875,8 @@ public class Buffer extends Node { garbageValue = "1146582636" ) public int method7401() { - this.offset += 2; // L: 505 - return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 506 + this.offset += 2; + return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); } @ObfuscatedName("cf") @@ -885,8 +885,8 @@ public class Buffer extends Node { garbageValue = "-21" ) public int method7499() { - this.offset += 2; // L: 510 - return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 511 + this.offset += 2; + return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); } @ObfuscatedName("cu") @@ -895,8 +895,8 @@ public class Buffer extends Node { garbageValue = "480164745" ) public int method7403() { - this.offset += 2; // L: 515 - return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 516 + this.offset += 2; + return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); } @ObfuscatedName("cx") @@ -905,13 +905,13 @@ public class Buffer extends Node { garbageValue = "-890444461" ) public int method7404() { - this.offset += 2; // L: 520 - int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 521 - if (var1 > 32767) { // L: 522 + this.offset += 2; + int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); + if (var1 > 32767) { var1 -= 65536; } - return var1; // L: 523 + return var1; } @ObfuscatedName("cm") @@ -920,13 +920,13 @@ public class Buffer extends Node { garbageValue = "-1356753455" ) public int method7405() { - this.offset += 2; // L: 527 - int var1 = (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 528 - if (var1 > 32767) { // L: 529 + this.offset += 2; + int var1 = (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); + if (var1 > 32767) { var1 -= 65536; } - return var1; // L: 530 + return var1; } @ObfuscatedName("dm") @@ -935,8 +935,8 @@ public class Buffer extends Node { garbageValue = "-123121164" ) public int method7508() { - this.offset += 3; // L: 534 - return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 2] & 255); // L: 535 + this.offset += 3; + return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 2] & 255); } @ObfuscatedName("dr") @@ -945,11 +945,11 @@ public class Buffer extends Node { garbageValue = "441278727" ) public void method7407(int var1) { - this.array[++this.offset - 1] = (byte)var1; // L: 539 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 540 - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 541 - this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 542 - } // L: 543 + this.array[++this.offset - 1] = (byte)var1; + this.array[++this.offset - 1] = (byte)(var1 >> 8); + this.array[++this.offset - 1] = (byte)(var1 >> 16); + this.array[++this.offset - 1] = (byte)(var1 >> 24); + } @ObfuscatedName("ds") @ObfuscatedSignature( @@ -957,11 +957,11 @@ public class Buffer extends Node { garbageValue = "1" ) public void method7527(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 546 - this.array[++this.offset - 1] = (byte)var1; // L: 547 - this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 548 - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 549 - } // L: 550 + this.array[++this.offset - 1] = (byte)(var1 >> 8); + this.array[++this.offset - 1] = (byte)var1; + this.array[++this.offset - 1] = (byte)(var1 >> 24); + this.array[++this.offset - 1] = (byte)(var1 >> 16); + } @ObfuscatedName("dv") @ObfuscatedSignature( @@ -970,11 +970,11 @@ public class Buffer extends Node { ) @Export("writeIntME") public void writeIntME(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 553 - this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 554 - this.array[++this.offset - 1] = (byte)var1; // L: 555 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 556 - } // L: 557 + this.array[++this.offset - 1] = (byte)(var1 >> 16); + this.array[++this.offset - 1] = (byte)(var1 >> 24); + this.array[++this.offset - 1] = (byte)var1; + this.array[++this.offset - 1] = (byte)(var1 >> 8); + } @ObfuscatedName("do") @ObfuscatedSignature( @@ -982,8 +982,8 @@ public class Buffer extends Node { garbageValue = "520498881" ) public int method7568() { - this.offset += 4; // L: 560 - 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: 561 + this.offset += 4; + return (this.array[this.offset - 4] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16) + ((this.array[this.offset - 1] & 255) << 24); } @ObfuscatedName("dt") @@ -992,8 +992,8 @@ public class Buffer extends Node { garbageValue = "1906700317" ) public int method7411() { - this.offset += 4; // L: 565 - 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: 566 + this.offset += 4; + return ((this.array[this.offset - 2] & 255) << 24) + ((this.array[this.offset - 4] & 255) << 8) + (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 1] & 255) << 16); } @ObfuscatedName("dy") @@ -1002,8 +1002,8 @@ public class Buffer extends Node { garbageValue = "1988297097" ) public int method7412() { - this.offset += 4; // L: 570 - 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: 571 + this.offset += 4; + return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 16) + (this.array[this.offset - 2] & 255) + ((this.array[this.offset - 3] & 255) << 24); } @ObfuscatedName("dk") @@ -1013,8 +1013,8 @@ public class Buffer extends Node { ) public void method7413(byte[] var1, int var2, int var3) { for (int var4 = var2; var4 < var3 + var2; ++var4) { - var1[var4] = (byte)(this.array[++this.offset - 1] - 128); // L: 575 + var1[var4] = (byte)(this.array[++this.offset - 1] - 128); } - } // L: 576 + } } diff --git a/runescape-client/src/main/java/BufferedFile.java b/runescape-client/src/main/java/BufferedFile.java index 1a029ac198..d31a655230 100644 --- a/runescape-client/src/main/java/BufferedFile.java +++ b/runescape-client/src/main/java/BufferedFile.java @@ -79,15 +79,15 @@ public class BufferedFile { descriptor = "(Loa;II)V" ) public BufferedFile(AccessFile var1, int var2, int var3) throws IOException { - this.readBufferOffset = -1L; // L: 9 - this.writeBufferOffset = -1L; // L: 12 - this.writeBufferLength = 0; // L: 13 - this.accessFile = var1; // L: 20 - this.length = this.fileLength = var1.length(); // L: 21 - this.readBuffer = new byte[var2]; // L: 22 - this.writeBuffer = new byte[var3]; // L: 23 - this.offset = 0L; // L: 24 - } // L: 25 + this.readBufferOffset = -1L; + this.writeBufferOffset = -1L; + this.writeBufferLength = 0; + this.accessFile = var1; + this.length = this.fileLength = var1.length(); + this.readBuffer = new byte[var2]; + this.writeBuffer = new byte[var3]; + this.offset = 0L; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -96,19 +96,19 @@ public class BufferedFile { ) @Export("close") public void close() throws IOException { - this.flush(); // L: 28 - this.accessFile.close(); // L: 29 - } // L: 30 + this.flush(); + this.accessFile.close(); + } @ObfuscatedName("b") @Export("seek") public void seek(long var1) throws IOException { - if (var1 < 0L) { // L: 33 + if (var1 < 0L) { throw new IOException(""); } else { - this.offset = var1; // L: 34 + this.offset = var1; } - } // L: 35 + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -117,7 +117,7 @@ public class BufferedFile { ) @Export("length") public long length() { - return this.length; // L: 38 + return this.length; } @ObfuscatedName("m") @@ -127,8 +127,8 @@ public class BufferedFile { ) @Export("readFully") public void readFully(byte[] var1) throws IOException { - this.read(var1, 0, var1.length); // L: 42 - } // L: 43 + this.read(var1, 0, var1.length); + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -138,103 +138,103 @@ public class BufferedFile { @Export("read") public void read(byte[] var1, int var2, int var3) throws IOException { try { - if (var3 + var2 > var1.length) { // L: 47 + if (var3 + var2 > var1.length) { throw new ArrayIndexOutOfBoundsException(var3 + var2 - var1.length); } - if (-1L != this.writeBufferOffset && this.offset >= this.writeBufferOffset && this.offset + (long)var3 <= this.writeBufferOffset + (long)this.writeBufferLength) { // 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 + if (-1L != this.writeBufferOffset && this.offset >= this.writeBufferOffset && this.offset + (long)var3 <= this.writeBufferOffset + (long)this.writeBufferLength) { + System.arraycopy(this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var1, var2, var3); + this.offset += (long)var3; + return; } - long var4 = this.offset; // L: 53 - int var7 = var3; // L: 55 + long var4 = this.offset; + int var7 = var3; int var8; - if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { // L: 56 - var8 = (int)((long)this.readBufferLength - (this.offset - this.readBufferOffset)); // L: 57 - if (var8 > var3) { // L: 58 + if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { + var8 = (int)((long)this.readBufferLength - (this.offset - this.readBufferOffset)); + if (var8 > var3) { var8 = var3; } - System.arraycopy(this.readBuffer, (int)(this.offset - this.readBufferOffset), var1, var2, var8); // L: 59 - this.offset += (long)var8; // L: 60 - var2 += var8; // L: 61 - var3 -= var8; // L: 62 + System.arraycopy(this.readBuffer, (int)(this.offset - this.readBufferOffset), var1, var2, var8); + this.offset += (long)var8; + var2 += var8; + var3 -= var8; } - if (var3 > this.readBuffer.length) { // L: 64 - this.accessFile.seek(this.offset); // L: 65 + if (var3 > this.readBuffer.length) { + this.accessFile.seek(this.offset); - for (this.fileOffset = this.offset; var3 > 0; var3 -= var8) { // L: 66 67 73 - var8 = this.accessFile.read(var1, var2, var3); // L: 68 - if (var8 == -1) { // L: 69 + for (this.fileOffset = this.offset; var3 > 0; var3 -= var8) { + var8 = this.accessFile.read(var1, var2, var3); + if (var8 == -1) { break; } - this.fileOffset += (long)var8; // L: 70 - this.offset += (long)var8; // L: 71 - var2 += var8; // L: 72 + this.fileOffset += (long)var8; + this.offset += (long)var8; + var2 += var8; } - } else if (var3 > 0) { // L: 76 - this.load(); // L: 77 - var8 = var3; // L: 78 - if (var3 > this.readBufferLength) { // L: 79 + } else if (var3 > 0) { + this.load(); + var8 = var3; + if (var3 > this.readBufferLength) { var8 = this.readBufferLength; } - System.arraycopy(this.readBuffer, 0, var1, var2, var8); // L: 80 - var2 += var8; // L: 81 - var3 -= var8; // L: 82 - this.offset += (long)var8; // L: 83 + System.arraycopy(this.readBuffer, 0, var1, var2, var8); + var2 += var8; + var3 -= var8; + this.offset += (long)var8; } - if (this.writeBufferOffset != -1L) { // L: 85 - if (this.writeBufferOffset > this.offset && var3 > 0) { // L: 86 - var8 = var2 + (int)(this.writeBufferOffset - this.offset); // L: 87 - if (var8 > var3 + var2) { // L: 88 + if (this.writeBufferOffset != -1L) { + if (this.writeBufferOffset > this.offset && var3 > 0) { + var8 = var2 + (int)(this.writeBufferOffset - this.offset); + if (var8 > var3 + var2) { var8 = var3 + var2; } - while (var2 < var8) { // L: 89 - var1[var2++] = 0; // L: 90 - --var3; // L: 91 - ++this.offset; // L: 92 + while (var2 < var8) { + var1[var2++] = 0; + --var3; + ++this.offset; } } - long var13 = -1L; // L: 95 - long var10 = -1L; // L: 96 - if (this.writeBufferOffset >= var4 && this.writeBufferOffset < var4 + (long)var7) { // L: 97 - var13 = this.writeBufferOffset; // L: 98 - } else if (var4 >= this.writeBufferOffset && var4 < this.writeBufferOffset + (long)this.writeBufferLength) { // L: 100 - var13 = var4; // L: 101 + long var13 = -1L; + long var10 = -1L; + if (this.writeBufferOffset >= var4 && this.writeBufferOffset < var4 + (long)var7) { + var13 = this.writeBufferOffset; + } else if (var4 >= this.writeBufferOffset && var4 < this.writeBufferOffset + (long)this.writeBufferLength) { + var13 = var4; } - if ((long)this.writeBufferLength + this.writeBufferOffset > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= (long)var7 + var4) { // L: 103 - var10 = this.writeBufferOffset + (long)this.writeBufferLength; // L: 104 - } else if ((long)var7 + var4 > this.writeBufferOffset && (long)var7 + var4 <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 106 - var10 = (long)var7 + var4; // L: 107 + if ((long)this.writeBufferLength + this.writeBufferOffset > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= (long)var7 + var4) { + var10 = this.writeBufferOffset + (long)this.writeBufferLength; + } else if ((long)var7 + var4 > this.writeBufferOffset && (long)var7 + var4 <= (long)this.writeBufferLength + this.writeBufferOffset) { + var10 = (long)var7 + var4; } - if (var13 > -1L && var10 > var13) { // L: 109 - int var12 = (int)(var10 - var13); // L: 110 - System.arraycopy(this.writeBuffer, (int)(var13 - this.writeBufferOffset), var1, (int)(var13 - var4) + var2, var12); // L: 111 - if (var10 > this.offset) { // L: 112 - var3 = (int)((long)var3 - (var10 - this.offset)); // L: 113 - this.offset = var10; // L: 114 + if (var13 > -1L && var10 > var13) { + int var12 = (int)(var10 - var13); + System.arraycopy(this.writeBuffer, (int)(var13 - this.writeBufferOffset), var1, (int)(var13 - var4) + var2, var12); + if (var10 > this.offset) { + var3 = (int)((long)var3 - (var10 - this.offset)); + this.offset = var10; } } } - } catch (IOException var16) { // L: 120 - this.fileOffset = -1L; // L: 121 - throw var16; // L: 122 + } catch (IOException var16) { + this.fileOffset = -1L; + throw var16; } - if (var3 > 0) { // L: 124 + if (var3 > 0) { throw new EOFException(); } - } // L: 125 + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -243,28 +243,28 @@ public class BufferedFile { ) @Export("load") void load() throws IOException { - this.readBufferLength = 0; // L: 128 - if (this.offset != this.fileOffset) { // L: 129 - this.accessFile.seek(this.offset); // L: 130 - this.fileOffset = this.offset; // L: 131 + this.readBufferLength = 0; + if (this.offset != this.fileOffset) { + this.accessFile.seek(this.offset); + this.fileOffset = this.offset; } int var2; - for (this.readBufferOffset = this.offset; this.readBufferLength < this.readBuffer.length; this.readBufferLength += var2) { // L: 133 134 140 - int var1 = this.readBuffer.length - this.readBufferLength; // L: 135 - if (var1 > 200000000) { // L: 136 + for (this.readBufferOffset = this.offset; this.readBufferLength < this.readBuffer.length; this.readBufferLength += var2) { + int var1 = this.readBuffer.length - this.readBufferLength; + if (var1 > 200000000) { var1 = 200000000; } - var2 = this.accessFile.read(this.readBuffer, this.readBufferLength, var1); // L: 137 - if (var2 == -1) { // L: 138 + var2 = this.accessFile.read(this.readBuffer, this.readBufferLength, var1); + if (var2 == -1) { break; } - this.fileOffset += (long)var2; // L: 139 + this.fileOffset += (long)var2; } - } // L: 142 + } @ObfuscatedName("j") @ObfuscatedSignature( @@ -274,75 +274,75 @@ public class BufferedFile { @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { try { - if ((long)var3 + this.offset > this.length) { // L: 146 + if ((long)var3 + this.offset > this.length) { this.length = (long)var3 + this.offset; } - if (-1L != this.writeBufferOffset && (this.offset < this.writeBufferOffset || this.offset > this.writeBufferOffset + (long)this.writeBufferLength)) { // L: 147 - this.flush(); // L: 148 + if (-1L != this.writeBufferOffset && (this.offset < this.writeBufferOffset || this.offset > this.writeBufferOffset + (long)this.writeBufferLength)) { + this.flush(); } - if (-1L != this.writeBufferOffset && (long)var3 + this.offset > 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 - var2 += var4; // L: 154 - var3 -= var4; // L: 155 - this.writeBufferLength = this.writeBuffer.length; // L: 156 - this.flush(); // L: 157 + if (-1L != this.writeBufferOffset && (long)var3 + this.offset > this.writeBufferOffset + (long)this.writeBuffer.length) { + int var4 = (int)((long)this.writeBuffer.length - (this.offset - this.writeBufferOffset)); + System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var4); + this.offset += (long)var4; + var2 += var4; + var3 -= var4; + this.writeBufferLength = this.writeBuffer.length; + this.flush(); } - if (var3 <= this.writeBuffer.length) { // L: 159 - if (var3 > 0) { // L: 188 - if (this.writeBufferOffset == -1L) { // L: 189 + if (var3 <= this.writeBuffer.length) { + if (var3 > 0) { + if (this.writeBufferOffset == -1L) { this.writeBufferOffset = this.offset; } - System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var3); // L: 190 - this.offset += (long)var3; // L: 191 - if (this.offset - this.writeBufferOffset > (long)this.writeBufferLength) { // L: 192 + System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var3); + this.offset += (long)var3; + if (this.offset - this.writeBufferOffset > (long)this.writeBufferLength) { this.writeBufferLength = (int)(this.offset - this.writeBufferOffset); } } } else { - if (this.fileOffset != this.offset) { // L: 160 - this.accessFile.seek(this.offset); // L: 161 - this.fileOffset = this.offset; // L: 162 + if (this.fileOffset != this.offset) { + this.accessFile.seek(this.offset); + this.fileOffset = this.offset; } - this.accessFile.write(var1, var2, var3); // L: 164 - this.fileOffset += (long)var3; // L: 165 - if (this.fileOffset > this.fileLength) { // L: 166 + this.accessFile.write(var1, var2, var3); + this.fileOffset += (long)var3; + if (this.fileOffset > this.fileLength) { this.fileLength = this.fileOffset; } - long var9 = -1L; // L: 167 - long var6 = -1L; // L: 168 - if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { // L: 169 - var9 = this.offset; // L: 170 - } else if (this.readBufferOffset >= this.offset && this.readBufferOffset < (long)var3 + this.offset) { // L: 172 - var9 = this.readBufferOffset; // L: 173 + long var9 = -1L; + long var6 = -1L; + if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { + var9 = this.offset; + } else if (this.readBufferOffset >= this.offset && this.readBufferOffset < (long)var3 + this.offset) { + var9 = this.readBufferOffset; } - if (this.offset + (long)var3 > this.readBufferOffset && (long)var3 + this.offset <= (long)this.readBufferLength + this.readBufferOffset) { // L: 175 - var6 = this.offset + (long)var3; // L: 176 - } else if ((long)this.readBufferLength + this.readBufferOffset > this.offset && this.readBufferOffset + (long)this.readBufferLength <= (long)var3 + this.offset) { // L: 178 - var6 = this.readBufferOffset + (long)this.readBufferLength; // L: 179 + if (this.offset + (long)var3 > this.readBufferOffset && (long)var3 + this.offset <= (long)this.readBufferLength + this.readBufferOffset) { + var6 = this.offset + (long)var3; + } else if ((long)this.readBufferLength + this.readBufferOffset > this.offset && this.readBufferOffset + (long)this.readBufferLength <= (long)var3 + this.offset) { + var6 = this.readBufferOffset + (long)this.readBufferLength; } - if (var9 > -1L && var6 > var9) { // L: 181 - int var8 = (int)(var6 - var9); // L: 182 - System.arraycopy(var1, (int)((long)var2 + var9 - this.offset), this.readBuffer, (int)(var9 - this.readBufferOffset), var8); // L: 183 + if (var9 > -1L && var6 > var9) { + int var8 = (int)(var6 - var9); + System.arraycopy(var1, (int)((long)var2 + var9 - this.offset), this.readBuffer, (int)(var9 - this.readBufferOffset), var8); } - this.offset += (long)var3; // L: 185 + this.offset += (long)var3; } - } catch (IOException var12) { // L: 196 - this.fileOffset = -1L; // L: 197 - throw var12; // L: 198 + } catch (IOException var12) { + this.fileOffset = -1L; + throw var12; } - } // L: 186 193 200 + } @ObfuscatedName("w") @ObfuscatedSignature( @@ -351,40 +351,40 @@ public class BufferedFile { ) @Export("flush") void flush() throws IOException { - if (-1L != this.writeBufferOffset) { // L: 203 - if (this.writeBufferOffset != this.fileOffset) { // L: 204 - this.accessFile.seek(this.writeBufferOffset); // L: 205 - this.fileOffset = this.writeBufferOffset; // L: 206 + if (-1L != this.writeBufferOffset) { + if (this.writeBufferOffset != this.fileOffset) { + this.accessFile.seek(this.writeBufferOffset); + this.fileOffset = this.writeBufferOffset; } - this.accessFile.write(this.writeBuffer, 0, this.writeBufferLength); // L: 208 - this.fileOffset += (long)this.writeBufferLength * 1860547667617120257L; // L: 209 - if (this.fileOffset > this.fileLength) { // L: 210 + this.accessFile.write(this.writeBuffer, 0, this.writeBufferLength); + this.fileOffset += (long)this.writeBufferLength * 1860547667617120257L; + if (this.fileOffset > this.fileLength) { 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 - var1 = this.writeBufferOffset; // L: 214 - } else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < this.writeBufferOffset + (long)this.writeBufferLength) { // L: 216 - var1 = this.readBufferOffset; // L: 217 + long var1 = -1L; + long var3 = -1L; + if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < (long)this.readBufferLength + this.readBufferOffset) { + var1 = this.writeBufferOffset; + } else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < this.writeBufferOffset + (long)this.writeBufferLength) { + var1 = this.readBufferOffset; } - if (this.writeBufferOffset + (long)this.writeBufferLength > this.readBufferOffset && this.writeBufferOffset + (long)this.writeBufferLength <= this.readBufferOffset + (long)this.readBufferLength) { // L: 219 - var3 = this.writeBufferOffset + (long)this.writeBufferLength; // L: 220 - } else if ((long)this.readBufferLength + this.readBufferOffset > this.writeBufferOffset && (long)this.readBufferLength + this.readBufferOffset <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 222 - var3 = (long)this.readBufferLength + this.readBufferOffset; // L: 223 + if (this.writeBufferOffset + (long)this.writeBufferLength > this.readBufferOffset && this.writeBufferOffset + (long)this.writeBufferLength <= this.readBufferOffset + (long)this.readBufferLength) { + var3 = this.writeBufferOffset + (long)this.writeBufferLength; + } else if ((long)this.readBufferLength + this.readBufferOffset > this.writeBufferOffset && (long)this.readBufferLength + this.readBufferOffset <= (long)this.writeBufferLength + this.writeBufferOffset) { + var3 = (long)this.readBufferLength + this.readBufferOffset; } - if (var1 > -1L && var3 > var1) { // L: 225 - int var5 = (int)(var3 - var1); // L: 226 - System.arraycopy(this.writeBuffer, (int)(var1 - this.writeBufferOffset), this.readBuffer, (int)(var1 - this.readBufferOffset), var5); // L: 227 + if (var1 > -1L && var3 > var1) { + int var5 = (int)(var3 - var1); + System.arraycopy(this.writeBuffer, (int)(var1 - this.writeBufferOffset), this.readBuffer, (int)(var1 - this.readBufferOffset), var5); } - this.writeBufferOffset = -1L; // L: 229 - this.writeBufferLength = 0; // L: 230 + this.writeBufferOffset = -1L; + this.writeBufferLength = 0; } - } // L: 232 + } } diff --git a/runescape-client/src/main/java/BufferedNetSocket.java b/runescape-client/src/main/java/BufferedNetSocket.java index 3698662a03..9734d70e35 100644 --- a/runescape-client/src/main/java/BufferedNetSocket.java +++ b/runescape-client/src/main/java/BufferedNetSocket.java @@ -25,14 +25,14 @@ public class BufferedNetSocket extends AbstractSocket { BufferedSink sink; BufferedNetSocket(Socket var1, int var2, int var3) throws IOException { - this.socket = var1; // L: 12 - this.socket.setSoTimeout(30000); // L: 13 - this.socket.setTcpNoDelay(true); // L: 14 - this.socket.setReceiveBufferSize(65536); // L: 15 - this.socket.setSendBufferSize(65536); // L: 16 - this.source = new BufferedSource(this.socket.getInputStream(), var2); // L: 17 - this.sink = new BufferedSink(this.socket.getOutputStream(), var3); // L: 18 - } // L: 19 + this.socket = var1; + this.socket.setSoTimeout(30000); + this.socket.setTcpNoDelay(true); + this.socket.setReceiveBufferSize(65536); + this.socket.setSendBufferSize(65536); + this.source = new BufferedSource(this.socket.getInputStream(), var2); + this.sink = new BufferedSink(this.socket.getOutputStream(), var3); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -41,15 +41,15 @@ public class BufferedNetSocket extends AbstractSocket { ) @Export("close") public void close() { - this.sink.close(); // L: 48 + this.sink.close(); try { - this.socket.close(); // L: 50 - } catch (IOException var2) { // L: 52 + this.socket.close(); + } catch (IOException var2) { } - this.source.close(); // L: 53 - } // L: 54 + this.source.close(); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -68,7 +68,7 @@ public class BufferedNetSocket extends AbstractSocket { ) @Export("available") public int available() throws IOException { - return this.source.available(); // L: 28 + return this.source.available(); } @ObfuscatedName("m") @@ -78,7 +78,7 @@ public class BufferedNetSocket extends AbstractSocket { ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { - return this.source.isAvailable(var1); // L: 23 + return this.source.isAvailable(var1); } @ObfuscatedName("t") @@ -88,7 +88,7 @@ public class BufferedNetSocket extends AbstractSocket { ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { - return this.source.read(var1, var2, var3); // L: 38 + return this.source.read(var1, var2, var3); } @ObfuscatedName("j") @@ -99,33 +99,33 @@ public class BufferedNetSocket extends AbstractSocket { @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { this.sink.write(var1, var2, var3); - } // L: 44 + } protected void finalize() { - this.close(); // L: 58 - } // L: 59 + this.close(); + } @ObfuscatedName("b") public static String method6496(long var0) { - if (var0 > 0L && var0 < 6582952005840035281L) { // L: 31 - if (0L == var0 % 37L) { // L: 32 + if (var0 > 0L && var0 < 6582952005840035281L) { + if (0L == var0 % 37L) { return null; } else { - int var2 = 0; // L: 33 + int var2 = 0; - for (long var3 = var0; var3 != 0L; var3 /= 37L) { // L: 34 35 37 - ++var2; // L: 36 + for (long var3 = var0; var3 != 0L; var3 /= 37L) { + ++var2; } - StringBuilder var5 = new StringBuilder(var2); // L: 39 + StringBuilder var5 = new StringBuilder(var2); - while (var0 != 0L) { // L: 40 - long var6 = var0; // L: 41 - var0 /= 37L; // L: 42 - var5.append(class332.base37Table[(int)(var6 - var0 * 37L)]); // L: 43 + while (var0 != 0L) { + long var6 = var0; + var0 /= 37L; + var5.append(class332.base37Table[(int)(var6 - var0 * 37L)]); } - return var5.reverse().toString(); // L: 45 + return var5.reverse().toString(); } } else { return null; diff --git a/runescape-client/src/main/java/BufferedSink.java b/runescape-client/src/main/java/BufferedSink.java index e456c57706..e1240458f0 100644 --- a/runescape-client/src/main/java/BufferedSink.java +++ b/runescape-client/src/main/java/BufferedSink.java @@ -51,15 +51,15 @@ public class BufferedSink implements Runnable { boolean closed; BufferedSink(OutputStream var1, int var2) { - 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 + this.position = 0; + this.limit = 0; + this.outputStream = var1; + this.capacity = var2 + 1; + this.buffer = new byte[this.capacity]; + this.thread = new Thread(this); + this.thread.setDaemon(true); + this.thread.start(); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -68,21 +68,21 @@ public class BufferedSink implements Runnable { ) @Export("isClosed") boolean isClosed() { - if (this.closed) { // L: 208 + if (this.closed) { try { - this.outputStream.close(); // L: 210 + this.outputStream.close(); if (this.exception == null) { - this.exception = new IOException(""); // L: 211 + this.exception = new IOException(""); } - } catch (IOException var2) { // L: 213 - if (this.exception == null) { // L: 214 + } catch (IOException var2) { + if (this.exception == null) { this.exception = new IOException(var2); } } - return true; // L: 216 + return true; } else { - return false; // L: 218 + return false; } } @@ -93,38 +93,38 @@ public class BufferedSink implements Runnable { ) @Export("write") void write(byte[] var1, int var2, int var3) throws IOException { - if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { // L: 268 - synchronized(this) { // L: 269 - if (this.exception != null) { // L: 270 + if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { + synchronized(this) { + if (this.exception != null) { throw new IOException(this.exception.toString()); } else { int var5; - if (this.position <= this.limit) { // L: 272 + if (this.position <= this.limit) { var5 = this.capacity - this.limit + this.position - 1; } else { - var5 = this.position - this.limit - 1; // L: 273 + var5 = this.position - this.limit - 1; } if (var5 < var3) { - throw new IOException(""); // L: 274 + throw new IOException(""); } else { - if (var3 + this.limit <= this.capacity) { // L: 275 - System.arraycopy(var1, var2, this.buffer, this.limit, var3); // L: 276 + if (var3 + this.limit <= this.capacity) { + System.arraycopy(var1, var2, this.buffer, this.limit, var3); } else { - 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 + int var6 = this.capacity - this.limit; + System.arraycopy(var1, var2, this.buffer, this.limit, var6); + System.arraycopy(var1, var6 + var2, this.buffer, 0, var3 - var6); } - this.limit = (var3 + this.limit) % this.capacity; // L: 283 - this.notifyAll(); // L: 284 + this.limit = (var3 + this.limit) % this.capacity; + this.notifyAll(); } } } } else { throw new IOException(); } - } // L: 286 + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -133,75 +133,75 @@ public class BufferedSink implements Runnable { ) @Export("close") void close() { - synchronized(this) { // L: 289 - this.closed = true; // L: 290 - this.notifyAll(); // L: 291 - } // L: 292 - - try { - this.thread.join(); // L: 294 - } catch (InterruptedException var3) { // L: 296 + synchronized(this) { + this.closed = true; + this.notifyAll(); } - } // L: 297 + try { + this.thread.join(); + } catch (InterruptedException var3) { + } + + } public void run() { do { int var1; - synchronized(this) { // L: 224 + synchronized(this) { while (true) { - if (this.exception != null) { // L: 226 + if (this.exception != null) { return; } - if (this.position <= this.limit) { // L: 227 + if (this.position <= this.limit) { var1 = this.limit - this.position; } else { - var1 = this.capacity - this.position + this.limit; // L: 228 + var1 = this.capacity - this.position + this.limit; } - if (var1 > 0) { // L: 229 + if (var1 > 0) { break; } try { - this.outputStream.flush(); // L: 231 - } catch (IOException var11) { // L: 233 - this.exception = var11; // L: 234 - return; // L: 235 + this.outputStream.flush(); + } catch (IOException var11) { + this.exception = var11; + return; } - if (this.isClosed()) { // L: 237 + if (this.isClosed()) { return; } try { - this.wait(); // L: 239 - } catch (InterruptedException var12) { // L: 241 + this.wait(); + } catch (InterruptedException var12) { } } } try { - if (var1 + this.position <= this.capacity) { // L: 245 - this.outputStream.write(this.buffer, this.position, var1); // L: 246 + if (var1 + this.position <= this.capacity) { + this.outputStream.write(this.buffer, this.position, var1); } else { - 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 + int var7 = this.capacity - this.position; + this.outputStream.write(this.buffer, this.position, var7); + this.outputStream.write(this.buffer, 0, var1 - var7); } - } catch (IOException var10) { // L: 254 + } catch (IOException var10) { IOException var2 = var10; - synchronized(this) { // L: 255 - this.exception = var2; // L: 256 - return; // L: 257 + synchronized(this) { + this.exception = var2; + return; } } - synchronized(this) { // L: 260 - this.position = (var1 + this.position) % this.capacity; // L: 261 - } // L: 262 - } while(!this.isClosed()); // L: 263 + synchronized(this) { + this.position = (var1 + this.position) % this.capacity; + } + } while(!this.isClosed()); } @@ -211,57 +211,57 @@ public class BufferedSink implements Runnable { garbageValue = "-1853043366" ) static int method6551(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; // L: 1113 - if (var0 == ScriptOpcodes.CC_GETSCROLLX) { // L: 1114 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1115 - return 1; // L: 1116 - } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { // L: 1118 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1119 - return 1; // L: 1120 - } else if (var0 == ScriptOpcodes.CC_GETTEXT) { // L: 1122 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.text; // L: 1123 - return 1; // L: 1124 - } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { // L: 1126 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1127 - return 1; // L: 1128 - } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { // L: 1130 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1131 - return 1; // L: 1132 - } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { // L: 1134 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1135 - return 1; // L: 1136 - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { // L: 1138 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1139 - return 1; // L: 1140 - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { // L: 1142 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1143 - return 1; // L: 1144 - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { // L: 1146 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1147 - return 1; // L: 1148 - } else if (var0 == ScriptOpcodes.CC_GETTRANS) { // L: 1150 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1151 - return 1; // L: 1152 - } else if (var0 == 1610) { // L: 1154 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1155 - return 1; // L: 1156 - } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { // L: 1158 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.color; // L: 1159 - return 1; // L: 1160 - } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { // L: 1162 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.color2; // L: 1163 - return 1; // L: 1164 - } else if (var0 == 1613) { // L: 1166 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1167 - return 1; // L: 1168 - } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { // L: 1170 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1171 - return 1; // L: 1172 - } else if (var0 != 1615 && var0 != 1616) { // L: 1174 - return 2; // L: 1178 + Widget var3 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; + if (var0 == ScriptOpcodes.CC_GETSCROLLX) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.scrollX; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.scrollY; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETTEXT) { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.text; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.scrollWidth; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.scrollHeight; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelZoom; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelAngleX; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelAngleZ; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelAngleY; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETTRANS) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.transparencyTop; + return 1; + } else if (var0 == 1610) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.transparencyBot; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.color; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.color2; + return 1; + } else if (var0 == 1613) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; + return 1; + } else if (var0 != 1615 && var0 != 1616) { + return 2; } else { - ++IsaacCipher.Interpreter_intStackSize; // L: 1175 - return 1; // L: 1176 + ++IsaacCipher.Interpreter_intStackSize; + return 1; } } } diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java index e76f37cc14..3bdf8e50c6 100644 --- a/runescape-client/src/main/java/BufferedSource.java +++ b/runescape-client/src/main/java/BufferedSource.java @@ -49,13 +49,13 @@ public class BufferedSource implements Runnable { IOException exception; BufferedSource(InputStream var1, int var2) { - this.position = 0; // L: 66 + this.position = 0; this.limit = 0; this.inputStream = var1; this.capacity = var2 + 1; this.buffer = new byte[this.capacity]; this.thread = new Thread(this); - this.thread.setDaemon(true); // L: 75 + this.thread.setDaemon(true); this.thread.start(); } @@ -69,7 +69,7 @@ public class BufferedSource implements Runnable { if (var1 == 0) { return true; } else if (var1 > 0 && var1 < this.capacity) { - synchronized(this) { // L: 115 + synchronized(this) { int var3; if (this.position <= this.limit) { var3 = this.limit - this.position; @@ -77,8 +77,8 @@ public class BufferedSource implements Runnable { var3 = this.capacity - this.position + this.limit; } - if (var3 < var1) { // L: 119 - if (this.exception != null) { // L: 120 + if (var3 < var1) { + if (this.exception != null) { throw new IOException(this.exception.toString()); } else { this.notifyAll(); @@ -109,7 +109,7 @@ public class BufferedSource implements Runnable { } if (var2 <= 0 && this.exception != null) { - throw new IOException(this.exception.toString()); // L: 134 + throw new IOException(this.exception.toString()); } else { this.notifyAll(); return var2; @@ -124,7 +124,7 @@ public class BufferedSource implements Runnable { ) @Export("readUnsignedByte") int readUnsignedByte() throws IOException { - synchronized(this) { // L: 142 + synchronized(this) { if (this.position == this.limit) { if (this.exception != null) { throw new IOException(this.exception.toString()); @@ -132,7 +132,7 @@ public class BufferedSource implements Runnable { return -1; } } else { - int var2 = this.buffer[this.position] & 255; // L: 147 + int var2 = this.buffer[this.position] & 255; this.position = (this.position + 1) % this.capacity; this.notifyAll(); return var2; @@ -147,13 +147,13 @@ public class BufferedSource implements Runnable { ) @Export("read") int read(byte[] var1, int var2, int var3) throws IOException { - if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { // L: 155 + if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { synchronized(this) { int var5; if (this.position <= this.limit) { var5 = this.limit - this.position; } else { - var5 = this.capacity - this.position + this.limit; // L: 159 + var5 = this.capacity - this.position + this.limit; } if (var3 > var5) { @@ -164,14 +164,14 @@ public class BufferedSource implements Runnable { throw new IOException(this.exception.toString()); } else { if (var3 + this.position <= this.capacity) { - System.arraycopy(this.buffer, this.position, var1, var2, var3); // L: 163 + System.arraycopy(this.buffer, this.position, var1, var2, var3); } else { int var6 = this.capacity - this.position; System.arraycopy(this.buffer, this.position, var1, var2, var6); System.arraycopy(this.buffer, 0, var1, var6 + var2, var3 - var6); } - this.position = (var3 + this.position) % this.capacity; // L: 170 + this.position = (var3 + this.position) % this.capacity; this.notifyAll(); return var3; } @@ -188,20 +188,20 @@ public class BufferedSource implements Runnable { ) @Export("close") void close() { - synchronized(this) { // L: 177 + synchronized(this) { if (this.exception == null) { - this.exception = new IOException(""); // L: 178 + this.exception = new IOException(""); } - this.notifyAll(); // L: 179 + this.notifyAll(); } try { - this.thread.join(); // L: 182 - } catch (InterruptedException var3) { // L: 184 + this.thread.join(); + } catch (InterruptedException var3) { } - } // L: 185 + } public void run() { while (true) { @@ -217,7 +217,7 @@ public class BufferedSource implements Runnable { } else if (this.position <= this.limit) { var1 = this.capacity - this.limit; } else { - var1 = this.position - this.limit - 1; // L: 87 + var1 = this.position - this.limit - 1; } if (var1 > 0) { @@ -241,12 +241,12 @@ public class BufferedSource implements Runnable { IOException var3 = var11; synchronized(this) { this.exception = var3; - return; // L: 103 + return; } } synchronized(this) { - this.limit = (var7 + this.limit) % this.capacity; // L: 107 + this.limit = (var7 + this.limit) % this.capacity; } } } @@ -257,133 +257,133 @@ public class BufferedSource implements Runnable { garbageValue = "821161285" ) public static PacketBufferNode method6527(int var0, String var1, Language var2, int var3) { - PacketBufferNode var4 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2897, 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 + PacketBufferNode var4 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2897, Client.packetWriter.isaacCipher); + var4.packetBuffer.writeByte(0); + int var5 = var4.packetBuffer.offset; + var4.packetBuffer.writeByte(var0); + String var6 = var1.toLowerCase(); + byte var7 = 0; + if (var6.startsWith("yellow:")) { + var7 = 0; + var1 = var1.substring("yellow:".length()); + } else if (var6.startsWith("red:")) { + var7 = 1; + var1 = var1.substring("red:".length()); + } else if (var6.startsWith("green:")) { + var7 = 2; + var1 = var1.substring("green:".length()); + } else if (var6.startsWith("cyan:")) { + var7 = 3; + var1 = var1.substring("cyan:".length()); + } else if (var6.startsWith("purple:")) { + var7 = 4; + var1 = var1.substring("purple:".length()); + } else if (var6.startsWith("white:")) { + var7 = 5; + var1 = var1.substring("white:".length()); + } else if (var6.startsWith("flash1:")) { + var7 = 6; + var1 = var1.substring("flash1:".length()); + } else if (var6.startsWith("flash2:")) { + var7 = 7; + var1 = var1.substring("flash2:".length()); + } else if (var6.startsWith("flash3:")) { + var7 = 8; var1 = var1.substring("flash3:".length()); - } else if (var6.startsWith("glow1:")) { // L: 59 + } else if (var6.startsWith("glow1:")) { var7 = 9; - var1 = var1.substring("glow1:".length()); // L: 61 + var1 = var1.substring("glow1:".length()); } else if (var6.startsWith("glow2:")) { - 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 + var7 = 10; + var1 = var1.substring("glow2:".length()); + } else if (var6.startsWith("glow3:")) { + var7 = 11; + var1 = var1.substring("glow3:".length()); + } else if (var2 != Language.Language_EN) { + if (var6.startsWith("yellow:")) { + var7 = 0; + var1 = var1.substring("yellow:".length()); + } else if (var6.startsWith("red:")) { + var7 = 1; + var1 = var1.substring("red:".length()); + } else if (var6.startsWith("green:")) { + var7 = 2; + var1 = var1.substring("green:".length()); + } else if (var6.startsWith("cyan:")) { + var7 = 3; + var1 = var1.substring("cyan:".length()); + } else if (var6.startsWith("purple:")) { + var7 = 4; + var1 = var1.substring("purple:".length()); + } else if (var6.startsWith("white:")) { + var7 = 5; + var1 = var1.substring("white:".length()); + } else if (var6.startsWith("flash1:")) { + var7 = 6; + var1 = var1.substring("flash1:".length()); + } else if (var6.startsWith("flash2:")) { + var7 = 7; + var1 = var1.substring("flash2:".length()); + } else if (var6.startsWith("flash3:")) { + var7 = 8; + var1 = var1.substring("flash3:".length()); + } else if (var6.startsWith("glow1:")) { + var7 = 9; + var1 = var1.substring("glow1:".length()); + } else if (var6.startsWith("glow2:")) { + var7 = 10; + var1 = var1.substring("glow2:".length()); + } else if (var6.startsWith("glow3:")) { + var7 = 11; + var1 = var1.substring("glow3:".length()); } } - 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 + var6 = var1.toLowerCase(); + byte var8 = 0; + if (var6.startsWith("wave:")) { + var8 = 1; + var1 = var1.substring("wave:".length()); + } else if (var6.startsWith("wave2:")) { + var8 = 2; + var1 = var1.substring("wave2:".length()); + } else if (var6.startsWith("shake:")) { + var8 = 3; + var1 = var1.substring("shake:".length()); + } else if (var6.startsWith("scroll:")) { + var8 = 4; + var1 = var1.substring("scroll:".length()); + } else if (var6.startsWith("slide:")) { + var8 = 5; + var1 = var1.substring("slide:".length()); + } else if (var2 != Language.Language_EN) { + if (var6.startsWith("wave:")) { + var8 = 1; + var1 = var1.substring("wave:".length()); + } else if (var6.startsWith("wave2:")) { + var8 = 2; + var1 = var1.substring("wave2:".length()); + } else if (var6.startsWith("shake:")) { + var8 = 3; + var1 = var1.substring("shake:".length()); + } else if (var6.startsWith("scroll:")) { + var8 = 4; + var1 = var1.substring("scroll:".length()); + } else if (var6.startsWith("slide:")) { + var8 = 5; + var1 = var1.substring("slide:".length()); } } - var4.packetBuffer.writeByte(var7); // L: 165 - var4.packetBuffer.writeByte(var8); // L: 166 - class370.method6755(var4.packetBuffer, var1); // L: 167 - if (var0 == class282.field3379.rsOrdinal()) { // L: 168 - var4.packetBuffer.writeByte(var3); // L: 169 + var4.packetBuffer.writeByte(var7); + var4.packetBuffer.writeByte(var8); + class370.method6755(var4.packetBuffer, var1); + if (var0 == class282.field3379.rsOrdinal()) { + var4.packetBuffer.writeByte(var3); } - var4.packetBuffer.method7357(var4.packetBuffer.offset - var5); // L: 171 - return var4; // L: 172 + var4.packetBuffer.method7357(var4.packetBuffer.offset - var5); + return var4; } @ObfuscatedName("j") @@ -392,12 +392,12 @@ public class BufferedSource implements Runnable { garbageValue = "843929154" ) static void method6516() { - Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 57 + Iterator var0 = Messages.Messages_hashTable.iterator(); while (var0.hasNext()) { - Message var1 = (Message)var0.next(); // L: 58 - var1.clearIsFromIgnored(); // L: 60 + Message var1 = (Message)var0.next(); + var1.clearIsFromIgnored(); } - } // L: 63 + } } diff --git a/runescape-client/src/main/java/ByteArrayNode.java b/runescape-client/src/main/java/ByteArrayNode.java index eadabd7fc7..45c6eff511 100644 --- a/runescape-client/src/main/java/ByteArrayNode.java +++ b/runescape-client/src/main/java/ByteArrayNode.java @@ -10,6 +10,6 @@ public class ByteArrayNode extends Node { public byte[] byteArray; public ByteArrayNode(byte[] var1) { - this.byteArray = var1; // L: 7 - } // L: 8 + this.byteArray = var1; + } } diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java index d740777c36..a2cda053f2 100644 --- a/runescape-client/src/main/java/ByteArrayPool.java +++ b/runescape-client/src/main/java/ByteArrayPool.java @@ -67,26 +67,26 @@ public class ByteArrayPool { public static ArrayList field4035; static { - ByteArrayPool_smallCount = 0; // L: 13 - ByteArrayPool_mediumCount = 0; // L: 14 - ByteArrayPool_largeCount = 0; // L: 15 - field4026 = 0; // L: 16 - field4023 = 1000; // L: 17 - field4028 = 250; // L: 18 - field4021 = 100; // L: 19 - field4030 = 50; // L: 20 - ByteArrayPool_small = new byte[1000][]; // L: 21 - ByteArrayPool_medium = new byte[250][]; // L: 22 - ByteArrayPool_large = new byte[100][]; // L: 23 - field4034 = new byte[50][]; // L: 24 - field4035 = new ArrayList(); // L: 28 - field4035.clear(); // L: 32 - field4035.add(100); // L: 33 - field4035.add(5000); // L: 34 - field4035.add(10000); // L: 35 - field4035.add(30000); // L: 36 + ByteArrayPool_smallCount = 0; + ByteArrayPool_mediumCount = 0; + ByteArrayPool_largeCount = 0; + field4026 = 0; + field4023 = 1000; + field4028 = 250; + field4021 = 100; + field4030 = 50; + ByteArrayPool_small = new byte[1000][]; + ByteArrayPool_medium = new byte[250][]; + ByteArrayPool_large = new byte[100][]; + field4034 = new byte[50][]; + field4035 = new ArrayList(); + field4035.clear(); + field4035.add(100); + field4035.add(5000); + field4035.add(10000); + field4035.add(30000); new HashMap(); - } // L: 42 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -96,56 +96,56 @@ public class ByteArrayPool { @Export("ByteArrayPool_getArrayBool") static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) { byte[] var4; - if (var0 != 100) { // L: 50 + if (var0 != 100) { if (var0 < 100) { } } else if (ByteArrayPool_smallCount > 0) { - var4 = ByteArrayPool_small[--ByteArrayPool_smallCount]; // L: 51 - ByteArrayPool_small[ByteArrayPool_smallCount] = null; // L: 52 - return var4; // L: 53 + var4 = ByteArrayPool_small[--ByteArrayPool_smallCount]; + ByteArrayPool_small[ByteArrayPool_smallCount] = null; + return var4; } - if (var0 != 5000) { // L: 55 + if (var0 != 5000) { if (var0 < 5000) { } } else if (ByteArrayPool_mediumCount > 0) { - var4 = ByteArrayPool_medium[--ByteArrayPool_mediumCount]; // L: 56 - ByteArrayPool_medium[ByteArrayPool_mediumCount] = null; // L: 57 - return var4; // L: 58 + var4 = ByteArrayPool_medium[--ByteArrayPool_mediumCount]; + ByteArrayPool_medium[ByteArrayPool_mediumCount] = null; + return var4; } - if (var0 != 10000) { // L: 60 + if (var0 != 10000) { if (var0 < 10000) { } } else if (ByteArrayPool_largeCount > 0) { - var4 = ByteArrayPool_large[--ByteArrayPool_largeCount]; // L: 61 - ByteArrayPool_large[ByteArrayPool_largeCount] = null; // L: 62 - return var4; // L: 63 + var4 = ByteArrayPool_large[--ByteArrayPool_largeCount]; + ByteArrayPool_large[ByteArrayPool_largeCount] = null; + return var4; } - if (var0 != 30000) { // L: 65 + if (var0 != 30000) { if (var0 < 30000) { } } else if (field4026 > 0) { - var4 = field4034[--field4026]; // L: 66 - field4034[field4026] = null; // L: 67 - return var4; // L: 68 + var4 = field4034[--field4026]; + field4034[field4026] = null; + return var4; } - if (World.ByteArrayPool_arrays != null) { // L: 70 - for (int var2 = 0; var2 < SoundCache.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 71 - if (SoundCache.ByteArrayPool_alternativeSizes[var2] != var0) { // L: 72 + if (World.ByteArrayPool_arrays != null) { + for (int var2 = 0; var2 < SoundCache.ByteArrayPool_alternativeSizes.length; ++var2) { + if (SoundCache.ByteArrayPool_alternativeSizes[var2] != var0) { if (var0 < SoundCache.ByteArrayPool_alternativeSizes[var2]) { } } else if (ApproximateRouteStrategy.ByteArrayPool_altSizeArrayCounts[var2] > 0) { - byte[] var3 = World.ByteArrayPool_arrays[var2][--ApproximateRouteStrategy.ByteArrayPool_altSizeArrayCounts[var2]]; // L: 73 - World.ByteArrayPool_arrays[var2][ApproximateRouteStrategy.ByteArrayPool_altSizeArrayCounts[var2]] = null; // L: 74 - return var3; // L: 75 + byte[] var3 = World.ByteArrayPool_arrays[var2][--ApproximateRouteStrategy.ByteArrayPool_altSizeArrayCounts[var2]]; + World.ByteArrayPool_arrays[var2][ApproximateRouteStrategy.ByteArrayPool_altSizeArrayCounts[var2]] = null; + return var3; } } } - return new byte[var0]; // L: 88 + return new byte[var0]; } @ObfuscatedName("t") @@ -155,6 +155,6 @@ public class ByteArrayPool { ) @Export("intToString") public static String intToString(int var0, boolean var1) { - return var1 && var0 >= 0 ? Skeleton.method3944(var0, 10, var1) : Integer.toString(var0); // L: 111 112 + return var1 && var0 >= 0 ? Skeleton.method3944(var0, 10, var1) : Integer.toString(var0); } } diff --git a/runescape-client/src/main/java/Calendar.java b/runescape-client/src/main/java/Calendar.java index 4ab2ed221e..2f1a2b86f6 100644 --- a/runescape-client/src/main/java/Calendar.java +++ b/runescape-client/src/main/java/Calendar.java @@ -25,11 +25,11 @@ public class Calendar { static int selectedItemSlot; 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 - DAYS_OF_THE_WEEK = new String[]{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; // L: 18 - java.util.Calendar.getInstance(); // L: 22 - Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT")); // L: 23 - } // L: 24 + 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"}}; + DAYS_OF_THE_WEEK = new String[]{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; + java.util.Calendar.getInstance(); + Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT")); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -37,19 +37,19 @@ public class Calendar { garbageValue = "880813540" ) public static int method5320(int var0, int var1, int var2, int var3, int var4, int var5) { - if ((var5 & 1) == 1) { // L: 9 - int var6 = var3; // L: 10 - var3 = var4; // L: 11 - var4 = var6; // L: 12 + if ((var5 & 1) == 1) { + int var6 = var3; + var3 = var4; + var4 = var6; } - var2 &= 3; // L: 14 - if (var2 == 0) { // L: 15 + var2 &= 3; + if (var2 == 0) { return var1; - } else if (var2 == 1) { // L: 16 + } else if (var2 == 1) { return 7 - var0 - (var3 - 1); } else { - return var2 == 2 ? 7 - var1 - (var4 - 1) : var0; // L: 17 + return var2 == 2 ? 7 - var1 - (var4 - 1) : var0; } } @@ -59,6 +59,6 @@ public class Calendar { garbageValue = "1" ) static int method5323(int var0) { - return (int)Math.pow(2.0D, (double)(7.0F + (float)var0 / 256.0F)); // L: 3627 + return (int)Math.pow(2.0D, (double)(7.0F + (float)var0 / 256.0F)); } } diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java index 8a2a446fc2..e4def79682 100644 --- a/runescape-client/src/main/java/Canvas.java +++ b/runescape-client/src/main/java/Canvas.java @@ -26,15 +26,15 @@ public final class Canvas extends java.awt.Canvas { Component component; Canvas(Component var1) { - this.component = var1; // L: 11 - } // L: 12 + this.component = var1; + } public final void paint(Graphics var1) { this.component.paint(var1); - } // L: 20 + } public final void update(Graphics var1) { - this.component.update(var1); // L: 15 + this.component.update(var1); } @ObfuscatedName("c") @@ -44,32 +44,32 @@ public final class Canvas extends java.awt.Canvas { ) @Export("readStringIntParameters") static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { - int var2 = var0.readUnsignedByte(); // L: 16 + int var2 = var0.readUnsignedByte(); int var3; - if (var1 == null) { // L: 17 - var3 = SpotAnimationDefinition.method3362(var2); // L: 18 - var1 = new IterableNodeHashTable(var3); // L: 19 + if (var1 == null) { + var3 = SpotAnimationDefinition.method3362(var2); + var1 = new IterableNodeHashTable(var3); } - for (var3 = 0; var3 < var2; ++var3) { // L: 21 - boolean var4 = var0.readUnsignedByte() == 1; // L: 22 - int var5 = var0.readMedium(); // L: 23 + for (var3 = 0; var3 < var2; ++var3) { + boolean var4 = var0.readUnsignedByte() == 1; + int var5 = var0.readMedium(); Object var6; if (var4) { - var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); // L: 25 + var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); } else { - var6 = new IntegerNode(var0.readInt()); // L: 26 + var6 = new IntegerNode(var0.readInt()); } - var1.put((Node)var6, (long)var5); // L: 27 + var1.put((Node)var6, (long)var5); } - return var1; // L: 29 + return var1; } @ObfuscatedName("c") public static double method408(double var0) { - return Math.exp(-var0 * var0 / 2.0D) / Math.sqrt(6.283185307179586D); // L: 9 + return Math.exp(-var0 * var0 / 2.0D) / Math.sqrt(6.283185307179586D); } @ObfuscatedName("j") @@ -79,54 +79,54 @@ public final class Canvas extends java.awt.Canvas { ) static int method404(int var0, Script var1, boolean var2) { Widget var3; - if (var0 >= 2000) { // L: 802 - var0 -= 1000; // L: 803 - var3 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 804 + if (var0 >= 2000) { + var0 -= 1000; + var3 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); } else { - var3 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; // L: 806 + var3 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; } - SecureRandomCallable.invalidateWidget(var3); // L: 807 - if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { // L: 808 - if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { // L: 828 - var3.modelType = 2; // L: 829 - var3.modelId = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 830 - return 1; // L: 831 - } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { // L: 833 - var3.modelType = 3; // L: 834 - var3.modelId = class340.localPlayer.appearance.getChatHeadId(); // L: 835 - return 1; // L: 836 + SecureRandomCallable.invalidateWidget(var3); + if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { + if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { + var3.modelType = 2; + var3.modelId = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { + var3.modelType = 3; + var3.modelId = class340.localPlayer.appearance.getChatHeadId(); + return 1; } else { - return 2; // L: 838 + return 2; } } else { - IsaacCipher.Interpreter_intStackSize -= 2; // L: 809 - int var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 810 - int var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 811 - var3.itemId = var4; // L: 812 - var3.itemQuantity = var5; // L: 813 - ItemComposition var6 = UserComparator6.ItemDefinition_get(var4); // L: 814 - var3.modelAngleX = var6.xan2d; // L: 815 - var3.modelAngleY = var6.yan2d; // L: 816 - var3.modelAngleZ = var6.zan2d; // L: 817 - var3.modelOffsetX = var6.offsetX2d; // L: 818 - var3.modelOffsetY = var6.offsetY2d; // L: 819 - var3.modelZoom = var6.zoom2d; // L: 820 + IsaacCipher.Interpreter_intStackSize -= 2; + int var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + int var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + var3.itemId = var4; + var3.itemQuantity = var5; + ItemComposition var6 = UserComparator6.ItemDefinition_get(var4); + var3.modelAngleX = var6.xan2d; + var3.modelAngleY = var6.yan2d; + var3.modelAngleZ = var6.zan2d; + var3.modelOffsetX = var6.offsetX2d; + var3.modelOffsetY = var6.offsetY2d; + var3.modelZoom = var6.zoom2d; if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) { - var3.itemQuantityMode = 0; // L: 821 - } else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | 1 == var6.isStackable) { // L: 822 + var3.itemQuantityMode = 0; + } else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | 1 == var6.isStackable) { var3.itemQuantityMode = 1; } else { - var3.itemQuantityMode = 2; // L: 823 + var3.itemQuantityMode = 2; } - if (var3.field3280 > 0) { // L: 824 + if (var3.field3280 > 0) { var3.modelZoom = var3.modelZoom * 32 / var3.field3280; - } else if (var3.rawWidth > 0) { // L: 825 + } else if (var3.rawWidth > 0) { var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; } - return 1; // L: 826 + return 1; } } @@ -137,7 +137,7 @@ public final class Canvas extends java.awt.Canvas { ) @Export("getNextWorldListWorld") static World getNextWorldListWorld() { - return World.World_listCount < World.World_count ? class334.World_worlds[++World.World_listCount - 1] : null; // L: 242 243 + return World.World_listCount < World.World_count ? class334.World_worlds[++World.World_listCount - 1] : null; } @ObfuscatedName("ar") @@ -146,92 +146,92 @@ public final class Canvas extends java.awt.Canvas { garbageValue = "1167859989" ) static int method405(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { // L: 3635 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 3636 - Client.field690 = (short)Calendar.method5323(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]); // L: 3637 - if (Client.field690 <= 0) { // L: 3638 + if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { + IsaacCipher.Interpreter_intStackSize -= 2; + Client.field690 = (short)Calendar.method5323(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]); + if (Client.field690 <= 0) { Client.field690 = 256; } - Client.field707 = (short)Calendar.method5323(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]); // L: 3639 - if (Client.field707 <= 0) { // L: 3640 + Client.field707 = (short)Calendar.method5323(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]); + if (Client.field707 <= 0) { Client.field707 = 256; } - return 1; // L: 3641 - } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { // L: 3643 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 3644 - Client.zoomHeight = (short)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3645 - if (Client.zoomHeight <= 0) { // L: 3646 + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { + IsaacCipher.Interpreter_intStackSize -= 2; + Client.zoomHeight = (short)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + if (Client.zoomHeight <= 0) { Client.zoomHeight = 256; } - Client.zoomWidth = (short)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3647 - if (Client.zoomWidth <= 0) { // L: 3648 + Client.zoomWidth = (short)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + if (Client.zoomWidth <= 0) { Client.zoomWidth = 320; } - return 1; // L: 3649 - } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { // L: 3651 - IsaacCipher.Interpreter_intStackSize -= 4; // L: 3652 - Client.field619 = (short)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3653 - if (Client.field619 <= 0) { // L: 3654 + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { + IsaacCipher.Interpreter_intStackSize -= 4; + Client.field619 = (short)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + if (Client.field619 <= 0) { Client.field619 = 1; } - Client.field735 = (short)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3655 - if (Client.field735 <= 0) { // L: 3656 + Client.field735 = (short)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + if (Client.field735 <= 0) { Client.field735 = 32767; - } else if (Client.field735 < Client.field619) { // L: 3657 + } else if (Client.field735 < Client.field619) { Client.field735 = Client.field619; } - Client.field736 = (short)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 3658 - if (Client.field736 <= 0) { // L: 3659 + Client.field736 = (short)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; + if (Client.field736 <= 0) { Client.field736 = 1; } - Client.field737 = (short)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3]; // L: 3660 - if (Client.field737 <= 0) { // L: 3661 + Client.field737 = (short)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3]; + if (Client.field737 <= 0) { Client.field737 = 32767; - } else if (Client.field737 < Client.field736) { // L: 3662 + } else if (Client.field737 < Client.field736) { Client.field737 = Client.field736; } - return 1; // L: 3663 - } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { // L: 3665 - if (Client.viewportWidget != null) { // L: 3666 - WorldMapDecoration.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); // L: 3667 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.viewportWidth; // L: 3668 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.viewportHeight; // L: 3669 + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { + if (Client.viewportWidget != null) { + WorldMapDecoration.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.viewportWidth; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.viewportHeight; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 3672 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 3673 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; } - return 1; // L: 3675 - } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { // L: 3677 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.zoomHeight; // L: 3678 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.zoomWidth; // L: 3679 - return 1; // L: 3680 - } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { // L: 3682 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class67.method1962(Client.field690); // L: 3683 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class67.method1962(Client.field707); // L: 3684 - return 1; // L: 3685 - } else if (var0 == 6220) { // L: 3687 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3688 - return 1; // L: 3689 - } else if (var0 == 6221) { // L: 3691 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3692 - return 1; // L: 3693 - } else if (var0 == 6222) { // L: 3695 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class186.canvasWidth; // L: 3696 - return 1; // L: 3697 - } else if (var0 == 6223) { // L: 3699 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = BoundaryObject.canvasHeight; // L: 3700 - return 1; // L: 3701 + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.zoomHeight; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.zoomWidth; + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class67.method1962(Client.field690); + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class67.method1962(Client.field707); + return 1; + } else if (var0 == 6220) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 6221) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 6222) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class186.canvasWidth; + return 1; + } else if (var0 == 6223) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = BoundaryObject.canvasHeight; + return 1; } else { - return 2; // L: 3703 + return 2; } } @@ -241,15 +241,15 @@ public final class Canvas extends java.awt.Canvas { garbageValue = "-1717871248" ) static final void method406() { - for (int var0 = 0; var0 < Client.npcCount; ++var0) { // L: 4614 - int var1 = Client.npcIndices[var0]; // L: 4615 - NPC var2 = Client.npcs[var1]; // L: 4616 - if (var2 != null) { // L: 4617 - ItemLayer.updateActorSequence(var2, var2.definition.size); // L: 4618 + for (int var0 = 0; var0 < Client.npcCount; ++var0) { + int var1 = Client.npcIndices[var0]; + NPC var2 = Client.npcs[var1]; + if (var2 != null) { + ItemLayer.updateActorSequence(var2, var2.definition.size); } } - } // L: 4621 + } @ObfuscatedName("ks") @ObfuscatedSignature( @@ -258,43 +258,43 @@ public final class Canvas extends java.awt.Canvas { ) @Export("runComponentCloseListeners") static final void runComponentCloseListeners(Widget[] var0, int var1) { - for (int var2 = 0; var2 < var0.length; ++var2) { // L: 11884 - Widget var3 = var0[var2]; // L: 11885 - if (var3 != null) { // L: 11886 - if (var3.type == 0) { // L: 11887 - if (var3.children != null) { // L: 11888 + for (int var2 = 0; var2 < var0.length; ++var2) { + Widget var3 = var0[var2]; + if (var3 != null) { + if (var3.type == 0) { + if (var3.children != null) { runComponentCloseListeners(var3.children, var1); } - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 11889 - if (var4 != null) { // L: 11890 + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); + if (var4 != null) { Message.runIntfCloseListeners(var4.group, var1); } } ScriptEvent var5; - if (var1 == 0 && var3.onDialogAbort != null) { // L: 11892 - var5 = new ScriptEvent(); // L: 11893 - var5.widget = var3; // L: 11894 - var5.args = var3.onDialogAbort; // L: 11895 - class285.runScriptEvent(var5); // L: 11896 + if (var1 == 0 && var3.onDialogAbort != null) { + var5 = new ScriptEvent(); + var5.widget = var3; + var5.args = var3.onDialogAbort; + class285.runScriptEvent(var5); } - if (var1 == 1 && var3.onSubChange != null) { // L: 11898 - if (var3.childIndex >= 0) { // L: 11899 - Widget var6 = ChatChannel.getWidget(var3.id); // L: 11900 - if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { // L: 11901 + if (var1 == 1 && var3.onSubChange != null) { + if (var3.childIndex >= 0) { + Widget var6 = ChatChannel.getWidget(var3.id); + if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { continue; } } - var5 = new ScriptEvent(); // L: 11905 - var5.widget = var3; // L: 11906 - var5.args = var3.onSubChange; // L: 11907 - class285.runScriptEvent(var5); // L: 11908 + var5 = new ScriptEvent(); + var5.widget = var3; + var5.args = var3.onSubChange; + class285.runScriptEvent(var5); } } } - } // L: 11911 + } } diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java index c77c39ae70..4ff9e9bd1b 100644 --- a/runescape-client/src/main/java/ChatChannel.java +++ b/runescape-client/src/main/java/ChatChannel.java @@ -38,8 +38,8 @@ public class ChatChannel { int count; ChatChannel() { - this.messages = new Message[100]; // L: 92 - } // L: 95 + this.messages = new Message[100]; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -48,28 +48,28 @@ public class ChatChannel { ) @Export("addMessage") Message addMessage(int var1, String var2, String var3, String var4) { - Message var5 = this.messages[99]; // L: 98 + Message var5 = this.messages[99]; - for (int var6 = this.count; var6 > 0; --var6) { // L: 99 - if (var6 != 100) { // L: 100 - this.messages[var6] = this.messages[var6 - 1]; // L: 101 + for (int var6 = this.count; var6 > 0; --var6) { + if (var6 != 100) { + this.messages[var6] = this.messages[var6 - 1]; } } - if (var5 == null) { // L: 103 + if (var5 == null) { var5 = new Message(var1, var2, var4, var3); } else { - var5.remove(); // L: 105 - var5.removeDual(); // L: 106 - var5.set(var1, var2, var4, var3); // L: 107 + var5.remove(); + var5.removeDual(); + var5.set(var1, var2, var4, var3); } - this.messages[0] = var5; // L: 109 - if (this.count < 100) { // L: 110 + this.messages[0] = var5; + if (this.count < 100) { ++this.count; } - return var5; // L: 111 + return var5; } @ObfuscatedName("b") @@ -79,7 +79,7 @@ public class ChatChannel { ) @Export("getMessage") Message getMessage(int var1) { - return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; // L: 115 116 + return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; } @ObfuscatedName("p") @@ -89,7 +89,7 @@ public class ChatChannel { ) @Export("size") int size() { - return this.count; // L: 120 + return this.count; } @ObfuscatedName("c") @@ -98,30 +98,30 @@ public class ChatChannel { garbageValue = "-84" ) static long method2054(CharSequence var0) { - long var1 = 0L; // L: 16 - int var3 = var0.length(); // L: 17 + long var1 = 0L; + int var3 = var0.length(); - 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 + for (int var4 = 0; var4 < var3; ++var4) { + var1 *= 37L; + char var5 = var0.charAt(var4); + if (var5 >= 'A' && var5 <= 'Z') { var1 += (long)(var5 + 1 - 65); - } else if (var5 >= 'a' && var5 <= 'z') { // L: 22 + } else if (var5 >= 'a' && var5 <= 'z') { var1 += (long)(var5 + 1 - 97); - } else if (var5 >= '0' && var5 <= '9') { // L: 23 + } else if (var5 >= '0' && var5 <= '9') { var1 += (long)(var5 + 27 - 48); } - if (var1 >= 177917621779460413L) { // L: 24 + if (var1 >= 177917621779460413L) { break; } } - while (var1 % 37L == 0L && 0L != var1) { // L: 26 + while (var1 % 37L == 0L && 0L != var1) { var1 /= 37L; } - return var1; // L: 27 + return var1; } @ObfuscatedName("b") @@ -131,16 +131,16 @@ public class ChatChannel { ) @Export("getWidget") public static Widget getWidget(int var0) { - int var1 = var0 >> 16; // L: 199 - int var2 = var0 & 65535; // L: 200 - if (MouseRecorder.Widget_interfaceComponents[var1] == null || MouseRecorder.Widget_interfaceComponents[var1][var2] == null) { // L: 201 - boolean var3 = class242.loadInterface(var1); // L: 202 - if (!var3) { // L: 203 + int var1 = var0 >> 16; + int var2 = var0 & 65535; + if (MouseRecorder.Widget_interfaceComponents[var1] == null || MouseRecorder.Widget_interfaceComponents[var1][var2] == null) { + boolean var3 = class242.loadInterface(var1); + if (!var3) { return null; } } - return MouseRecorder.Widget_interfaceComponents[var1][var2]; // L: 205 + return MouseRecorder.Widget_interfaceComponents[var1][var2]; } @ObfuscatedName("ka") @@ -149,25 +149,25 @@ public class ChatChannel { garbageValue = "3" ) static final InterfaceParent method2058(int var0, int var1, int var2) { - InterfaceParent var3 = new InterfaceParent(); // L: 12265 - var3.group = var1; // L: 12266 - var3.type = var2; // L: 12267 - Client.interfaceParents.put(var3, (long)var0); // L: 12268 - class140.Widget_resetModelFrames(var1); // L: 12269 - Widget var4 = getWidget(var0); // L: 12270 - SecureRandomCallable.invalidateWidget(var4); // L: 12271 - if (Client.meslayerContinueWidget != null) { // L: 12272 - SecureRandomCallable.invalidateWidget(Client.meslayerContinueWidget); // L: 12273 - Client.meslayerContinueWidget = null; // L: 12274 + InterfaceParent var3 = new InterfaceParent(); + var3.group = var1; + var3.type = var2; + Client.interfaceParents.put(var3, (long)var0); + class140.Widget_resetModelFrames(var1); + Widget var4 = getWidget(var0); + SecureRandomCallable.invalidateWidget(var4); + if (Client.meslayerContinueWidget != null) { + SecureRandomCallable.invalidateWidget(Client.meslayerContinueWidget); + Client.meslayerContinueWidget = null; } - FileSystem.method3084(); // L: 12276 - class115.revalidateWidgetScroll(MouseRecorder.Widget_interfaceComponents[var0 >> 16], var4, false); // L: 12277 - class33.runWidgetOnLoadListener(var1); // L: 12278 - if (Client.rootInterface != -1) { // L: 12279 + FileSystem.method3084(); + class115.revalidateWidgetScroll(MouseRecorder.Widget_interfaceComponents[var0 >> 16], var4, false); + class33.runWidgetOnLoadListener(var1); + if (Client.rootInterface != -1) { Message.runIntfCloseListeners(Client.rootInterface, 1); } - return var3; // L: 12280 + return var3; } } diff --git a/runescape-client/src/main/java/ClanChannel.java b/runescape-client/src/main/java/ClanChannel.java index 73bbd10157..e740142f86 100644 --- a/runescape-client/src/main/java/ClanChannel.java +++ b/runescape-client/src/main/java/ClanChannel.java @@ -34,17 +34,17 @@ public class ClanChannel extends Node { public byte field1643; static { - new BitSet(65536); // L: 22 - } // L: 23 + new BitSet(65536); + } @ObfuscatedSignature( descriptor = "(Lpi;)V" ) public ClanChannel(Buffer var1) { - this.field1642 = true; // L: 13 - this.name = null; // L: 17 - this.method2992(var1); // L: 26 - } // L: 27 + this.field1642 = true; + this.name = null; + this.method2992(var1); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -53,19 +53,19 @@ public class ClanChannel extends Node { ) @Export("getSortedMembers") public int[] getSortedMembers() { - if (this.sortedMembers == null) { // L: 30 - String[] var1 = new String[this.members.size()]; // L: 31 - this.sortedMembers = new int[this.members.size()]; // L: 32 + if (this.sortedMembers == null) { + String[] var1 = new String[this.members.size()]; + this.sortedMembers = new int[this.members.size()]; - for (int var2 = 0; var2 < this.members.size(); this.sortedMembers[var2] = var2++) { // L: 33 35 - var1[var2] = ((ClanChannelMember)this.members.get(var2)).username.method7914(); // L: 34 + for (int var2 = 0; var2 < this.members.size(); this.sortedMembers[var2] = var2++) { + var1[var2] = ((ClanChannelMember)this.members.get(var2)).username.method7914(); } - int[] var3 = this.sortedMembers; // L: 37 - class292.method5504(var1, var3, 0, var1.length - 1); // L: 39 + int[] var3 = this.sortedMembers; + class292.method5504(var1, var3, 0, var1.length - 1); } - return this.sortedMembers; // L: 42 + return this.sortedMembers; } @ObfuscatedName("b") @@ -75,9 +75,9 @@ public class ClanChannel extends Node { ) @Export("addMember") void addMember(ClanChannelMember var1) { - this.members.add(var1); // L: 46 - this.sortedMembers = null; // L: 47 - } // L: 48 + this.members.add(var1); + this.sortedMembers = null; + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -86,9 +86,9 @@ public class ClanChannel extends Node { ) @Export("removeMember") void removeMember(int var1) { - this.members.remove(var1); // L: 51 - this.sortedMembers = null; // L: 52 - } // L: 53 + this.members.remove(var1); + this.sortedMembers = null; + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -96,7 +96,7 @@ public class ClanChannel extends Node { garbageValue = "1" ) public int method2990() { - return this.members.size(); // L: 56 + return this.members.size(); } @ObfuscatedName("t") @@ -105,16 +105,16 @@ public class ClanChannel extends Node { garbageValue = "2014586653" ) public int method2991(String var1) { - if (!this.field1642) { // L: 60 + if (!this.field1642) { 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) { if (((ClanChannelMember)this.members.get(var2)).username.getName().equalsIgnoreCase(var1)) { - return var2; // L: 62 + return var2; } } - return -1; // L: 64 + return -1; } } @@ -124,51 +124,51 @@ public class ClanChannel extends Node { garbageValue = "-517363636" ) void method2992(Buffer var1) { - int var2 = var1.readUnsignedByte(); // L: 68 - if ((var2 & 1) != 0) { // L: 69 + int var2 = var1.readUnsignedByte(); + if ((var2 & 1) != 0) { this.field1637 = true; } - if ((var2 & 2) != 0) { // L: 70 + if ((var2 & 2) != 0) { this.field1642 = true; } - int var3 = 2; // L: 71 - if ((var2 & 4) != 0) { // L: 72 + int var3 = 2; + if ((var2 & 4) != 0) { var3 = var1.readUnsignedByte(); } - super.key = var1.readLong(); // L: 73 - this.field1640 = var1.readLong(); // L: 74 - this.name = var1.readStringCp1252NullTerminated(); // L: 75 - var1.readBoolean(); // L: 76 - this.field1643 = var1.readByte(); // L: 77 - this.field1636 = 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(); + this.field1640 = var1.readLong(); + this.name = var1.readStringCp1252NullTerminated(); + var1.readBoolean(); + this.field1643 = var1.readByte(); + this.field1636 = var1.readByte(); + int var4 = var1.readUnsignedShort(); + if (var4 > 0) { + this.members = new ArrayList(var4); - for (int var5 = 0; var5 < var4; ++var5) { // L: 82 - ClanChannelMember var6 = new ClanChannelMember(); // L: 83 - if (this.field1637) { // L: 84 - var1.readLong(); // L: 85 + for (int var5 = 0; var5 < var4; ++var5) { + ClanChannelMember var6 = new ClanChannelMember(); + if (this.field1637) { + var1.readLong(); } - if (this.field1642) { // L: 87 + if (this.field1642) { 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(); + var6.world = var1.readUnsignedShort(); + if (var3 >= 3) { + var1.readBoolean(); } - this.members.add(var5, var6); // L: 94 + this.members.add(var5, var6); } } - } // L: 97 + } @ObfuscatedName("j") @ObfuscatedSignature( @@ -176,386 +176,386 @@ public class ClanChannel extends Node { garbageValue = "-30" ) static final void method2996(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: 183 184 185 - if (var0 < Tiles.Tiles_minPlane) { // L: 188 + if (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) { + if (var0 < Tiles.Tiles_minPlane) { Tiles.Tiles_minPlane = var0; } - ObjectComposition var8 = class148.getObjectDefinition(var3); // L: 189 + ObjectComposition var8 = class148.getObjectDefinition(var3); int var9; int var10; - if (var4 != 1 && var4 != 3) { // L: 192 - var9 = var8.sizeX; // L: 197 - var10 = var8.sizeY; // L: 198 + if (var4 != 1 && var4 != 3) { + var9 = var8.sizeX; + var10 = var8.sizeY; } else { - var9 = var8.sizeY; // L: 193 - var10 = var8.sizeX; // L: 194 + var9 = var8.sizeY; + var10 = var8.sizeX; } int var11; int var12; - if (var9 + var1 <= 104) { // L: 204 - var11 = (var9 >> 1) + var1; // L: 205 - var12 = (var9 + 1 >> 1) + var1; // L: 206 + if (var9 + var1 <= 104) { + var11 = (var9 >> 1) + var1; + var12 = (var9 + 1 >> 1) + var1; } else { - var11 = var1; // L: 209 - var12 = var1 + 1; // L: 210 + var11 = var1; + var12 = var1 + 1; } int var13; int var14; - if (var10 + var2 <= 104) { // L: 212 - var13 = (var10 >> 1) + var2; // L: 213 - var14 = var2 + (var10 + 1 >> 1); // L: 214 + if (var10 + var2 <= 104) { + var13 = (var10 >> 1) + var2; + var14 = var2 + (var10 + 1 >> 1); } else { - var13 = var2; // L: 217 - var14 = var2 + 1; // L: 218 + var13 = var2; + var14 = var2 + 1; } - int[][] var15 = Tiles.Tiles_heights[var0]; // L: 220 - int var16 = var15[var11][var13] + var15[var12][var13] + var15[var11][var14] + var15[var12][var14] >> 2; // L: 221 - int var17 = (var1 << 7) + (var9 << 6); // L: 222 - int var18 = (var2 << 7) + (var10 << 6); // L: 223 - long var19 = SecureRandomFuture.calculateTag(var1, var2, 2, var8.int1 == 0, var3); // L: 224 - int var21 = var5 + (var4 << 6); // L: 225 - if (var8.int3 == 1) { // L: 226 + int[][] var15 = Tiles.Tiles_heights[var0]; + int var16 = var15[var11][var13] + var15[var12][var13] + var15[var11][var14] + var15[var12][var14] >> 2; + int var17 = (var1 << 7) + (var9 << 6); + int var18 = (var2 << 7) + (var10 << 6); + long var19 = SecureRandomFuture.calculateTag(var1, var2, 2, var8.int1 == 0, var3); + int var21 = var5 + (var4 << 6); + if (var8.int3 == 1) { var21 += 256; } int var23; int var24; - if (var8.hasSound()) { // L: 227 - ObjectSound var22 = new ObjectSound(); // L: 228 - var22.plane = var0; // L: 229 - var22.x = var1 * 128; // L: 230 - var22.y = var2 * 128; // L: 231 - var23 = var8.sizeX; // L: 232 - var24 = var8.sizeY; // L: 233 - if (var4 == 1 || var4 == 3) { // L: 234 - var23 = var8.sizeY; // L: 235 - var24 = var8.sizeX; // L: 236 + if (var8.hasSound()) { + ObjectSound var22 = new ObjectSound(); + var22.plane = var0; + var22.x = var1 * 128; + var22.y = var2 * 128; + var23 = var8.sizeX; + var24 = var8.sizeY; + if (var4 == 1 || var4 == 3) { + var23 = var8.sizeY; + var24 = var8.sizeX; } - var22.maxX = (var23 + var1) * 128; // L: 238 - var22.maxY = (var24 + var2) * 128; // L: 239 - var22.soundEffectId = var8.ambientSoundId; // L: 240 - var22.field793 = var8.int7 * 128; // L: 241 - var22.field796 = var8.int5; // L: 242 - var22.field797 = var8.int6; // L: 243 - var22.soundEffectIds = var8.soundEffectIds; // L: 244 - if (var8.transforms != null) { // L: 245 - var22.obj = var8; // L: 246 - var22.set(); // L: 247 + var22.maxX = (var23 + var1) * 128; + var22.maxY = (var24 + var2) * 128; + var22.soundEffectId = var8.ambientSoundId; + var22.field793 = var8.int7 * 128; + var22.field796 = var8.int5; + var22.field797 = var8.int6; + var22.soundEffectIds = var8.soundEffectIds; + if (var8.transforms != null) { + var22.obj = var8; + var22.set(); } - ObjectSound.objectSounds.addFirst(var22); // L: 249 - if (var22.soundEffectIds != null) { // L: 250 + ObjectSound.objectSounds.addFirst(var22); + if (var22.soundEffectIds != null) { var22.field789 = var22.field796 + (int)(Math.random() * (double)(var22.field797 - var22.field796)); } } Object var34; - if (var5 == 22) { // L: 252 - if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { // L: 253 - if (var8.animationId == -1 && var8.transforms == null) { // L: 255 + if (var5 == 22) { + if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { + if (var8.animationId == -1 && var8.transforms == null) { var34 = var8.getEntity(22, var4, var15, var17, var16, var18); } else { - var34 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 256 + var34 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); } - var6.newFloorDecoration(var0, var1, var2, var16, (Renderable)var34, var19, var21); // L: 257 - if (var8.interactType == 1 && var7 != null) { // L: 258 + var6.newFloorDecoration(var0, var1, var2, var16, (Renderable)var34, var19, var21); + if (var8.interactType == 1 && var7 != null) { var7.setBlockedByFloorDec(var1, var2); } } - } else if (var5 != 10 && var5 != 11) { // L: 261 + } else if (var5 != 10 && var5 != 11) { int[] var10000; - if (var5 >= 12) { // L: 282 - if (var8.animationId == -1 && var8.transforms == null) { // L: 284 + if (var5 >= 12) { + if (var8.animationId == -1 && var8.transforms == null) { var34 = var8.getEntity(var5, var4, var15, var17, var16, var18); } else { - var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 285 + var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); } - var6.method3960(var0, var1, var2, var16, 1, 1, (Renderable)var34, 0, var19, var21); // L: 286 - if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { // L: 287 + var6.method3960(var0, var1, var2, var16, 1, 1, (Renderable)var34, 0, var19, var21); + if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { var10000 = ClanChannelMember.field1504[var0][var1]; var10000[var2] |= 2340; } - if (var8.interactType != 0 && var7 != null) { // L: 288 + if (var8.interactType != 0 && var7 != null) { var7.addGameObject(var1, var2, var9, var10, var8.boolean1); } - } else if (var5 == 0) { // L: 291 - if (var8.animationId == -1 && var8.transforms == null) { // L: 293 + } else if (var5 == 0) { + if (var8.animationId == -1 && var8.transforms == null) { var34 = var8.getEntity(0, var4, var15, var17, var16, var18); } else { - var34 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 294 + var34 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); } - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field969[var4], 0, var19, var21); // L: 295 - if (var4 == 0) { // L: 296 - if (var8.clipped) { // L: 297 - SoundCache.field321[var0][var1][var2] = 50; // L: 298 - SoundCache.field321[var0][var1][var2 + 1] = 50; // L: 299 + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field969[var4], 0, var19, var21); + if (var4 == 0) { + if (var8.clipped) { + SoundCache.field321[var0][var1][var2] = 50; + SoundCache.field321[var0][var1][var2 + 1] = 50; } - if (var8.modelClipped) { // L: 301 + if (var8.modelClipped) { var10000 = ClanChannelMember.field1504[var0][var1]; var10000[var2] |= 585; } - } else if (var4 == 1) { // L: 303 - if (var8.clipped) { // L: 304 - SoundCache.field321[var0][var1][var2 + 1] = 50; // L: 305 - SoundCache.field321[var0][var1 + 1][var2 + 1] = 50; // L: 306 + } else if (var4 == 1) { + if (var8.clipped) { + SoundCache.field321[var0][var1][var2 + 1] = 50; + SoundCache.field321[var0][var1 + 1][var2 + 1] = 50; } - if (var8.modelClipped) { // L: 308 + if (var8.modelClipped) { var10000 = ClanChannelMember.field1504[var0][var1]; var10000[1 + var2] |= 1170; } - } else if (var4 == 2) { // L: 310 - if (var8.clipped) { // L: 311 - SoundCache.field321[var0][var1 + 1][var2] = 50; // L: 312 - SoundCache.field321[var0][var1 + 1][var2 + 1] = 50; // L: 313 + } else if (var4 == 2) { + if (var8.clipped) { + SoundCache.field321[var0][var1 + 1][var2] = 50; + SoundCache.field321[var0][var1 + 1][var2 + 1] = 50; } - if (var8.modelClipped) { // L: 315 + if (var8.modelClipped) { var10000 = ClanChannelMember.field1504[var0][var1 + 1]; var10000[var2] |= 585; } - } else if (var4 == 3) { // L: 317 - if (var8.clipped) { // L: 318 - SoundCache.field321[var0][var1][var2] = 50; // L: 319 - SoundCache.field321[var0][var1 + 1][var2] = 50; // L: 320 + } else if (var4 == 3) { + if (var8.clipped) { + SoundCache.field321[var0][var1][var2] = 50; + SoundCache.field321[var0][var1 + 1][var2] = 50; } - if (var8.modelClipped) { // L: 322 + if (var8.modelClipped) { var10000 = ClanChannelMember.field1504[var0][var1]; var10000[var2] |= 1170; } } - if (var8.interactType != 0 && var7 != null) { // L: 324 + if (var8.interactType != 0 && var7 != null) { var7.method3721(var1, var2, var5, var4, var8.boolean1); } - if (var8.int2 != 16) { // L: 325 + if (var8.int2 != 16) { var6.method3966(var0, var1, var2, var8.int2); } - } else if (var5 == 1) { // L: 328 - if (var8.animationId == -1 && var8.transforms == null) { // L: 330 + } else if (var5 == 1) { + if (var8.animationId == -1 && var8.transforms == null) { var34 = var8.getEntity(1, var4, var15, var17, var16, var18); } else { - var34 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 331 + var34 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); } - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field970[var4], 0, var19, var21); // L: 332 - if (var8.clipped) { // L: 333 - if (var4 == 0) { // L: 334 + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field970[var4], 0, var19, var21); + if (var8.clipped) { + if (var4 == 0) { SoundCache.field321[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { // L: 335 + } else if (var4 == 1) { SoundCache.field321[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { // L: 336 + } else if (var4 == 2) { SoundCache.field321[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { // L: 337 + } else if (var4 == 3) { SoundCache.field321[var0][var1][var2] = 50; } } - if (var8.interactType != 0 && var7 != null) { // L: 339 + if (var8.interactType != 0 && var7 != null) { var7.method3721(var1, var2, var5, var4, var8.boolean1); } } else { int var28; - if (var5 == 2) { // L: 342 - var28 = var4 + 1 & 3; // L: 343 + if (var5 == 2) { + var28 = var4 + 1 & 3; Object var31; Object var32; - if (var8.animationId == -1 && var8.transforms == null) { // L: 346 - var31 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); // L: 347 - var32 = var8.getEntity(2, var28, var15, var17, var16, var18); // L: 348 + if (var8.animationId == -1 && var8.transforms == null) { + var31 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); + var32 = var8.getEntity(2, var28, var15, var17, var16, var18); } else { - var31 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 351 - var32 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 352 + var31 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + var32 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); } - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var31, (Renderable)var32, Tiles.field969[var4], Tiles.field969[var28], var19, var21); // L: 354 - if (var8.modelClipped) { // L: 355 - if (var4 == 0) { // L: 356 - var10000 = ClanChannelMember.field1504[var0][var1]; // L: 357 + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var31, (Renderable)var32, Tiles.field969[var4], Tiles.field969[var28], var19, var21); + if (var8.modelClipped) { + if (var4 == 0) { + var10000 = ClanChannelMember.field1504[var0][var1]; var10000[var2] |= 585; - var10000 = ClanChannelMember.field1504[var0][var1]; // L: 358 + var10000 = ClanChannelMember.field1504[var0][var1]; var10000[var2 + 1] |= 1170; - } else if (var4 == 1) { // L: 360 - var10000 = ClanChannelMember.field1504[var0][var1]; // L: 361 + } else if (var4 == 1) { + var10000 = ClanChannelMember.field1504[var0][var1]; var10000[var2 + 1] |= 1170; - var10000 = ClanChannelMember.field1504[var0][var1 + 1]; // L: 362 + var10000 = ClanChannelMember.field1504[var0][var1 + 1]; var10000[var2] |= 585; - } else if (var4 == 2) { // L: 364 - var10000 = ClanChannelMember.field1504[var0][var1 + 1]; // L: 365 + } else if (var4 == 2) { + var10000 = ClanChannelMember.field1504[var0][var1 + 1]; var10000[var2] |= 585; - var10000 = ClanChannelMember.field1504[var0][var1]; // L: 366 + var10000 = ClanChannelMember.field1504[var0][var1]; var10000[var2] |= 1170; - } else if (var4 == 3) { // L: 368 - var10000 = ClanChannelMember.field1504[var0][var1]; // L: 369 + } else if (var4 == 3) { + var10000 = ClanChannelMember.field1504[var0][var1]; var10000[var2] |= 1170; - var10000 = ClanChannelMember.field1504[var0][var1]; // L: 370 + var10000 = ClanChannelMember.field1504[var0][var1]; var10000[var2] |= 585; } } - if (var8.interactType != 0 && var7 != null) { // L: 373 + if (var8.interactType != 0 && var7 != null) { var7.method3721(var1, var2, var5, var4, var8.boolean1); } - if (var8.int2 != 16) { // L: 374 + if (var8.int2 != 16) { var6.method3966(var0, var1, var2, var8.int2); } - } else if (var5 == 3) { // L: 377 - if (var8.animationId == -1 && var8.transforms == null) { // L: 379 + } else if (var5 == 3) { + if (var8.animationId == -1 && var8.transforms == null) { var34 = var8.getEntity(3, var4, var15, var17, var16, var18); } else { - var34 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 380 + var34 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); } - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field970[var4], 0, var19, var21); // L: 381 - if (var8.clipped) { // L: 382 - if (var4 == 0) { // L: 383 + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field970[var4], 0, var19, var21); + if (var8.clipped) { + if (var4 == 0) { SoundCache.field321[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { // L: 384 + } else if (var4 == 1) { SoundCache.field321[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { // L: 385 + } else if (var4 == 2) { SoundCache.field321[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { // L: 386 + } else if (var4 == 3) { SoundCache.field321[var0][var1][var2] = 50; } } - if (var8.interactType != 0 && var7 != null) { // L: 388 + if (var8.interactType != 0 && var7 != null) { var7.method3721(var1, var2, var5, var4, var8.boolean1); } - } else if (var5 == 9) { // L: 391 - if (var8.animationId == -1 && var8.transforms == null) { // L: 393 + } else if (var5 == 9) { + if (var8.animationId == -1 && var8.transforms == null) { var34 = var8.getEntity(var5, var4, var15, var17, var16, var18); } else { - var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 394 + var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); } - var6.method3960(var0, var1, var2, var16, 1, 1, (Renderable)var34, 0, var19, var21); // L: 395 - if (var8.interactType != 0 && var7 != null) { // L: 396 + var6.method3960(var0, var1, var2, var16, 1, 1, (Renderable)var34, 0, var19, var21); + if (var8.interactType != 0 && var7 != null) { var7.addGameObject(var1, var2, var9, var10, var8.boolean1); } - if (var8.int2 != 16) { // L: 397 + if (var8.int2 != 16) { var6.method3966(var0, var1, var2, var8.int2); } - } else if (var5 == 4) { // L: 400 - if (var8.animationId == -1 && var8.transforms == null) { // L: 402 + } else if (var5 == 4) { + if (var8.animationId == -1 && var8.transforms == null) { var34 = var8.getEntity(4, var4, var15, var17, var16, var18); } else { - var34 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 403 + var34 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); } - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field969[var4], 0, 0, 0, var19, var21); // L: 404 + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field969[var4], 0, 0, 0, var19, var21); } else { Object var25; long var29; - if (var5 == 5) { // L: 407 - var28 = 16; // L: 408 - var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 409 - if (0L != var29) { // L: 410 + if (var5 == 5) { + var28 = 16; + var29 = var6.getBoundaryObjectTag(var0, var1, var2); + if (0L != var29) { var28 = class148.getObjectDefinition(PacketWriter.Entity_unpackID(var29)).int2; } - if (var8.animationId == -1 && var8.transforms == null) { // L: 412 + if (var8.animationId == -1 && var8.transforms == null) { 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: 413 + var25 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); } - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, Tiles.field969[var4], 0, var28 * Tiles.field976[var4], var28 * Tiles.field966[var4], var19, var21); // L: 414 - } else if (var5 == 6) { // L: 417 - var28 = 8; // L: 418 - var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 419 - if (0L != var29) { // L: 420 + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, Tiles.field969[var4], 0, var28 * Tiles.field976[var4], var28 * Tiles.field966[var4], var19, var21); + } else if (var5 == 6) { + var28 = 8; + var29 = var6.getBoundaryObjectTag(var0, var1, var2); + if (0L != var29) { var28 = class148.getObjectDefinition(PacketWriter.Entity_unpackID(var29)).int2 / 2; } - if (var8.animationId == -1 && var8.transforms == null) { // L: 422 + if (var8.animationId == -1 && var8.transforms == null) { 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: 423 + var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); } - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, 256, var4, var28 * Tiles.field973[var4], var28 * Tiles.field974[var4], var19, var21); // L: 424 - } else if (var5 == 7) { // L: 427 - var23 = var4 + 2 & 3; // L: 429 - if (var8.animationId == -1 && var8.transforms == null) { // L: 430 + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, 256, var4, var28 * Tiles.field973[var4], var28 * Tiles.field974[var4], var19, var21); + } else if (var5 == 7) { + var23 = var4 + 2 & 3; + if (var8.animationId == -1 && var8.transforms == null) { var34 = var8.getEntity(4, var23 + 4, var15, var17, var16, var18); } else { - var34 = new DynamicObject(var3, 4, var23 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 431 + var34 = new DynamicObject(var3, 4, var23 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); } - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, 256, var23, 0, 0, var19, var21); // L: 432 - } else if (var5 == 8) { // L: 435 - var28 = 8; // L: 436 - var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 437 - if (var29 != 0L) { // L: 438 + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, 256, var23, 0, 0, var19, var21); + } else if (var5 == 8) { + var28 = 8; + var29 = var6.getBoundaryObjectTag(var0, var1, var2); + if (var29 != 0L) { var28 = class148.getObjectDefinition(PacketWriter.Entity_unpackID(var29)).int2 / 2; } - int var27 = var4 + 2 & 3; // L: 441 + int var27 = var4 + 2 & 3; Object var26; - if (var8.animationId == -1 && var8.transforms == null) { // L: 442 - var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); // L: 443 - var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); // L: 444 + if (var8.animationId == -1 && var8.transforms == null) { + var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); + var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); } else { - var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 447 - var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 448 + var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); + var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); } - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)var26, 256, var4, var28 * Tiles.field973[var4], var28 * Tiles.field974[var4], var19, var21); // L: 450 + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)var26, 256, var4, var28 * Tiles.field973[var4], var28 * Tiles.field974[var4], var19, var21); } } } } else { - if (var8.animationId == -1 && var8.transforms == null) { // L: 263 + if (var8.animationId == -1 && var8.transforms == null) { var34 = var8.getEntity(10, var4, var15, var17, var16, var18); } else { - var34 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 264 + var34 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); } - if (var34 != null && var6.method3960(var0, var1, var2, var16, var9, var10, (Renderable)var34, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { // L: 265 266 - var23 = 15; // L: 267 - if (var34 instanceof Model) { // L: 268 - var23 = ((Model)var34).method4222() / 4; // L: 269 - if (var23 > 30) { // L: 270 + if (var34 != null && var6.method3960(var0, var1, var2, var16, var9, var10, (Renderable)var34, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { + var23 = 15; + if (var34 instanceof Model) { + var23 = ((Model)var34).method4222() / 4; + if (var23 > 30) { var23 = 30; } } - for (var24 = 0; var24 <= var9; ++var24) { // L: 272 - for (int var33 = 0; var33 <= var10; ++var33) { // L: 273 - if (var23 > SoundCache.field321[var0][var24 + var1][var33 + var2]) { // L: 274 + for (var24 = 0; var24 <= var9; ++var24) { + for (int var33 = 0; var33 <= var10; ++var33) { + if (var23 > SoundCache.field321[var0][var24 + var1][var33 + var2]) { SoundCache.field321[var0][var24 + var1][var33 + var2] = (byte)var23; } } } } - if (var8.interactType != 0 && var7 != null) { // L: 279 + if (var8.interactType != 0 && var7 != null) { var7.addGameObject(var1, var2, var9, var10, var8.boolean1); } } } - } // L: 259 280 289 326 340 375 389 398 405 415 425 433 451 453 + } } diff --git a/runescape-client/src/main/java/ClanChannelMember.java b/runescape-client/src/main/java/ClanChannelMember.java index 0f551f8480..d71b37c74e 100644 --- a/runescape-client/src/main/java/ClanChannelMember.java +++ b/runescape-client/src/main/java/ClanChannelMember.java @@ -26,7 +26,7 @@ public class ClanChannelMember { public Username username; ClanChannelMember() { - } // L: 10 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -34,46 +34,46 @@ public class ClanChannelMember { garbageValue = "-47" ) public static class160 method2777(int var0, Buffer var1) { - int var2 = var1.readUnsignedByte(); // L: 24 - boolean var3 = (var2 & 1) != 0; // L: 25 - boolean var4 = (var2 & 2) != 0; // L: 26 - class160 var5 = new class160(var0); // L: 27 + int var2 = var1.readUnsignedByte(); + boolean var3 = (var2 & 1) != 0; + boolean var4 = (var2 & 2) != 0; + class160 var5 = new class160(var0); 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.field1732 != null && var7.length == var5.field1732.length; // L: 33 + if (var3) { + var6 = var1.readUnsignedByte(); + var7 = new int[]{var6 & 15, var6 >> 4 & 15}; + var8 = var5.field1732 != null && var7.length == var5.field1732.length; - 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.field1732[var7[var9]] = var10; // L: 38 + for (var9 = 0; var9 < 2; ++var9) { + if (var7[var9] != 15) { + var10 = (short)var1.readUnsignedShort(); + if (var8) { + var5.field1732[var7[var9]] = var10; } } } } - if (var4) { // L: 43 - var6 = var1.readUnsignedByte(); // L: 44 - var7 = new int[]{var6 & 15, var6 >> 4 & 15}; // L: 45 46 47 - var8 = var5.field1738 != null && var7.length == var5.field1738.length; // L: 48 + if (var4) { + var6 = var1.readUnsignedByte(); + var7 = new int[]{var6 & 15, var6 >> 4 & 15}; + var8 = var5.field1738 != null && var7.length == var5.field1738.length; - 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.field1738[var7[var9]] = var10; // L: 53 + for (var9 = 0; var9 < 2; ++var9) { + if (var7[var9] != 15) { + var10 = (short)var1.readUnsignedShort(); + if (var8) { + var5.field1738[var7[var9]] = var10; } } } } - return var5; // L: 58 + return var5; } @ObfuscatedName("p") @@ -82,6 +82,6 @@ public class ClanChannelMember { garbageValue = "1180078382" ) public static int method2778(CharSequence var0) { - return MusicPatchNode.method5293(var0, 10, true); // L: 77 + return MusicPatchNode.method5293(var0, 10, true); } } diff --git a/runescape-client/src/main/java/ClanMate.java b/runescape-client/src/main/java/ClanMate.java index b68c52b0bf..ea1b3ca32f 100644 --- a/runescape-client/src/main/java/ClanMate.java +++ b/runescape-client/src/main/java/ClanMate.java @@ -20,9 +20,9 @@ public class ClanMate extends Buddy { TriBool ignored; ClanMate() { - this.friend = TriBool.TriBool_unknown; // L: 6 - this.ignored = TriBool.TriBool_unknown; // L: 7 - } // L: 9 + this.friend = TriBool.TriBool_unknown; + this.ignored = TriBool.TriBool_unknown; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -31,8 +31,8 @@ public class ClanMate extends Buddy { ) @Export("clearIsFriend") void clearIsFriend() { - this.friend = TriBool.TriBool_unknown; // L: 12 - } // L: 13 + this.friend = TriBool.TriBool_unknown; + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -41,8 +41,8 @@ public class ClanMate extends Buddy { ) @Export("isFriend") public final boolean isFriend() { - if (this.friend == TriBool.TriBool_unknown) { // L: 16 - this.fillIsFriend(); // L: 17 + if (this.friend == TriBool.TriBool_unknown) { + this.fillIsFriend(); } return this.friend == TriBool.TriBool_true; @@ -55,8 +55,8 @@ public class ClanMate extends Buddy { ) @Export("fillIsFriend") void fillIsFriend() { - this.friend = GameEngine.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 23 - } // L: 24 + this.friend = GameEngine.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + } @ObfuscatedName("n") @ObfuscatedSignature( @@ -65,8 +65,8 @@ public class ClanMate extends Buddy { ) @Export("clearIsIgnored") void clearIsIgnored() { - this.ignored = TriBool.TriBool_unknown; // L: 27 - } // L: 28 + this.ignored = TriBool.TriBool_unknown; + } @ObfuscatedName("r") @ObfuscatedSignature( @@ -75,11 +75,11 @@ public class ClanMate extends Buddy { ) @Export("isIgnored") public final boolean isIgnored() { - if (this.ignored == TriBool.TriBool_unknown) { // L: 31 - this.fillIsIgnored(); // L: 32 + if (this.ignored == TriBool.TriBool_unknown) { + this.fillIsIgnored(); } - return this.ignored == TriBool.TriBool_true; // L: 34 + return this.ignored == TriBool.TriBool_true; } @ObfuscatedName("o") @@ -89,8 +89,8 @@ public class ClanMate extends Buddy { ) @Export("fillIsIgnored") void fillIsIgnored() { - this.ignored = GameEngine.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 38 - } // L: 39 + this.ignored = GameEngine.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -99,6 +99,6 @@ public class ClanMate extends Buddy { ) @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 + return var0 == 10 || var0 == 11 || var0 == 12 || var0 == 13 || var0 == 14 || var0 == 15 || var0 == 16 || var0 == 17; } } diff --git a/runescape-client/src/main/java/ClanSettings.java b/runescape-client/src/main/java/ClanSettings.java index fc11c6b84a..6a8316c382 100644 --- a/runescape-client/src/main/java/ClanSettings.java +++ b/runescape-client/src/main/java/ClanSettings.java @@ -100,11 +100,11 @@ public class ClanSettings { descriptor = "(Lpi;)V" ) public ClanSettings(Buffer var1) { - this.field1563 = 0; // L: 14 - this.name = null; // L: 15 - this.field1565 = 0; // L: 16 - this.currentOwner = -1; // L: 29 - this.field1579 = -1; // L: 30 + this.field1563 = 0; + this.name = null; + this.field1565 = 0; + this.currentOwner = -1; + this.field1579 = -1; this.method2895(var1); } @@ -114,8 +114,8 @@ public class ClanSettings { garbageValue = "-1038575948" ) void method2844(int var1) { - if (this.useHashes) { // L: 47 - if (this.memberHashes != null) { // L: 48 + if (this.useHashes) { + if (this.memberHashes != null) { System.arraycopy(this.memberHashes, 0, this.memberHashes = new long[var1], 0, this.memberCount); } else { this.memberHashes = new long[var1]; @@ -133,10 +133,10 @@ public class ClanSettings { if (this.memberRanks != null) { System.arraycopy(this.memberRanks, 0, this.memberRanks = new byte[var1], 0, this.memberCount); } else { - this.memberRanks = new byte[var1]; // L: 56 + this.memberRanks = new byte[var1]; } - if (this.field1575 != null) { // L: 57 + if (this.field1575 != null) { System.arraycopy(this.field1575, 0, this.field1575 = new int[var1], 0, this.memberCount); } else { this.field1575 = new int[var1]; @@ -148,7 +148,7 @@ public class ClanSettings { this.field1582 = new int[var1]; } - if (this.field1577 != null) { // L: 61 + if (this.field1577 != null) { System.arraycopy(this.field1577, 0, this.field1577 = new boolean[var1], 0, this.memberCount); } else { this.field1577 = new boolean[var1]; @@ -163,22 +163,22 @@ public class ClanSettings { ) void method2845(int var1) { if (this.useHashes) { - if (this.bannedMemberHashes != null) { // L: 67 + if (this.bannedMemberHashes != null) { System.arraycopy(this.bannedMemberHashes, 0, this.bannedMemberHashes = new long[var1], 0, this.bannedMemberCount); } else { this.bannedMemberHashes = new long[var1]; } } - if (this.useNames) { // L: 70 + if (this.useNames) { if (this.bannedMemberNames != null) { System.arraycopy(this.bannedMemberNames, 0, this.bannedMemberNames = new String[var1], 0, this.bannedMemberCount); } else { - this.bannedMemberNames = new String[var1]; // L: 72 + this.bannedMemberNames = new String[var1]; } } - } // L: 74 + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -186,14 +186,14 @@ public class ClanSettings { garbageValue = "1765572452" ) public int method2881(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 + if (var1 != null && var1.length() != 0) { + for (int var2 = 0; var2 < this.memberCount; ++var2) { + if (this.memberNames[var2].equals(var1)) { return var2; } } - return -1; // L: 81 + return -1; } else { return -1; } @@ -205,8 +205,8 @@ public class ClanSettings { garbageValue = "-120" ) public int method2847(int var1, int var2, int var3) { - int var4 = var3 == 31 ? -1 : (1 << var3 + 1) - 1; // L: 85 - return (this.field1575[var1] & var4) >>> var2; // L: 86 + int var4 = var3 == 31 ? -1 : (1 << var3 + 1) - 1; + return (this.field1575[var1] & var4) >>> var2; } @ObfuscatedName("t") @@ -216,11 +216,11 @@ public class ClanSettings { ) @Export("getTitleGroupValue") public Integer getTitleGroupValue(int var1) { - if (this.parameters == null) { // L: 90 + if (this.parameters == null) { return null; } else { - Node var2 = this.parameters.get((long)var1); // L: 91 - return var2 != null && var2 instanceof IntegerNode ? new Integer(((IntegerNode)var2).integer) : null; // L: 92 93 + Node var2 = this.parameters.get((long)var1); + return var2 != null && var2 instanceof IntegerNode ? new Integer(((IntegerNode)var2).integer) : null; } } @@ -231,22 +231,22 @@ public class ClanSettings { ) @Export("getSortedMembers") public int[] getSortedMembers() { - if (this.sortedMembers == null) { // L: 97 - String[] var1 = new String[this.memberCount]; // L: 98 - this.sortedMembers = new int[this.memberCount]; // L: 99 + if (this.sortedMembers == null) { + String[] var1 = new String[this.memberCount]; + this.sortedMembers = new int[this.memberCount]; - for (int var2 = 0; var2 < this.memberCount; this.sortedMembers[var2] = var2++) { // L: 100 103 - var1[var2] = this.memberNames[var2]; // L: 101 - if (var1[var2] != null) { // L: 102 + for (int var2 = 0; var2 < this.memberCount; this.sortedMembers[var2] = var2++) { + var1[var2] = this.memberNames[var2]; + if (var1[var2] != null) { var1[var2] = var1[var2].toLowerCase(); } } - int[] var3 = this.sortedMembers; // L: 105 - class292.method5504(var1, var3, 0, var1.length - 1); // L: 107 + int[] var3 = this.sortedMembers; + class292.method5504(var1, var3, 0, var1.length - 1); } - return this.sortedMembers; // L: 110 + return this.sortedMembers; } @ObfuscatedName("j") @@ -255,41 +255,41 @@ public class ClanSettings { garbageValue = "1014767431" ) void method2850(long var1, String var3, int var4) { - if (var3 != null && var3.length() == 0) { // L: 114 + if (var3 != null && var3.length() == 0) { var3 = null; } - if (this.useHashes != var1 > 0L) { // L: 115 + if (this.useHashes != var1 > 0L) { throw new RuntimeException(""); - } else if (var3 != null != this.useNames) { // L: 116 + } else if (var3 != null != this.useNames) { 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 + if (var1 > 0L && (this.memberHashes == null || this.memberCount >= this.memberHashes.length) || var3 != null && (this.memberNames == null || this.memberCount >= this.memberNames.length)) { this.method2844(this.memberCount + 5); } - if (this.memberHashes != null) { // L: 118 + if (this.memberHashes != null) { this.memberHashes[this.memberCount] = var1; } - if (this.memberNames != null) { // L: 119 + if (this.memberNames != null) { 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) { + this.currentOwner = this.memberCount; + this.memberRanks[this.memberCount] = 126; } else { - this.memberRanks[this.memberCount] = 0; // L: 125 + this.memberRanks[this.memberCount] = 0; } - this.field1575[this.memberCount] = 0; // L: 127 - this.field1582[this.memberCount] = var4; // L: 128 - this.field1577[this.memberCount] = false; // L: 129 - ++this.memberCount; // L: 130 - this.sortedMembers = null; // L: 131 + this.field1575[this.memberCount] = 0; + this.field1582[this.memberCount] = var4; + this.field1577[this.memberCount] = false; + ++this.memberCount; + this.sortedMembers = null; } - } // L: 132 + } @ObfuscatedName("w") @ObfuscatedSignature( @@ -297,38 +297,38 @@ public class ClanSettings { garbageValue = "0" ) void method2862(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.field1575 = null; // L: 142 - this.field1582 = null; // L: 143 - this.field1577 = null; // L: 144 - this.currentOwner = -1; // L: 145 - this.field1579 = -1; // L: 146 + if (var1 >= 0 && var1 < this.memberCount) { + --this.memberCount; + this.sortedMembers = null; + if (this.memberCount == 0) { + this.memberHashes = null; + this.memberNames = null; + this.memberRanks = null; + this.field1575 = null; + this.field1582 = null; + this.field1577 = null; + this.currentOwner = -1; + this.field1579 = -1; } else { - System.arraycopy(this.memberRanks, var1 + 1, this.memberRanks, var1, this.memberCount - var1); // L: 149 - System.arraycopy(this.field1575, var1 + 1, this.field1575, var1, this.memberCount - var1); // L: 150 - System.arraycopy(this.field1582, var1 + 1, this.field1582, var1, this.memberCount - var1); // L: 151 - System.arraycopy(this.field1577, var1 + 1, this.field1577, var1, this.memberCount - var1); // L: 152 - if (this.memberHashes != null) { // L: 153 + System.arraycopy(this.memberRanks, var1 + 1, this.memberRanks, var1, this.memberCount - var1); + System.arraycopy(this.field1575, var1 + 1, this.field1575, var1, this.memberCount - var1); + System.arraycopy(this.field1582, var1 + 1, this.field1582, var1, this.memberCount - var1); + System.arraycopy(this.field1577, var1 + 1, this.field1577, var1, this.memberCount - var1); + if (this.memberHashes != null) { System.arraycopy(this.memberHashes, var1 + 1, this.memberHashes, var1, this.memberCount - var1); } - if (this.memberNames != null) { // L: 154 + if (this.memberNames != null) { System.arraycopy(this.memberNames, var1 + 1, this.memberNames, var1, this.memberCount - var1); } - this.updateOwner(); // L: 155 + this.updateOwner(); } } else { throw new RuntimeException(""); } - } // L: 157 + } @ObfuscatedName("n") @ObfuscatedSignature( @@ -337,35 +337,35 @@ public class ClanSettings { ) @Export("updateOwner") void updateOwner() { - if (this.memberCount == 0) { // L: 160 - this.currentOwner = -1; // L: 161 - this.field1579 = -1; // L: 162 + if (this.memberCount == 0) { + this.currentOwner = -1; + this.field1579 = -1; } else { - this.currentOwner = -1; // L: 165 - this.field1579 = -1; // L: 166 - int var1 = 0; // L: 167 - byte var2 = this.memberRanks[0]; // L: 168 + this.currentOwner = -1; + this.field1579 = -1; + int var1 = 0; + byte var2 = this.memberRanks[0]; - for (int var3 = 1; var3 < this.memberCount; ++var3) { // L: 169 - if (this.memberRanks[var3] > var2) { // L: 170 - if (var2 == 125) { // L: 171 + for (int var3 = 1; var3 < this.memberCount; ++var3) { + if (this.memberRanks[var3] > var2) { + if (var2 == 125) { this.field1579 = var1; } - var1 = var3; // L: 172 - var2 = this.memberRanks[var3]; // L: 173 - } else if (this.field1579 == -1 && this.memberRanks[var3] == 125) { // L: 175 - this.field1579 = var3; // L: 176 + var1 = var3; + var2 = this.memberRanks[var3]; + } else if (this.field1579 == -1 && this.memberRanks[var3] == 125) { + this.field1579 = var3; } } - this.currentOwner = var1; // L: 179 - if (this.currentOwner != -1) { // L: 180 + this.currentOwner = var1; + if (this.currentOwner != -1) { this.memberRanks[this.currentOwner] = 126; } } - } // L: 163 181 + } @ObfuscatedName("r") @ObfuscatedSignature( @@ -373,30 +373,30 @@ public class ClanSettings { garbageValue = "1813028559" ) void method2853(long var1, String var3) { - if (var3 != null && var3.length() == 0) { // L: 184 + if (var3 != null && var3.length() == 0) { var3 = null; } - if (var1 > 0L != this.useHashes) { // L: 185 + if (var1 > 0L != this.useHashes) { throw new RuntimeException(""); - } else if (var3 != null != this.useNames) { // L: 186 + } else if (var3 != null != this.useNames) { 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 + if (var1 > 0L && (this.bannedMemberHashes == null || this.bannedMemberCount >= this.bannedMemberHashes.length) || var3 != null && (this.bannedMemberNames == null || this.bannedMemberCount >= this.bannedMemberNames.length)) { this.method2845(this.bannedMemberCount + 5); } - if (this.bannedMemberHashes != null) { // L: 188 + if (this.bannedMemberHashes != null) { this.bannedMemberHashes[this.bannedMemberCount] = var1; } - if (this.bannedMemberNames != null) { // L: 189 + if (this.bannedMemberNames != null) { this.bannedMemberNames[this.bannedMemberCount] = var3; } - ++this.bannedMemberCount; // L: 190 + ++this.bannedMemberCount; } - } // L: 191 + } @ObfuscatedName("o") @ObfuscatedSignature( @@ -404,21 +404,21 @@ public class ClanSettings { garbageValue = "579963053" ) void method2854(int var1) { - --this.bannedMemberCount; // L: 194 - if (this.bannedMemberCount == 0) { // L: 195 - this.bannedMemberHashes = null; // L: 196 - this.bannedMemberNames = null; // L: 197 + --this.bannedMemberCount; + if (this.bannedMemberCount == 0) { + this.bannedMemberHashes = null; + this.bannedMemberNames = null; } else { - if (this.bannedMemberHashes != null) { // L: 200 + if (this.bannedMemberHashes != null) { 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: 203 + } @ObfuscatedName("v") @ObfuscatedSignature( @@ -426,15 +426,15 @@ public class ClanSettings { garbageValue = "5" ) int method2887(int var1, byte var2) { - if (var2 != 126 && var2 != 127) { // L: 206 - if (this.currentOwner == var1 && (this.field1579 == -1 || this.memberRanks[this.field1579] < 125)) { // L: 207 + if (var2 != 126 && var2 != 127) { + if (this.currentOwner == var1 && (this.field1579 == -1 || this.memberRanks[this.field1579] < 125)) { return -1; } else if (this.memberRanks[var1] == var2) { - return -1; // L: 208 + return -1; } else { - this.memberRanks[var1] = var2; // L: 209 - this.updateOwner(); // L: 210 - return var1; // L: 211 + this.memberRanks[var1] = var2; + this.updateOwner(); + return var1; } } else { return -1; @@ -447,12 +447,12 @@ public class ClanSettings { garbageValue = "-1" ) boolean method2863(int var1) { - if (this.currentOwner != var1 && this.memberRanks[var1] != 126) { // L: 215 - this.memberRanks[this.currentOwner] = 125; // L: 216 - this.field1579 = this.currentOwner; // L: 217 - this.memberRanks[var1] = 126; // L: 218 - this.currentOwner = var1; // L: 219 - return true; // L: 220 + if (this.currentOwner != var1 && this.memberRanks[var1] != 126) { + this.memberRanks[this.currentOwner] = 125; + this.field1579 = this.currentOwner; + this.memberRanks[var1] = 126; + this.currentOwner = var1; + return true; } else { return false; } @@ -464,11 +464,11 @@ public class ClanSettings { garbageValue = "412346820" ) int method2857(int var1, boolean var2) { - if (this.field1577[var1] == var2) { // L: 224 + if (this.field1577[var1] == var2) { return -1; } else { - this.field1577[var1] = var2; // L: 225 - return var1; // L: 226 + this.field1577[var1] = var2; + return var1; } } @@ -478,18 +478,18 @@ public class ClanSettings { garbageValue = "1783713997" ) int method2858(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.field1575[var1]; // L: 235 + int var5 = (1 << var3) - 1; + int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; + int var7 = var6 ^ var5; + var2 <<= var3; + var2 &= var7; + int var8 = this.field1575[var1]; if ((var8 & var7) == var2) { - return -1; // L: 236 + return -1; } else { - var8 &= ~var7; // L: 237 - this.field1575[var1] = var8 | var2; // L: 238 - return var1; // L: 239 + var8 &= ~var7; + this.field1575[var1] = var8 | var2; + return var1; } } @@ -499,27 +499,27 @@ public class ClanSettings { garbageValue = "0" ) boolean method2859(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 + if (this.parameters != null) { + Node var3 = this.parameters.get((long)var1); + if (var3 != null) { + if (var3 instanceof IntegerNode) { + IntegerNode var4 = (IntegerNode)var3; + if (var2 == var4.integer) { return false; } - var4.integer = var2; // L: 249 - return true; // L: 250 + var4.integer = var2; + return true; } - var3.remove(); // L: 252 + var3.remove(); } } else { - this.parameters = new IterableNodeHashTable(4); // L: 255 + this.parameters = new IterableNodeHashTable(4); } - this.parameters.put(new IntegerNode(var2), (long)var1); // L: 256 - return true; // L: 257 + this.parameters.put(new IntegerNode(var2), (long)var1); + return true; } @ObfuscatedName("a") @@ -528,58 +528,58 @@ public class ClanSettings { garbageValue = "50" ) boolean method2860(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 + int var5 = (1 << var3) - 1; + int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; + int var7 = var6 ^ var5; + var2 <<= var3; + var2 &= var7; + if (this.parameters != null) { + Node var8 = this.parameters.get((long)var1); + if (var8 != null) { + if (var8 instanceof IntegerNode) { + IntegerNode var9 = (IntegerNode)var8; + if ((var9.integer & var7) == var2) { return false; } - var9.integer &= ~var7; // L: 272 - var9.integer |= var2; // L: 273 - return true; // L: 274 + var9.integer &= ~var7; + var9.integer |= var2; + return true; } - var8.remove(); // L: 276 + var8.remove(); } } else { - this.parameters = new IterableNodeHashTable(4); // L: 279 + this.parameters = new IterableNodeHashTable(4); } - this.parameters.put(new IntegerNode(var2), (long)var1); // L: 280 - return true; // L: 281 + this.parameters.put(new IntegerNode(var2), (long)var1); + return true; } @ObfuscatedName("u") boolean method2856(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 class384) { // L: 288 - class384 var5 = (class384)var4; // L: 289 - if (var5.field4254 == var2) { // L: 290 + if (this.parameters != null) { + Node var4 = this.parameters.get((long)var1); + if (var4 != null) { + if (var4 instanceof class384) { + class384 var5 = (class384)var4; + if (var5.field4254 == var2) { return false; } - var5.field4254 = var2; // L: 291 - return true; // L: 292 + var5.field4254 = var2; + return true; } - var4.remove(); // L: 294 + var4.remove(); } } else { - this.parameters = new IterableNodeHashTable(4); // L: 297 + this.parameters = new IterableNodeHashTable(4); } - this.parameters.put(new class384(var2), (long)var1); // L: 298 - return true; // L: 299 + this.parameters.put(new class384(var2), (long)var1); + return true; } @ObfuscatedName("k") @@ -588,36 +588,36 @@ public class ClanSettings { garbageValue = "1780674005" ) boolean method2873(int var1, String var2) { - if (var2 == null) { // L: 303 + if (var2 == null) { var2 = ""; - } else if (var2.length() > 80) { // L: 304 + } else if (var2.length() > 80) { 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 + if (this.parameters != null) { + Node var3 = this.parameters.get((long)var1); + if (var3 != null) { + if (var3 instanceof ObjectNode) { + ObjectNode var4 = (ObjectNode)var3; + if (var4.obj instanceof String) { + if (var2.equals(var4.obj)) { return false; } - var4.remove(); // L: 312 - this.parameters.put(new ObjectNode(var2), var4.key); // L: 313 - return true; // L: 314 + var4.remove(); + this.parameters.put(new ObjectNode(var2), var4.key); + return true; } } - var3.remove(); // L: 317 + var3.remove(); } } else { - this.parameters = new IterableNodeHashTable(4); // L: 320 + this.parameters = new IterableNodeHashTable(4); } - this.parameters.put(new ObjectNode(var2), (long)var1); // L: 321 - return true; // L: 322 + this.parameters.put(new ObjectNode(var2), (long)var1); + return true; } @ObfuscatedName("f") @@ -626,139 +626,139 @@ public class ClanSettings { garbageValue = "-684455751" ) void method2895(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 + int var2 = var1.readUnsignedByte(); + if (var2 >= 1 && var2 <= 6) { + int var3 = var1.readUnsignedByte(); + if ((var3 & 1) != 0) { this.useHashes = true; } - if ((var3 & 2) != 0) { // L: 330 + if ((var3 & 2) != 0) { this.useNames = true; } - if (!this.useHashes) { // L: 331 - this.memberHashes = null; // L: 332 - this.bannedMemberHashes = null; // L: 333 + if (!this.useHashes) { + this.memberHashes = null; + this.bannedMemberHashes = null; } - if (!this.useNames) { // L: 335 - this.memberNames = null; // L: 336 - this.bannedMemberNames = null; // L: 337 + if (!this.useNames) { + this.memberNames = null; + this.bannedMemberNames = null; } - this.field1563 = var1.readInt(); // L: 339 - this.field1565 = var1.readInt(); // L: 340 - if (var2 <= 3 && this.field1565 != 0) { // L: 341 + this.field1563 = var1.readInt(); + this.field1565 = var1.readInt(); + if (var2 <= 3 && this.field1565 != 0) { this.field1565 += 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(); + this.bannedMemberCount = var1.readUnsignedByte(); + this.name = var1.readStringCp1252NullTerminated(); + if (var2 >= 4) { + var1.readInt(); } - this.allowGuests = var1.readUnsignedByte() == 1; // L: 348 - this.field1567 = var1.readByte(); // L: 349 - this.field1568 = var1.readByte(); // L: 350 - this.field1569 = var1.readByte(); // L: 351 - this.field1570 = var1.readByte(); // L: 352 + this.allowGuests = var1.readUnsignedByte() == 1; + this.field1567 = var1.readByte(); + this.field1568 = var1.readByte(); + this.field1569 = var1.readByte(); + this.field1570 = var1.readByte(); 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) { + if (this.useHashes && (this.memberHashes == null || this.memberHashes.length < this.memberCount)) { 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)) { 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) { this.memberRanks = new byte[this.memberCount]; } - if (this.field1575 == null || this.field1575.length < this.memberCount) { // L: 357 + if (this.field1575 == null || this.field1575.length < this.memberCount) { this.field1575 = new int[this.memberCount]; } - if (this.field1582 == null || this.field1582.length < this.memberCount) { // L: 358 + if (this.field1582 == null || this.field1582.length < this.memberCount) { this.field1582 = new int[this.memberCount]; } - if (this.field1577 == null || this.field1577.length < this.memberCount) { // L: 359 + if (this.field1577 == null || this.field1577.length < this.memberCount) { this.field1577 = 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) { + if (this.useHashes) { this.memberHashes[var4] = var1.readLong(); } - if (this.useNames) { // L: 362 + if (this.useNames) { this.memberNames[var4] = var1.readStringCp1252NullTerminatedOrNull(); } - this.memberRanks[var4] = var1.readByte(); // L: 363 - if (var2 >= 2) { // L: 364 + this.memberRanks[var4] = var1.readByte(); + if (var2 >= 2) { this.field1575[var4] = var1.readInt(); } - if (var2 >= 5) { // L: 365 + if (var2 >= 5) { this.field1582[var4] = var1.readUnsignedShort(); } else { - this.field1582[var4] = 0; // L: 366 + this.field1582[var4] = 0; } - if (var2 >= 6) { // L: 367 + if (var2 >= 6) { this.field1577[var4] = var1.readUnsignedByte() == 1; } else { - this.field1577[var4] = false; // L: 368 + this.field1577[var4] = false; } } - this.updateOwner(); // L: 370 + this.updateOwner(); } - if (this.bannedMemberCount > 0) { // L: 372 + if (this.bannedMemberCount > 0) { if (this.useHashes && (this.bannedMemberHashes == null || this.bannedMemberHashes.length < this.bannedMemberCount)) { - this.bannedMemberHashes = new long[this.bannedMemberCount]; // L: 373 + 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)) { 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) { + if (this.useHashes) { this.bannedMemberHashes[var4] = var1.readLong(); } - if (this.useNames) { // L: 377 + if (this.useNames) { 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 ? SpotAnimationDefinition.method3362(var4) : 16); // L: 383 + if (var2 >= 3) { + var4 = var1.readUnsignedShort(); + if (var4 > 0) { + this.parameters = new IterableNodeHashTable(var4 < 16 ? SpotAnimationDefinition.method3362(var4) : 16); - 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 class384(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) { + int var5 = var1.readInt(); + int var6 = var5 & 1073741823; + int var7 = var5 >>> 30; + if (var7 == 0) { + int var12 = var1.readInt(); + this.parameters.put(new IntegerNode(var12), (long)var6); + } else if (var7 == 1) { + long var10 = var1.readLong(); + this.parameters.put(new class384(var10), (long)var6); + } else if (var7 == 2) { + String var8 = var1.readStringCp1252NullTerminated(); + this.parameters.put(new ObjectNode(var8), (long)var6); } } } @@ -767,7 +767,7 @@ public class ClanSettings { } else { throw new RuntimeException("" + var2); } - } // L: 403 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -776,68 +776,68 @@ public class ClanSettings { ) @Export("isNumber") public static boolean isNumber(CharSequence var0) { - boolean var2 = false; // L: 38 - boolean var3 = false; // L: 39 - int var4 = 0; // L: 40 - int var5 = var0.length(); // L: 41 + boolean var2 = false; + boolean var3 = false; + int var4 = 0; + int var5 = var0.length(); int var6 = 0; boolean var1; while (true) { if (var6 >= var5) { - var1 = var3; // L: 71 + var1 = var3; break; } label85: { - char var7 = var0.charAt(var6); // L: 43 - if (var6 == 0) { // L: 44 - if (var7 == '-') { // L: 45 - var2 = true; // L: 46 + char var7 = var0.charAt(var6); + if (var6 == 0) { + if (var7 == '-') { + var2 = true; break label85; } - if (var7 == '+') { // L: 49 + if (var7 == '+') { break label85; } } int var9; - if (var7 >= '0' && var7 <= '9') { // L: 51 + if (var7 >= '0' && var7 <= '9') { var9 = var7 - '0'; - } else if (var7 >= 'A' && var7 <= 'Z') { // L: 52 + } else if (var7 >= 'A' && var7 <= 'Z') { var9 = var7 - '7'; } else { - if (var7 < 'a' || var7 > 'z') { // L: 53 - var1 = false; // L: 55 + if (var7 < 'a' || var7 > 'z') { + var1 = false; break; } var9 = var7 - 'W'; } - if (var9 >= 10) { // L: 58 - var1 = false; // L: 59 - break; // L: 60 + if (var9 >= 10) { + var1 = false; + break; } - if (var2) { // L: 62 + if (var2) { var9 = -var9; } - int var8 = var9 + var4 * 10; // L: 63 - if (var4 != var8 / 10) { // L: 64 - var1 = false; // L: 65 - break; // L: 66 + int var8 = var9 + var4 * 10; + if (var4 != var8 / 10) { + var1 = false; + break; } - var4 = var8; // L: 68 - var3 = true; // L: 69 + var4 = var8; + var3 = true; } - ++var6; // L: 42 + ++var6; } - return var1; // L: 73 + return var1; } } diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index c03ae171ea..ff6c3d7e85 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -1345,287 +1345,287 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { static { field713 = true; - worldId = 1; // L: 135 - worldProperties = 0; // L: 136 + worldId = 1; + worldProperties = 0; gameBuild = 0; isMembersWorld = false; isLowDetail = false; field473 = -1; - clientType = -1; // L: 148 - field499 = -1; // L: 149 + clientType = -1; + field499 = -1; onMobile = false; gameState = 0; - isLoading = true; // L: 183 + isLoading = true; cycle = 0; - mouseLastLastPressedTimeMillis = -1L; // L: 185 - field483 = -1; // L: 187 - field746 = -1; // L: 188 - field485 = -1L; // L: 189 - hadFocus = true; // L: 190 - displayFps = false; // L: 191 - rebootTimer = 0; // L: 192 - hintArrowType = 0; // L: 193 - hintArrowNpcIndex = 0; // L: 194 - hintArrowPlayerIndex = 0; // L: 195 - hintArrowX = 0; // L: 196 - hintArrowY = 0; // L: 197 - hintArrowHeight = 0; // L: 198 - hintArrowSubX = 0; // L: 199 - hintArrowSubY = 0; // L: 200 - playerAttackOption = AttackOption.AttackOption_hidden; // L: 202 - npcAttackOption = AttackOption.AttackOption_hidden; // L: 203 - titleLoadingStage = 0; // L: 206 - js5ConnectState = 0; // L: 209 - field517 = 0; // L: 210 - js5Errors = 0; // L: 232 - loginState = 0; // L: 234 - field545 = 0; // L: 235 - field541 = 0; // L: 236 - field506 = 0; // L: 237 - field507 = class122.field1473; // L: 238 - field508 = class422.field4523; // L: 239 - Login_isUsernameRemembered = false; // L: 256 - secureRandomFuture = new SecureRandomFuture(); // L: 257 - randomDatData = null; // L: 262 - npcs = new NPC[32768]; // L: 266 - npcCount = 0; // L: 267 - npcIndices = new int[32768]; // L: 268 - field520 = 0; // L: 269 - field605 = new int[250]; // L: 270 - packetWriter = new PacketWriter(); // L: 273 - logoutTimer = 0; // L: 275 - hadNetworkError = false; // L: 276 - useBufferedSocket = true; // L: 277 - field526 = false; // L: 278 - timer = new Timer(); // L: 279 - fontsMap = new HashMap(); // L: 285 - field529 = 0; // L: 292 - field530 = 1; // L: 293 - field617 = 0; // L: 294 - field532 = 1; // L: 295 - field602 = 0; // L: 296 - collisionMaps = new CollisionMap[4]; // L: 304 - isInInstance = false; // L: 305 - instanceChunkTemplates = new int[4][13][13]; // L: 306 - field537 = 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: 307 - field538 = 0; // L: 310 - field693 = 2301979; // L: 322 - field716 = 5063219; // L: 323 - field509 = 3353893; // L: 324 - field544 = 7759444; // L: 325 - field543 = false; // L: 326 - alternativeScrollbarWidth = 0; // L: 327 - camAngleX = 128; // L: 335 - camAngleY = 0; // L: 336 - camAngleDY = 0; // L: 337 - camAngleDX = 0; // L: 338 - mouseCamClickedX = 0; // L: 339 - mouseCamClickedY = 0; // L: 340 - oculusOrbState = 0; // L: 341 - camFollowHeight = 50; // L: 342 - field542 = 0; // L: 346 - field584 = 0; // L: 347 - field555 = 0; // L: 348 - oculusOrbNormalSpeed = 12; // L: 350 - oculusOrbSlowedSpeed = 6; // L: 351 - field607 = 0; // L: 352 - field612 = false; // L: 353 - field560 = 0; // L: 354 - field561 = false; // L: 355 - field562 = 0; // L: 356 - overheadTextCount = 0; // L: 357 - overheadTextLimit = 50; // L: 358 - overheadTextXs = new int[overheadTextLimit]; // L: 359 - overheadTextYs = new int[overheadTextLimit]; // L: 360 - overheadTextAscents = new int[overheadTextLimit]; // L: 361 - overheadTextXOffsets = new int[overheadTextLimit]; // L: 362 - overheadTextColors = new int[overheadTextLimit]; // L: 363 - overheadTextEffects = new int[overheadTextLimit]; // L: 364 - overheadTextCyclesRemaining = new int[overheadTextLimit]; // L: 365 - overheadText = new String[overheadTextLimit]; // L: 366 - tileLastDrawnActor = new int[104][104]; // L: 367 - viewportDrawCount = 0; // L: 368 - viewportTempX = -1; // L: 369 - viewportTempY = -1; // L: 370 - mouseCrossX = 0; // L: 371 - mouseCrossY = 0; // L: 372 - mouseCrossState = 0; // L: 373 - mouseCrossColor = 0; // L: 374 - showMouseCross = true; // L: 375 - field582 = 0; // L: 377 - field599 = 0; // L: 378 - dragItemSlotSource = 0; // L: 381 - draggedWidgetX = 0; // L: 382 - draggedWidgetY = 0; // L: 383 - dragItemSlotDestination = 0; // L: 384 - field572 = false; // L: 385 - itemDragDuration = 0; // L: 386 - field590 = 0; // L: 387 - showLoadingMessages = true; // L: 389 - players = new Player[2048]; // L: 391 - localPlayerIndex = -1; // L: 393 - field594 = 0; // L: 394 - renderSelf = true; // L: 396 - drawPlayerNames = 0; // L: 401 - field597 = 0; // L: 402 - field598 = new int[1000]; // L: 403 - playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; // L: 405 - playerMenuActions = new String[8]; // L: 406 - playerOptionsPriorities = new boolean[8]; // L: 407 - defaultRotations = new int[]{768, 1024, 1280, 512, 1536, 256, 0, 1792}; // L: 408 - combatTargetPlayerIndex = -1; // L: 409 - groundItems = new NodeDeque[4][104][104]; // L: 410 - pendingSpawns = new NodeDeque(); // L: 411 - projectiles = new NodeDeque(); // L: 412 - graphicsObjects = new NodeDeque(); // L: 413 - currentLevels = new int[25]; // L: 414 - levels = new int[25]; // L: 415 - experience = new int[25]; // L: 416 - leftClickOpensMenu = 0; // L: 417 - isMenuOpen = false; // L: 418 - menuOptionsCount = 0; // L: 424 - menuArguments1 = new int[500]; // L: 425 - menuArguments2 = new int[500]; // L: 426 - menuOpcodes = new int[500]; // L: 427 - menuIdentifiers = new int[500]; // L: 428 - menuActions = new String[500]; // L: 429 - menuTargets = new String[500]; // L: 430 - menuShiftClick = new boolean[500]; // L: 431 - followerOpsLowPriority = false; // L: 432 - shiftClickDrop = false; // L: 434 - tapToDrop = false; // L: 435 - showMouseOverText = true; // L: 436 - viewportX = -1; // L: 437 - viewportY = -1; // L: 438 - field714 = 0; // L: 442 - field628 = 50; // L: 443 - isItemSelected = 0; // L: 444 - selectedItemName = null; // L: 448 - isSpellSelected = false; // L: 449 - selectedSpellChildIndex = -1; // L: 451 - field633 = -1; // L: 452 - selectedSpellActionName = null; // L: 454 - selectedSpellName = null; // L: 455 - rootInterface = -1; // L: 456 - interfaceParents = new NodeHashTable(8); // L: 457 - field638 = 0; // L: 462 - field639 = -1; // L: 463 - chatEffects = 0; // L: 464 - field641 = 0; // L: 465 - meslayerContinueWidget = null; // L: 466 - runEnergy = 0; // L: 467 - weight = 0; // L: 468 - staffModLevel = 0; // L: 469 - followerIndex = -1; // L: 470 - playerMod = false; // L: 471 - viewportWidget = null; // L: 472 - clickedWidget = null; // L: 473 - clickedWidgetParent = null; // L: 474 - widgetClickX = 0; // L: 475 - widgetClickY = 0; // L: 476 - draggedOnWidget = null; // L: 477 - field531 = false; // L: 478 - field681 = -1; // L: 479 - field659 = -1; // L: 480 - field657 = false; // L: 481 - field658 = -1; // L: 482 - field660 = -1; // L: 483 - isDraggingWidget = false; // L: 484 - cycleCntr = 1; // L: 489 - changedVarps = new int[32]; // L: 492 - changedVarpCount = 0; // L: 493 - changedItemContainers = new int[32]; // L: 494 - field665 = 0; // L: 495 - changedSkills = new int[32]; // L: 496 - changedSkillsCount = 0; // L: 497 - field695 = new int[32]; // L: 498 - field734 = 0; // L: 499 - chatCycle = 0; // L: 500 - field671 = 0; // L: 501 - field672 = 0; // L: 502 - field673 = 0; // L: 503 - field583 = 0; // L: 504 - field675 = 0; // L: 505 - field669 = 0; // L: 506 - field471 = 0; // L: 507 - mouseWheelRotation = 0; // L: 513 - scriptEvents = new NodeDeque(); // L: 514 - field680 = new NodeDeque(); // L: 515 - field579 = new NodeDeque(); // L: 516 - widgetFlags = new NodeHashTable(512); // L: 517 - rootWidgetCount = 0; // L: 519 - field684 = -2; // L: 520 - field504 = new boolean[100]; // L: 521 - field686 = new boolean[100]; // L: 522 - field687 = new boolean[100]; // L: 523 - rootWidgetXs = new int[100]; // L: 524 - rootWidgetYs = new int[100]; // L: 525 - rootWidgetWidths = new int[100]; // L: 526 - rootWidgetHeights = new int[100]; // L: 527 - gameDrawingMode = 0; // L: 528 - field514 = 0L; // L: 529 - isResizable = true; // L: 530 - field749 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; // L: 537 - publicChatMode = 0; // L: 538 - tradeChatMode = 0; // L: 540 - field645 = ""; // L: 541 - crossWorldMessageIds = new long[100]; // L: 543 - crossWorldMessageIdsIndex = 0; // L: 544 - field701 = 0; // L: 546 - field758 = new int[128]; // L: 547 - field522 = new int[128]; // L: 548 - field676 = -1L; // L: 549 - currentClanSettings = new ClanSettings[2]; // L: 553 - currentClanChannels = new ClanChannel[2]; // L: 555 - field570 = -1; // L: 557 - mapIconCount = 0; // L: 558 - mapIconXs = new int[1000]; // L: 559 - mapIconYs = new int[1000]; // L: 560 - mapIcons = new SpritePixels[1000]; // L: 561 - destinationX = 0; // L: 562 - destinationY = 0; // L: 563 - minimapState = 0; // L: 570 - currentTrackGroupId = -1; // L: 571 - field743 = false; // L: 572 - soundEffectCount = 0; // L: 578 - soundEffectIds = new int[50]; // L: 579 - queuedSoundEffectLoops = new int[50]; // L: 580 - queuedSoundEffectDelays = new int[50]; // L: 581 - soundLocations = new int[50]; // L: 582 - soundEffects = new SoundEffect[50]; // L: 583 - isCameraLocked = false; // L: 585 - field724 = false; // L: 596 - field725 = new boolean[5]; // L: 604 - field726 = new int[5]; // L: 605 - field679 = new int[5]; // L: 606 - field618 = new int[5]; // L: 607 - field729 = new int[5]; // L: 608 - field690 = 256; // L: 609 - field707 = 205; // L: 610 - zoomHeight = 256; // L: 611 - zoomWidth = 320; // L: 612 - field619 = 1; // L: 613 - field735 = 32767; // L: 614 - field736 = 1; // L: 615 - field737 = 32767; // L: 616 - viewportOffsetX = 0; // L: 617 - viewportOffsetY = 0; // L: 618 - viewportWidth = 0; // L: 619 - viewportHeight = 0; // L: 620 - viewportZoom = 0; // L: 621 - playerAppearance = new PlayerComposition(); // L: 623 - field744 = -1; // L: 624 - field571 = -1; // L: 625 - platformInfoProvider = new DesktopPlatformInfoProvider(); // L: 627 - grandExchangeOffers = new GrandExchangeOffer[8]; // L: 629 - GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); // L: 632 - field559 = -1; // L: 639 - archiveLoaders = new ArrayList(10); // L: 640 - archiveLoadersDone = 0; // L: 641 - field753 = 0; // L: 642 - field754 = new ApproximateRouteStrategy(); // L: 651 - field755 = new int[50]; // L: 652 - field756 = new int[50]; // L: 653 + mouseLastLastPressedTimeMillis = -1L; + field483 = -1; + field746 = -1; + field485 = -1L; + hadFocus = true; + displayFps = false; + rebootTimer = 0; + hintArrowType = 0; + hintArrowNpcIndex = 0; + hintArrowPlayerIndex = 0; + hintArrowX = 0; + hintArrowY = 0; + hintArrowHeight = 0; + hintArrowSubX = 0; + hintArrowSubY = 0; + playerAttackOption = AttackOption.AttackOption_hidden; + npcAttackOption = AttackOption.AttackOption_hidden; + titleLoadingStage = 0; + js5ConnectState = 0; + field517 = 0; + js5Errors = 0; + loginState = 0; + field545 = 0; + field541 = 0; + field506 = 0; + field507 = class122.field1473; + field508 = class422.field4523; + Login_isUsernameRemembered = false; + secureRandomFuture = new SecureRandomFuture(); + randomDatData = null; + npcs = new NPC[32768]; + npcCount = 0; + npcIndices = new int[32768]; + field520 = 0; + field605 = new int[250]; + packetWriter = new PacketWriter(); + logoutTimer = 0; + hadNetworkError = false; + useBufferedSocket = true; + field526 = false; + timer = new Timer(); + fontsMap = new HashMap(); + field529 = 0; + field530 = 1; + field617 = 0; + field532 = 1; + field602 = 0; + collisionMaps = new CollisionMap[4]; + isInInstance = false; + instanceChunkTemplates = new int[4][13][13]; + field537 = 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}; + field538 = 0; + field693 = 2301979; + field716 = 5063219; + field509 = 3353893; + field544 = 7759444; + field543 = false; + alternativeScrollbarWidth = 0; + camAngleX = 128; + camAngleY = 0; + camAngleDY = 0; + camAngleDX = 0; + mouseCamClickedX = 0; + mouseCamClickedY = 0; + oculusOrbState = 0; + camFollowHeight = 50; + field542 = 0; + field584 = 0; + field555 = 0; + oculusOrbNormalSpeed = 12; + oculusOrbSlowedSpeed = 6; + field607 = 0; + field612 = false; + field560 = 0; + field561 = false; + field562 = 0; + overheadTextCount = 0; + overheadTextLimit = 50; + overheadTextXs = new int[overheadTextLimit]; + overheadTextYs = new int[overheadTextLimit]; + overheadTextAscents = new int[overheadTextLimit]; + overheadTextXOffsets = new int[overheadTextLimit]; + overheadTextColors = new int[overheadTextLimit]; + overheadTextEffects = new int[overheadTextLimit]; + overheadTextCyclesRemaining = new int[overheadTextLimit]; + overheadText = new String[overheadTextLimit]; + tileLastDrawnActor = new int[104][104]; + viewportDrawCount = 0; + viewportTempX = -1; + viewportTempY = -1; + mouseCrossX = 0; + mouseCrossY = 0; + mouseCrossState = 0; + mouseCrossColor = 0; + showMouseCross = true; + field582 = 0; + field599 = 0; + dragItemSlotSource = 0; + draggedWidgetX = 0; + draggedWidgetY = 0; + dragItemSlotDestination = 0; + field572 = false; + itemDragDuration = 0; + field590 = 0; + showLoadingMessages = true; + players = new Player[2048]; + localPlayerIndex = -1; + field594 = 0; + renderSelf = true; + drawPlayerNames = 0; + field597 = 0; + field598 = new int[1000]; + playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; + playerMenuActions = new String[8]; + playerOptionsPriorities = new boolean[8]; + defaultRotations = new int[]{768, 1024, 1280, 512, 1536, 256, 0, 1792}; + combatTargetPlayerIndex = -1; + groundItems = new NodeDeque[4][104][104]; + pendingSpawns = new NodeDeque(); + projectiles = new NodeDeque(); + graphicsObjects = new NodeDeque(); + currentLevels = new int[25]; + levels = new int[25]; + experience = new int[25]; + leftClickOpensMenu = 0; + isMenuOpen = false; + menuOptionsCount = 0; + menuArguments1 = new int[500]; + menuArguments2 = new int[500]; + menuOpcodes = new int[500]; + menuIdentifiers = new int[500]; + menuActions = new String[500]; + menuTargets = new String[500]; + menuShiftClick = new boolean[500]; + followerOpsLowPriority = false; + shiftClickDrop = false; + tapToDrop = false; + showMouseOverText = true; + viewportX = -1; + viewportY = -1; + field714 = 0; + field628 = 50; + isItemSelected = 0; + selectedItemName = null; + isSpellSelected = false; + selectedSpellChildIndex = -1; + field633 = -1; + selectedSpellActionName = null; + selectedSpellName = null; + rootInterface = -1; + interfaceParents = new NodeHashTable(8); + field638 = 0; + field639 = -1; + chatEffects = 0; + field641 = 0; + meslayerContinueWidget = null; + runEnergy = 0; + weight = 0; + staffModLevel = 0; + followerIndex = -1; + playerMod = false; + viewportWidget = null; + clickedWidget = null; + clickedWidgetParent = null; + widgetClickX = 0; + widgetClickY = 0; + draggedOnWidget = null; + field531 = false; + field681 = -1; + field659 = -1; + field657 = false; + field658 = -1; + field660 = -1; + isDraggingWidget = false; + cycleCntr = 1; + changedVarps = new int[32]; + changedVarpCount = 0; + changedItemContainers = new int[32]; + field665 = 0; + changedSkills = new int[32]; + changedSkillsCount = 0; + field695 = new int[32]; + field734 = 0; + chatCycle = 0; + field671 = 0; + field672 = 0; + field673 = 0; + field583 = 0; + field675 = 0; + field669 = 0; + field471 = 0; + mouseWheelRotation = 0; + scriptEvents = new NodeDeque(); + field680 = new NodeDeque(); + field579 = new NodeDeque(); + widgetFlags = new NodeHashTable(512); + rootWidgetCount = 0; + field684 = -2; + field504 = new boolean[100]; + field686 = new boolean[100]; + field687 = new boolean[100]; + rootWidgetXs = new int[100]; + rootWidgetYs = new int[100]; + rootWidgetWidths = new int[100]; + rootWidgetHeights = new int[100]; + gameDrawingMode = 0; + field514 = 0L; + isResizable = true; + field749 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; + publicChatMode = 0; + tradeChatMode = 0; + field645 = ""; + crossWorldMessageIds = new long[100]; + crossWorldMessageIdsIndex = 0; + field701 = 0; + field758 = new int[128]; + field522 = new int[128]; + field676 = -1L; + currentClanSettings = new ClanSettings[2]; + currentClanChannels = new ClanChannel[2]; + field570 = -1; + mapIconCount = 0; + mapIconXs = new int[1000]; + mapIconYs = new int[1000]; + mapIcons = new SpritePixels[1000]; + destinationX = 0; + destinationY = 0; + minimapState = 0; + currentTrackGroupId = -1; + field743 = false; + soundEffectCount = 0; + soundEffectIds = new int[50]; + queuedSoundEffectLoops = new int[50]; + queuedSoundEffectDelays = new int[50]; + soundLocations = new int[50]; + soundEffects = new SoundEffect[50]; + isCameraLocked = false; + field724 = false; + field725 = new boolean[5]; + field726 = new int[5]; + field679 = new int[5]; + field618 = new int[5]; + field729 = new int[5]; + field690 = 256; + field707 = 205; + zoomHeight = 256; + zoomWidth = 320; + field619 = 1; + field735 = 32767; + field736 = 1; + field737 = 32767; + viewportOffsetX = 0; + viewportOffsetY = 0; + viewportWidth = 0; + viewportHeight = 0; + viewportZoom = 0; + playerAppearance = new PlayerComposition(); + field744 = -1; + field571 = -1; + platformInfoProvider = new DesktopPlatformInfoProvider(); + grandExchangeOffers = new GrandExchangeOffer[8]; + GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); + field559 = -1; + archiveLoaders = new ArrayList(10); + archiveLoadersDone = 0; + field753 = 0; + field754 = new ApproximateRouteStrategy(); + field755 = new int[50]; + field756 = new int[50]; } @ObfuscatedName("v") @@ -1635,13 +1635,13 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { ) @Export("resizeGame") protected final void resizeGame() { - field514 = Ignored.method6459() + 500L; // L: 4994 - this.resizeJS(); // L: 4995 - if (rootInterface != -1) { // L: 4996 + field514 = Ignored.method6459() + 500L; + this.resizeJS(); + if (rootInterface != -1) { this.resizeRoot(true); } - } // L: 4997 + } @ObfuscatedName("z") @ObfuscatedSignature( @@ -1650,84 +1650,84 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { ) @Export("setUp") protected final void setUp() { - int[] var1 = new int[]{20, 260, 10000}; // L: 986 - int[] var2 = new int[]{1000, 100, 500}; // L: 987 - if (var1 != null && var2 != null) { // L: 989 - SoundCache.ByteArrayPool_alternativeSizes = var1; // L: 1002 - ApproximateRouteStrategy.ByteArrayPool_altSizeArrayCounts = new int[var1.length]; // L: 1003 - World.ByteArrayPool_arrays = new byte[var1.length][][]; // L: 1004 + int[] var1 = new int[]{20, 260, 10000}; + int[] var2 = new int[]{1000, 100, 500}; + if (var1 != null && var2 != null) { + SoundCache.ByteArrayPool_alternativeSizes = var1; + ApproximateRouteStrategy.ByteArrayPool_altSizeArrayCounts = new int[var1.length]; + World.ByteArrayPool_arrays = new byte[var1.length][][]; - for (int var3 = 0; var3 < SoundCache.ByteArrayPool_alternativeSizes.length; ++var3) { // L: 1005 - World.ByteArrayPool_arrays[var3] = new byte[var2[var3]][]; // L: 1006 - ByteArrayPool.field4035.add(var1[var3]); // L: 1007 + for (int var3 = 0; var3 < SoundCache.ByteArrayPool_alternativeSizes.length; ++var3) { + World.ByteArrayPool_arrays[var3] = new byte[var2[var3]][]; + ByteArrayPool.field4035.add(var1[var3]); } - Collections.sort(ByteArrayPool.field4035); // L: 1009 + Collections.sort(ByteArrayPool.field4035); } else { - SoundCache.ByteArrayPool_alternativeSizes = null; // L: 990 - ApproximateRouteStrategy.ByteArrayPool_altSizeArrayCounts = null; // L: 991 - World.ByteArrayPool_arrays = null; // L: 992 - ByteArrayPool.field4035.clear(); // L: 994 - ByteArrayPool.field4035.add(100); // L: 995 - ByteArrayPool.field4035.add(5000); // L: 996 - ByteArrayPool.field4035.add(10000); // L: 997 - ByteArrayPool.field4035.add(30000); // L: 998 + SoundCache.ByteArrayPool_alternativeSizes = null; + ApproximateRouteStrategy.ByteArrayPool_altSizeArrayCounts = null; + World.ByteArrayPool_arrays = null; + ByteArrayPool.field4035.clear(); + ByteArrayPool.field4035.add(100); + ByteArrayPool.field4035.add(5000); + ByteArrayPool.field4035.add(10000); + ByteArrayPool.field4035.add(30000); } - GameObject.worldPort = gameBuild == 0 ? 43594 : worldId + 40000; // L: 1011 - class133.js5Port = gameBuild == 0 ? 443 : worldId + 50000; // L: 1012 - class129.currentPort = GameObject.worldPort; // L: 1013 - PlayerComposition.field3197 = class279.field3209; // L: 1014 - class114.field1382 = class279.field3208; // L: 1015 - class132.field1540 = class279.field3211; // L: 1016 - PlayerComposition.field3203 = class279.field3210; // L: 1017 - WorldMapData_1.urlRequester = new UrlRequester(); // L: 1018 - this.setUpKeyboard(); // L: 1019 - this.method472(); // L: 1020 - WorldMapDecorationType.mouseWheel = this.mouseWheel(); // L: 1021 - ParamComposition.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); // L: 1022 - AccessFile var4 = null; // L: 1025 - ClientPreferences var5 = new ClientPreferences(); // L: 1026 + GameObject.worldPort = gameBuild == 0 ? 43594 : worldId + 40000; + class133.js5Port = gameBuild == 0 ? 443 : worldId + 50000; + class129.currentPort = GameObject.worldPort; + PlayerComposition.field3197 = class279.field3209; + class114.field1382 = class279.field3208; + class132.field1540 = class279.field3211; + PlayerComposition.field3203 = class279.field3210; + WorldMapData_1.urlRequester = new UrlRequester(); + this.setUpKeyboard(); + this.method472(); + WorldMapDecorationType.mouseWheel = this.mouseWheel(); + ParamComposition.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); + AccessFile var4 = null; + ClientPreferences var5 = new ClientPreferences(); try { - var4 = class231.getPreferencesFile("", class338.field4054.name, false); // L: 1028 - byte[] var6 = new byte[(int)var4.length()]; // L: 1029 + var4 = class231.getPreferencesFile("", class338.field4054.name, false); + byte[] var6 = new byte[(int)var4.length()]; int var8; - for (int var7 = 0; var7 < var6.length; var7 += var8) { // L: 1030 1031 1034 - var8 = var4.read(var6, var7, var6.length - var7); // L: 1032 - if (var8 == -1) { // L: 1033 + for (int var7 = 0; var7 < var6.length; var7 += var8) { + var8 = var4.read(var6, var7, var6.length - var7); + if (var8 == -1) { throw new IOException(); } } - var5 = new ClientPreferences(new Buffer(var6)); // L: 1036 - } catch (Exception var11) { // L: 1038 + var5 = new ClientPreferences(new Buffer(var6)); + } catch (Exception var11) { } try { - if (var4 != null) { // L: 1040 + if (var4 != null) { var4.close(); } - } catch (Exception var10) { // L: 1042 + } catch (Exception var10) { } - SecureRandomFuture.clientPreferences = var5; // L: 1045 - this.setUpClipboard(); // L: 1046 - String var12 = GrandExchangeOfferAgeComparator.field3882; // L: 1048 - class29.field172 = this; // L: 1050 - if (var12 != null) { // L: 1051 + SecureRandomFuture.clientPreferences = var5; + this.setUpClipboard(); + String var12 = GrandExchangeOfferAgeComparator.field3882; + class29.field172 = this; + if (var12 != null) { class29.field177 = var12; } - if (gameBuild != 0) { // L: 1053 + if (gameBuild != 0) { displayFps = true; } - Occluder.setWindowedMode(SecureRandomFuture.clientPreferences.windowMode); // L: 1054 - GameEngine.friendSystem = new FriendSystem(class194.loginType); // L: 1055 - this.field510 = new class14("tokenRequest", 1, 1); // L: 1056 - } // L: 1057 + Occluder.setWindowedMode(SecureRandomFuture.clientPreferences.windowMode); + GameEngine.friendSystem = new FriendSystem(class194.loginType); + this.field510 = new class14("tokenRequest", 1, 1); + } @ObfuscatedName("i") @ObfuscatedSignature( @@ -1736,115 +1736,115 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { ) @Export("doCycle") protected final void doCycle() { - ++cycle; // L: 1061 - this.doCycleJs5(); // L: 1062 + ++cycle; + this.doCycleJs5(); while (true) { ArchiveDiskAction var1; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 1066 - var1 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); // L: 1067 - } // L: 1068 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + var1 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); + } - if (var1 == null) { // L: 1069 - class91.method2336(); // L: 1073 - class148.playPcmPlayers(); // L: 1074 + if (var1 == null) { + class91.method2336(); + class148.playPcmPlayers(); int var45; - synchronized(KeyHandler.KeyHandler_instance) { // L: 1076 - ++KeyHandler.KeyHandler_idleCycles; // L: 1077 - KeyHandler.field143 = KeyHandler.field145; // L: 1078 - KeyHandler.field140 = 0; // L: 1079 - KeyHandler.field142 = 0; // L: 1080 - Arrays.fill(KeyHandler.field132, false); // L: 1081 - Arrays.fill(KeyHandler.field130, false); // L: 1082 - if (KeyHandler.field120 < 0) { // L: 1083 - Arrays.fill(KeyHandler.KeyHandler_pressedKeys, false); // L: 1084 - KeyHandler.field120 = KeyHandler.field135; // L: 1085 + synchronized(KeyHandler.KeyHandler_instance) { + ++KeyHandler.KeyHandler_idleCycles; + KeyHandler.field143 = KeyHandler.field145; + KeyHandler.field140 = 0; + KeyHandler.field142 = 0; + Arrays.fill(KeyHandler.field132, false); + Arrays.fill(KeyHandler.field130, false); + if (KeyHandler.field120 < 0) { + Arrays.fill(KeyHandler.KeyHandler_pressedKeys, false); + KeyHandler.field120 = KeyHandler.field135; } else { - while (KeyHandler.field120 != KeyHandler.field135) { // L: 1088 - var45 = KeyHandler.field134[KeyHandler.field135]; // L: 1089 - KeyHandler.field135 = KeyHandler.field135 + 1 & 127; // L: 1090 - if (var45 < 0) { // L: 1091 - var45 = ~var45; // L: 1092 - if (KeyHandler.KeyHandler_pressedKeys[var45]) { // L: 1093 - KeyHandler.KeyHandler_pressedKeys[var45] = false; // L: 1094 - KeyHandler.field130[var45] = true; // L: 1095 - KeyHandler.field141[KeyHandler.field142] = var45; // L: 1096 - ++KeyHandler.field142; // L: 1097 + while (KeyHandler.field120 != KeyHandler.field135) { + var45 = KeyHandler.field134[KeyHandler.field135]; + KeyHandler.field135 = KeyHandler.field135 + 1 & 127; + if (var45 < 0) { + var45 = ~var45; + if (KeyHandler.KeyHandler_pressedKeys[var45]) { + KeyHandler.KeyHandler_pressedKeys[var45] = false; + KeyHandler.field130[var45] = true; + KeyHandler.field141[KeyHandler.field142] = var45; + ++KeyHandler.field142; } } else { - if (!KeyHandler.KeyHandler_pressedKeys[var45] && KeyHandler.field140 < KeyHandler.field139.length - 1) { // L: 1101 - KeyHandler.field132[var45] = true; // L: 1102 - KeyHandler.field139[++KeyHandler.field140 - 1] = var45; // L: 1103 + if (!KeyHandler.KeyHandler_pressedKeys[var45] && KeyHandler.field140 < KeyHandler.field139.length - 1) { + KeyHandler.field132[var45] = true; + KeyHandler.field139[++KeyHandler.field140 - 1] = var45; } - KeyHandler.KeyHandler_pressedKeys[var45] = true; // L: 1105 + KeyHandler.KeyHandler_pressedKeys[var45] = true; } } } - if (KeyHandler.field140 > 0) { // L: 1109 + if (KeyHandler.field140 > 0) { KeyHandler.KeyHandler_idleCycles = 0; } - KeyHandler.field145 = KeyHandler.field144; // L: 1110 + KeyHandler.field145 = KeyHandler.field144; } - MenuAction.method1961(); // L: 1113 + MenuAction.method1961(); int var46; - if (WorldMapDecorationType.mouseWheel != null) { // L: 1114 - var46 = WorldMapDecorationType.mouseWheel.useRotation(); // L: 1115 - mouseWheelRotation = var46; // L: 1116 + if (WorldMapDecorationType.mouseWheel != null) { + var46 = WorldMapDecorationType.mouseWheel.useRotation(); + mouseWheelRotation = var46; } - if (gameState == 0) { // L: 1118 - UserComparator10.load(); // L: 1119 - class17.method292(); // L: 1120 - } else if (gameState == 5) { // L: 1122 - Skeleton.method3947(this, class114.fontPlain12); // L: 1123 - UserComparator10.load(); // L: 1124 - class91.clock.mark(); // L: 1126 + if (gameState == 0) { + UserComparator10.load(); + class17.method292(); + } else if (gameState == 5) { + Skeleton.method3947(this, class114.fontPlain12); + UserComparator10.load(); + class91.clock.mark(); - for (var46 = 0; var46 < 32; ++var46) { // L: 1127 + for (var46 = 0; var46 < 32; ++var46) { GameEngine.graphicsTickTimes[var46] = 0L; } - for (var46 = 0; var46 < 32; ++var46) { // L: 1128 + for (var46 = 0; var46 < 32; ++var46) { GameEngine.clientTickTimes[var46] = 0L; } - GameEngine.gameCyclesToDo = 0; // L: 1129 - } else if (gameState != 10 && gameState != 11) { // L: 1132 - if (gameState == 20) { // L: 1133 - Skeleton.method3947(this, class114.fontPlain12); // L: 1134 - this.doCycleLoggedOut(); // L: 1135 - } else if (gameState == 25) { // L: 1137 - ClientPacket.method5001(false); // L: 1138 - field529 = 0; // L: 1139 - boolean var77 = true; // L: 1140 + GameEngine.gameCyclesToDo = 0; + } else if (gameState != 10 && gameState != 11) { + if (gameState == 20) { + Skeleton.method3947(this, class114.fontPlain12); + this.doCycleLoggedOut(); + } else if (gameState == 25) { + ClientPacket.method5001(false); + field529 = 0; + boolean var77 = true; - for (var45 = 0; var45 < TileItem.regionLandArchives.length; ++var45) { // L: 1141 - if (Tiles.regionMapArchiveIds[var45] != -1 && TileItem.regionLandArchives[var45] == null) { // L: 1142 1143 - TileItem.regionLandArchives[var45] = class140.archive5.takeFile(Tiles.regionMapArchiveIds[var45], 0); // L: 1144 - if (TileItem.regionLandArchives[var45] == null) { // L: 1145 - var77 = false; // L: 1146 - ++field529; // L: 1147 + for (var45 = 0; var45 < TileItem.regionLandArchives.length; ++var45) { + if (Tiles.regionMapArchiveIds[var45] != -1 && TileItem.regionLandArchives[var45] == null) { + TileItem.regionLandArchives[var45] = class140.archive5.takeFile(Tiles.regionMapArchiveIds[var45], 0); + if (TileItem.regionLandArchives[var45] == null) { + var77 = false; + ++field529; } } - if (class10.regionLandArchiveIds[var45] != -1 && VarpDefinition.regionMapArchives[var45] == null) { // L: 1151 1152 - VarpDefinition.regionMapArchives[var45] = class140.archive5.takeFileEncrypted(class10.regionLandArchiveIds[var45], 0, WorldMapID.xteaKeys[var45]); // L: 1153 - if (VarpDefinition.regionMapArchives[var45] == null) { // L: 1154 - var77 = false; // L: 1155 - ++field529; // L: 1156 + if (class10.regionLandArchiveIds[var45] != -1 && VarpDefinition.regionMapArchives[var45] == null) { + VarpDefinition.regionMapArchives[var45] = class140.archive5.takeFileEncrypted(class10.regionLandArchiveIds[var45], 0, WorldMapID.xteaKeys[var45]); + if (VarpDefinition.regionMapArchives[var45] == null) { + var77 = false; + ++field529; } } } - if (!var77) { // L: 1161 - field602 = 1; // L: 1162 + if (!var77) { + field602 = 1; } else { - field617 = 0; // L: 1165 - var77 = true; // L: 1166 + field617 = 0; + var77 = true; int var5; boolean var8; @@ -1859,173 +1859,173 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { int var18; int var19; int var47; - for (var45 = 0; var45 < TileItem.regionLandArchives.length; ++var45) { // L: 1167 - byte[] var3 = VarpDefinition.regionMapArchives[var45]; // L: 1168 - if (var3 != null) { // L: 1169 - var47 = (class269.regions[var45] >> 8) * 64 - class131.baseX; // L: 1170 - var5 = (class269.regions[var45] & 255) * 64 - TileItem.baseY; // L: 1171 - if (isInInstance) { // L: 1172 - var47 = 10; // L: 1173 - var5 = 10; // L: 1174 + for (var45 = 0; var45 < TileItem.regionLandArchives.length; ++var45) { + byte[] var3 = VarpDefinition.regionMapArchives[var45]; + if (var3 != null) { + var47 = (class269.regions[var45] >> 8) * 64 - class131.baseX; + var5 = (class269.regions[var45] & 255) * 64 - TileItem.baseY; + if (isInInstance) { + var47 = 10; + var5 = 10; } - var8 = true; // L: 1179 - var9 = new Buffer(var3); // L: 1180 - var10 = -1; // L: 1181 + var8 = true; + var9 = new Buffer(var3); + var10 = -1; label1403: while (true) { - var11 = var9.method7378(); // L: 1183 - if (var11 == 0) { // L: 1184 - var77 &= var8; // L: 1217 + var11 = var9.method7378(); + if (var11 == 0) { + var77 &= var8; break; } - var10 += var11; // L: 1185 - var12 = 0; // L: 1186 - boolean var13 = false; // L: 1187 + var10 += var11; + var12 = 0; + boolean var13 = false; while (true) { - while (!var13) { // L: 1189 - var14 = var9.readUShortSmart(); // L: 1195 - if (var14 == 0) { // L: 1196 + while (!var13) { + var14 = var9.readUShortSmart(); + if (var14 == 0) { continue label1403; } - var12 += var14 - 1; // L: 1197 - var15 = var12 & 63; // L: 1198 - var16 = var12 >> 6 & 63; // L: 1199 - var17 = var9.readUnsignedByte() >> 2; // L: 1200 - var18 = var16 + var47; // L: 1201 - var19 = var15 + var5; // L: 1202 - if (var18 > 0 && var19 > 0 && var18 < 103 && var19 < 103) { // L: 1203 - ObjectComposition var20 = class148.getObjectDefinition(var10); // L: 1204 - if (var17 != 22 || !isLowDetail || var20.int1 != 0 || var20.interactType == 1 || var20.boolean2) { // L: 1205 - if (!var20.needsModelFiles()) { // L: 1206 - ++field617; // L: 1207 - var8 = false; // L: 1208 + var12 += var14 - 1; + var15 = var12 & 63; + var16 = var12 >> 6 & 63; + var17 = var9.readUnsignedByte() >> 2; + var18 = var16 + var47; + var19 = var15 + var5; + if (var18 > 0 && var19 > 0 && var18 < 103 && var19 < 103) { + ObjectComposition var20 = class148.getObjectDefinition(var10); + if (var17 != 22 || !isLowDetail || var20.int1 != 0 || var20.interactType == 1 || var20.boolean2) { + if (!var20.needsModelFiles()) { + ++field617; + var8 = false; } - var13 = true; // L: 1210 + var13 = true; } } } - var14 = var9.readUShortSmart(); // L: 1190 - if (var14 == 0) { // L: 1191 + var14 = var9.readUShortSmart(); + if (var14 == 0) { break; } - var9.readUnsignedByte(); // L: 1192 + var9.readUnsignedByte(); } } } } - if (!var77) { // L: 1220 - field602 = 2; // L: 1221 + if (!var77) { + field602 = 2; } else { - if (field602 != 0) { // L: 1224 + if (field602 != 0) { ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); } - class148.playPcmPlayers(); // L: 1225 - class7.scene.clear(); // L: 1226 + class148.playPcmPlayers(); + class7.scene.clear(); - for (var45 = 0; var45 < 4; ++var45) { // L: 1227 + for (var45 = 0; var45 < 4; ++var45) { collisionMaps[var45].clear(); } int var48; - for (var45 = 0; var45 < 4; ++var45) { // L: 1228 - for (var48 = 0; var48 < 104; ++var48) { // L: 1229 - for (var47 = 0; var47 < 104; ++var47) { // L: 1230 - Tiles.Tiles_renderFlags[var45][var48][var47] = 0; // L: 1231 + for (var45 = 0; var45 < 4; ++var45) { + for (var48 = 0; var48 < 104; ++var48) { + for (var47 = 0; var47 < 104; ++var47) { + Tiles.Tiles_renderFlags[var45][var48][var47] = 0; } } } - class148.playPcmPlayers(); // L: 1235 - class118.method2686(); // L: 1236 - var45 = TileItem.regionLandArchives.length; // L: 1237 - GrandExchangeEvent.method5760(); // L: 1238 - ClientPacket.method5001(true); // L: 1239 + class148.playPcmPlayers(); + class118.method2686(); + var45 = TileItem.regionLandArchives.length; + GrandExchangeEvent.method5760(); + ClientPacket.method5001(true); int var6; int var21; int var22; int var52; int var72; - if (!isInInstance) { // L: 1240 + if (!isInInstance) { byte[] var49; - for (var48 = 0; var48 < var45; ++var48) { // L: 1241 - var47 = (class269.regions[var48] >> 8) * 64 - class131.baseX; // L: 1242 - var5 = (class269.regions[var48] & 255) * 64 - TileItem.baseY; // L: 1243 - var49 = TileItem.regionLandArchives[var48]; // L: 1244 - if (var49 != null) { // L: 1245 - class148.playPcmPlayers(); // L: 1246 - class10.method119(var49, var47, var5, Messages.field1277 * 8 - 48, class4.field9 * 8 - 48, collisionMaps); // L: 1247 + for (var48 = 0; var48 < var45; ++var48) { + var47 = (class269.regions[var48] >> 8) * 64 - class131.baseX; + var5 = (class269.regions[var48] & 255) * 64 - TileItem.baseY; + var49 = TileItem.regionLandArchives[var48]; + if (var49 != null) { + class148.playPcmPlayers(); + class10.method119(var49, var47, var5, Messages.field1277 * 8 - 48, class4.field9 * 8 - 48, collisionMaps); } } - for (var48 = 0; var48 < var45; ++var48) { // L: 1250 - var47 = (class269.regions[var48] >> 8) * 64 - class131.baseX; // L: 1251 - var5 = (class269.regions[var48] & 255) * 64 - TileItem.baseY; // L: 1252 - var49 = TileItem.regionLandArchives[var48]; // L: 1253 - if (var49 == null && class4.field9 < 800) { // L: 1254 - class148.playPcmPlayers(); // L: 1255 - class112.method2572(var47, var5, 64, 64); // L: 1256 + for (var48 = 0; var48 < var45; ++var48) { + var47 = (class269.regions[var48] >> 8) * 64 - class131.baseX; + var5 = (class269.regions[var48] & 255) * 64 - TileItem.baseY; + var49 = TileItem.regionLandArchives[var48]; + if (var49 == null && class4.field9 < 800) { + class148.playPcmPlayers(); + class112.method2572(var47, var5, 64, 64); } } - ClientPacket.method5001(true); // L: 1259 + ClientPacket.method5001(true); - for (var48 = 0; var48 < var45; ++var48) { // L: 1260 - byte[] var4 = VarpDefinition.regionMapArchives[var48]; // L: 1261 - if (var4 != null) { // L: 1262 - var5 = (class269.regions[var48] >> 8) * 64 - class131.baseX; // L: 1263 - var6 = (class269.regions[var48] & 255) * 64 - TileItem.baseY; // L: 1264 - class148.playPcmPlayers(); // L: 1265 - Scene var50 = class7.scene; // L: 1266 - CollisionMap[] var51 = collisionMaps; // L: 1267 - var9 = new Buffer(var4); // L: 1269 - var10 = -1; // L: 1270 + for (var48 = 0; var48 < var45; ++var48) { + byte[] var4 = VarpDefinition.regionMapArchives[var48]; + if (var4 != null) { + var5 = (class269.regions[var48] >> 8) * 64 - class131.baseX; + var6 = (class269.regions[var48] & 255) * 64 - TileItem.baseY; + class148.playPcmPlayers(); + Scene var50 = class7.scene; + CollisionMap[] var51 = collisionMaps; + var9 = new Buffer(var4); + var10 = -1; while (true) { - var11 = var9.method7378(); // L: 1272 - if (var11 == 0) { // L: 1273 + var11 = var9.method7378(); + if (var11 == 0) { break; } - var10 += var11; // L: 1274 - var12 = 0; // L: 1275 + var10 += var11; + var12 = 0; while (true) { - var72 = var9.readUShortSmart(); // L: 1277 - if (var72 == 0) { // L: 1278 + var72 = var9.readUShortSmart(); + if (var72 == 0) { break; } - var12 += var72 - 1; // L: 1279 - var14 = var12 & 63; // L: 1280 - var15 = var12 >> 6 & 63; // L: 1281 - var16 = var12 >> 12; // L: 1282 - var17 = var9.readUnsignedByte(); // L: 1283 - var18 = var17 >> 2; // L: 1284 - var19 = var17 & 3; // L: 1285 - var52 = var5 + var15; // L: 1286 - var21 = var6 + var14; // L: 1287 - if (var52 > 0 && var21 > 0 && var52 < 103 && var21 < 103) { // L: 1288 - var22 = var16; // L: 1289 - if ((Tiles.Tiles_renderFlags[1][var52][var21] & 2) == 2) { // L: 1290 + var12 += var72 - 1; + var14 = var12 & 63; + var15 = var12 >> 6 & 63; + var16 = var12 >> 12; + var17 = var9.readUnsignedByte(); + var18 = var17 >> 2; + var19 = var17 & 3; + var52 = var5 + var15; + var21 = var6 + var14; + if (var52 > 0 && var21 > 0 && var52 < 103 && var21 < 103) { + var22 = var16; + if ((Tiles.Tiles_renderFlags[1][var52][var21] & 2) == 2) { var22 = var16 - 1; } - CollisionMap var23 = null; // L: 1291 - if (var22 >= 0) { // L: 1292 + CollisionMap var23 = null; + if (var22 >= 0) { var23 = var51[var22]; } - ClanChannel.method2996(var16, var52, var21, var10, var19, var18, var50, var23); // L: 1293 + ClanChannel.method2996(var16, var52, var21, var10, var19, var18, var50, var23); } } } @@ -2053,7 +2053,7 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { int var56; int var59; int var69; - if (isInInstance) { // L: 1301 + if (isInInstance) { var48 = 0; label1308: @@ -2062,16 +2062,16 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { CollisionMap[] var55; Buffer var73; if (var48 >= 4) { - for (var48 = 0; var48 < 13; ++var48) { // L: 1398 - for (var47 = 0; var47 < 13; ++var47) { // L: 1399 - var5 = instanceChunkTemplates[0][var48][var47]; // L: 1400 - if (var5 == -1) { // L: 1401 - class112.method2572(var48 * 8, var47 * 8, 8, 8); // L: 1402 + for (var48 = 0; var48 < 13; ++var48) { + for (var47 = 0; var47 < 13; ++var47) { + var5 = instanceChunkTemplates[0][var48][var47]; + if (var5 == -1) { + class112.method2572(var48 * 8, var47 * 8, 8, 8); } } } - ClientPacket.method5001(true); // L: 1406 + ClientPacket.method5001(true); var48 = 0; while (true) { @@ -2079,91 +2079,91 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { break label1308; } - class148.playPcmPlayers(); // L: 1408 + class148.playPcmPlayers(); - for (var47 = 0; var47 < 13; ++var47) { // L: 1409 + for (var47 = 0; var47 < 13; ++var47) { label1231: - for (var5 = 0; var5 < 13; ++var5) { // L: 1410 - var6 = instanceChunkTemplates[var48][var47][var5]; // L: 1411 - if (var6 != -1) { // L: 1412 - var7 = var6 >> 24 & 3; // L: 1413 - var69 = var6 >> 1 & 3; // L: 1414 - var53 = var6 >> 14 & 1023; // L: 1415 - var10 = var6 >> 3 & 2047; // L: 1416 - var11 = (var53 / 8 << 8) + var10 / 8; // L: 1417 + for (var5 = 0; var5 < 13; ++var5) { + var6 = instanceChunkTemplates[var48][var47][var5]; + if (var6 != -1) { + var7 = var6 >> 24 & 3; + var69 = var6 >> 1 & 3; + var53 = var6 >> 14 & 1023; + var10 = var6 >> 3 & 2047; + var11 = (var53 / 8 << 8) + var10 / 8; - for (var12 = 0; var12 < class269.regions.length; ++var12) { // L: 1418 - if (class269.regions[var12] == var11 && VarpDefinition.regionMapArchives[var12] != null) { // L: 1419 - byte[] var57 = VarpDefinition.regionMapArchives[var12]; // L: 1420 - var14 = var47 * 8; // L: 1421 - var15 = var5 * 8; // L: 1422 - var16 = (var53 & 7) * 8; // L: 1423 - var17 = (var10 & 7) * 8; // L: 1424 - Scene var58 = class7.scene; // L: 1425 - var55 = collisionMaps; // L: 1426 - var73 = new Buffer(var57); // L: 1428 - var21 = -1; // L: 1429 + for (var12 = 0; var12 < class269.regions.length; ++var12) { + if (class269.regions[var12] == var11 && VarpDefinition.regionMapArchives[var12] != null) { + byte[] var57 = VarpDefinition.regionMapArchives[var12]; + var14 = var47 * 8; + var15 = var5 * 8; + var16 = (var53 & 7) * 8; + var17 = (var10 & 7) * 8; + Scene var58 = class7.scene; + var55 = collisionMaps; + var73 = new Buffer(var57); + var21 = -1; while (true) { - var22 = var73.method7378(); // L: 1431 - if (var22 == 0) { // L: 1432 + var22 = var73.method7378(); + if (var22 == 0) { continue label1231; } - var21 += var22; // L: 1433 - var56 = 0; // L: 1434 + var21 += var22; + var56 = 0; while (true) { - var59 = var73.readUShortSmart(); // L: 1436 - if (var59 == 0) { // L: 1437 + var59 = var73.readUShortSmart(); + if (var59 == 0) { break; } - var56 += var59 - 1; // L: 1438 - var25 = var56 & 63; // L: 1439 - var26 = var56 >> 6 & 63; // L: 1440 - var27 = var56 >> 12; // L: 1441 - var28 = var73.readUnsignedByte(); // L: 1442 - var29 = var28 >> 2; // L: 1443 - var30 = var28 & 3; // L: 1444 - if (var27 == var7 && var26 >= var16 && var26 < var16 + 8 && var25 >= var17 && var25 < var17 + 8) { // L: 1445 - ObjectComposition var31 = class148.getObjectDefinition(var21); // L: 1446 - var34 = var26 & 7; // L: 1449 - var35 = var25 & 7; // L: 1450 - var37 = var31.sizeX; // L: 1452 - var38 = var31.sizeY; // L: 1453 - if ((var30 & 1) == 1) { // L: 1455 - var39 = var37; // L: 1456 - var37 = var38; // L: 1457 - var38 = var39; // L: 1458 + var56 += var59 - 1; + var25 = var56 & 63; + var26 = var56 >> 6 & 63; + var27 = var56 >> 12; + var28 = var73.readUnsignedByte(); + var29 = var28 >> 2; + var30 = var28 & 3; + if (var27 == var7 && var26 >= var16 && var26 < var16 + 8 && var25 >= var17 && var25 < var17 + 8) { + ObjectComposition var31 = class148.getObjectDefinition(var21); + var34 = var26 & 7; + var35 = var25 & 7; + var37 = var31.sizeX; + var38 = var31.sizeY; + if ((var30 & 1) == 1) { + var39 = var37; + var37 = var38; + var38 = var39; } - var36 = var69 & 3; // L: 1460 - if (var36 == 0) { // L: 1461 - var33 = var34; // L: 1462 - } else if (var36 == 1) { // L: 1465 - var33 = var35; // L: 1466 - } else if (var36 == 2) { // L: 1469 - var33 = 7 - var34 - (var37 - 1); // L: 1470 + var36 = var69 & 3; + if (var36 == 0) { + var33 = var34; + } else if (var36 == 1) { + var33 = var35; + } else if (var36 == 2) { + var33 = 7 - var34 - (var37 - 1); } else { - var33 = 7 - var35 - (var38 - 1); // L: 1473 + var33 = 7 - var35 - (var38 - 1); } - var39 = var33 + var14; // L: 1475 - Object var10001 = null; // L: 1476 + var39 = var33 + var14; + Object var10001 = null; var40 = var15 + Calendar.method5320(var26 & 7, var25 & 7, var69, var31.sizeX, var31.sizeY, var30); - if (var39 > 0 && var40 > 0 && var39 < 103 && var40 < 103) { // L: 1477 - var41 = var48; // L: 1478 - if ((Tiles.Tiles_renderFlags[1][var39][var40] & 2) == 2) { // L: 1479 + if (var39 > 0 && var40 > 0 && var39 < 103 && var40 < 103) { + var41 = var48; + if ((Tiles.Tiles_renderFlags[1][var39][var40] & 2) == 2) { var41 = var48 - 1; } - CollisionMap var42 = null; // L: 1480 - if (var41 >= 0) { // L: 1481 + CollisionMap var42 = null; + if (var41 >= 0) { var42 = var55[var41]; } - ClanChannel.method2996(var48, var39, var40, var21, var69 + var30 & 3, var29, var58, var42); // L: 1482 + ClanChannel.method2996(var48, var39, var40, var21, var69 + var30 & 3, var29, var58, var42); } } } @@ -2174,113 +2174,113 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { } } - ++var48; // L: 1407 + ++var48; } } - class148.playPcmPlayers(); // L: 1303 + class148.playPcmPlayers(); - for (var47 = 0; var47 < 13; ++var47) { // L: 1304 - for (var5 = 0; var5 < 13; ++var5) { // L: 1305 - boolean var67 = false; // L: 1306 - var7 = instanceChunkTemplates[var48][var47][var5]; // L: 1307 - if (var7 != -1) { // L: 1308 - var69 = var7 >> 24 & 3; // L: 1309 - var53 = var7 >> 1 & 3; // L: 1310 - var10 = var7 >> 14 & 1023; // L: 1311 - var11 = var7 >> 3 & 2047; // L: 1312 - var12 = (var10 / 8 << 8) + var11 / 8; // L: 1313 + for (var47 = 0; var47 < 13; ++var47) { + for (var5 = 0; var5 < 13; ++var5) { + boolean var67 = false; + var7 = instanceChunkTemplates[var48][var47][var5]; + if (var7 != -1) { + var69 = var7 >> 24 & 3; + var53 = var7 >> 1 & 3; + var10 = var7 >> 14 & 1023; + var11 = var7 >> 3 & 2047; + var12 = (var10 / 8 << 8) + var11 / 8; - for (var72 = 0; var72 < class269.regions.length; ++var72) { // L: 1314 - if (class269.regions[var72] == var12 && TileItem.regionLandArchives[var72] != null) { // L: 1315 - byte[] var54 = TileItem.regionLandArchives[var72]; // L: 1316 - var15 = var47 * 8; // L: 1317 - var16 = var5 * 8; // L: 1318 - var17 = (var10 & 7) * 8; // L: 1319 - var18 = (var11 & 7) * 8; // L: 1320 - var55 = collisionMaps; // L: 1321 + for (var72 = 0; var72 < class269.regions.length; ++var72) { + if (class269.regions[var72] == var12 && TileItem.regionLandArchives[var72] != null) { + byte[] var54 = TileItem.regionLandArchives[var72]; + var15 = var47 * 8; + var16 = var5 * 8; + var17 = (var10 & 7) * 8; + var18 = (var11 & 7) * 8; + var55 = collisionMaps; - for (var52 = 0; var52 < 8; ++var52) { // L: 1323 - for (var21 = 0; var21 < 8; ++var21) { // L: 1324 - if (var52 + var15 > 0 && var15 + var52 < 103 && var16 + var21 > 0 && var16 + var21 < 103) { // L: 1325 + for (var52 = 0; var52 < 8; ++var52) { + for (var21 = 0; var21 < 8; ++var21) { + if (var52 + var15 > 0 && var15 + var52 < 103 && var16 + var21 > 0 && var16 + var21 < 103) { var10000 = var55[var48].flags[var15 + var52]; var10000[var16 + var21] &= -16777217; } } } - var73 = new Buffer(var54); // L: 1328 + var73 = new Buffer(var54); - for (var21 = 0; var21 < 4; ++var21) { // L: 1329 - for (var22 = 0; var22 < 64; ++var22) { // L: 1330 - for (var56 = 0; var56 < 64; ++var56) { // L: 1331 - if (var69 == var21 && var22 >= var17 && var22 < var17 + 8 && var56 >= var18 && var56 < var18 + 8) { // L: 1332 - var28 = var22 & 7; // L: 1337 - var29 = var56 & 7; // L: 1338 - var30 = var53 & 3; // L: 1341 - if (var30 == 0) { // L: 1342 - var27 = var28; // L: 1343 - } else if (var30 == 1) { // L: 1346 - var27 = var29; // L: 1347 - } else if (var30 == 2) { // L: 1350 - var27 = 7 - var28; // L: 1351 + for (var21 = 0; var21 < 4; ++var21) { + for (var22 = 0; var22 < 64; ++var22) { + for (var56 = 0; var56 < 64; ++var56) { + if (var69 == var21 && var22 >= var17 && var22 < var17 + 8 && var56 >= var18 && var56 < var18 + 8) { + var28 = var22 & 7; + var29 = var56 & 7; + var30 = var53 & 3; + if (var30 == 0) { + var27 = var28; + } else if (var30 == 1) { + var27 = var29; + } else if (var30 == 2) { + var27 = 7 - var28; } else { - var27 = 7 - var29; // L: 1354 + var27 = 7 - var29; } - var33 = var15 + var27; // L: 1358 - var36 = var22 & 7; // L: 1361 - var37 = var56 & 7; // L: 1362 - var38 = var53 & 3; // L: 1365 - if (var38 == 0) { // L: 1366 - var35 = var37; // L: 1367 - } else if (var38 == 1) { // L: 1370 - var35 = 7 - var36; // L: 1371 - } else if (var38 == 2) { // L: 1374 - var35 = 7 - var37; // L: 1375 + var33 = var15 + var27; + var36 = var22 & 7; + var37 = var56 & 7; + var38 = var53 & 3; + if (var38 == 0) { + var35 = var37; + } else if (var38 == 1) { + var35 = 7 - var36; + } else if (var38 == 2) { + var35 = 7 - var37; } else { - var35 = var36; // L: 1378 + var35 = var36; } - ScriptFrame.loadTerrain(var73, var48, var33, var16 + var35, 0, 0, var53); // L: 1380 + ScriptFrame.loadTerrain(var73, var48, var33, var16 + var35, 0, 0, var53); } else { - ScriptFrame.loadTerrain(var73, 0, -1, -1, 0, 0, 0); // L: 1382 + ScriptFrame.loadTerrain(var73, 0, -1, -1, 0, 0, 0); } } } } - var67 = true; // L: 1387 - break; // L: 1388 + var67 = true; + break; } } } - if (!var67) { // L: 1392 - MenuAction.method1959(var48, var47 * 8, var5 * 8); // L: 1393 + if (!var67) { + MenuAction.method1959(var48, var47 * 8, var5 * 8); } } } - ++var48; // L: 1302 + ++var48; } } - ClientPacket.method5001(true); // L: 1496 - class148.playPcmPlayers(); // L: 1497 - Scene var65 = class7.scene; // L: 1498 - CollisionMap[] var66 = collisionMaps; // L: 1499 + ClientPacket.method5001(true); + class148.playPcmPlayers(); + Scene var65 = class7.scene; + CollisionMap[] var66 = collisionMaps; - for (var5 = 0; var5 < 4; ++var5) { // L: 1501 - for (var6 = 0; var6 < 104; ++var6) { // L: 1502 - for (var7 = 0; var7 < 104; ++var7) { // L: 1503 - if ((Tiles.Tiles_renderFlags[var5][var6][var7] & 1) == 1) { // L: 1504 - var69 = var5; // L: 1505 - if ((Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) { // L: 1506 + for (var5 = 0; var5 < 4; ++var5) { + for (var6 = 0; var6 < 104; ++var6) { + for (var7 = 0; var7 < 104; ++var7) { + if ((Tiles.Tiles_renderFlags[var5][var6][var7] & 1) == 1) { + var69 = var5; + if ((Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) { var69 = var5 - 1; } - if (var69 >= 0) { // L: 1507 + if (var69 >= 0) { var66[var69].setBlockedByFloor(var6, var7); } } @@ -2288,223 +2288,223 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { } } - Tiles.rndHue += (int)(Math.random() * 5.0D) - 2; // L: 1512 - if (Tiles.rndHue < -8) { // L: 1513 + Tiles.rndHue += (int)(Math.random() * 5.0D) - 2; + if (Tiles.rndHue < -8) { Tiles.rndHue = -8; } - if (Tiles.rndHue > 8) { // L: 1514 + if (Tiles.rndHue > 8) { Tiles.rndHue = 8; } - Tiles.rndLightness += (int)(Math.random() * 5.0D) - 2; // L: 1515 - if (Tiles.rndLightness < -16) { // L: 1516 + Tiles.rndLightness += (int)(Math.random() * 5.0D) - 2; + if (Tiles.rndLightness < -16) { Tiles.rndLightness = -16; } - if (Tiles.rndLightness > 16) { // L: 1517 + if (Tiles.rndLightness > 16) { Tiles.rndLightness = 16; } - for (var5 = 0; var5 < 4; ++var5) { // L: 1518 - byte[][] var78 = SoundCache.field321[var5]; // L: 1519 - boolean var68 = true; // L: 1520 - var8 = true; // L: 1521 - boolean var81 = true; // L: 1522 - boolean var70 = true; // L: 1523 - boolean var71 = true; // L: 1524 - var12 = (int)Math.sqrt(5100.0D); // L: 1525 - var72 = var12 * 768 >> 8; // L: 1526 + for (var5 = 0; var5 < 4; ++var5) { + byte[][] var78 = SoundCache.field321[var5]; + boolean var68 = true; + var8 = true; + boolean var81 = true; + boolean var70 = true; + boolean var71 = true; + var12 = (int)Math.sqrt(5100.0D); + var72 = var12 * 768 >> 8; - for (var14 = 1; var14 < 103; ++var14) { // L: 1527 - for (var15 = 1; var15 < 103; ++var15) { // L: 1528 - var16 = Tiles.Tiles_heights[var5][var15 + 1][var14] - Tiles.Tiles_heights[var5][var15 - 1][var14]; // L: 1529 - var17 = Tiles.Tiles_heights[var5][var15][var14 + 1] - Tiles.Tiles_heights[var5][var15][var14 - 1]; // L: 1530 - var18 = (int)Math.sqrt((double)(var17 * var17 + var16 * var16 + 65536)); // L: 1531 - var19 = (var16 << 8) / var18; // L: 1532 - var52 = 65536 / var18; // L: 1533 - var21 = (var17 << 8) / var18; // L: 1534 - var22 = (var19 * -50 + var21 * -50 + var52 * -10) / var72 + 96; // L: 1535 - var56 = (var78[var15 - 1][var14] >> 2) + (var78[var15][var14 - 1] >> 2) + (var78[var15 + 1][var14] >> 3) + (var78[var15][var14 + 1] >> 3) + (var78[var15][var14] >> 1); // L: 1536 - class194.field2280[var15][var14] = var22 - var56; // L: 1537 + for (var14 = 1; var14 < 103; ++var14) { + for (var15 = 1; var15 < 103; ++var15) { + var16 = Tiles.Tiles_heights[var5][var15 + 1][var14] - Tiles.Tiles_heights[var5][var15 - 1][var14]; + var17 = Tiles.Tiles_heights[var5][var15][var14 + 1] - Tiles.Tiles_heights[var5][var15][var14 - 1]; + var18 = (int)Math.sqrt((double)(var17 * var17 + var16 * var16 + 65536)); + var19 = (var16 << 8) / var18; + var52 = 65536 / var18; + var21 = (var17 << 8) / var18; + var22 = (var19 * -50 + var21 * -50 + var52 * -10) / var72 + 96; + var56 = (var78[var15 - 1][var14] >> 2) + (var78[var15][var14 - 1] >> 2) + (var78[var15 + 1][var14] >> 3) + (var78[var15][var14 + 1] >> 3) + (var78[var15][var14] >> 1); + class194.field2280[var15][var14] = var22 - var56; } } - for (var14 = 0; var14 < 104; ++var14) { // L: 1540 - Tiles.Tiles_hue[var14] = 0; // L: 1541 - User.Tiles_saturation[var14] = 0; // L: 1542 - Tiles.Tiles_lightness[var14] = 0; // L: 1543 - UserComparator5.Tiles_hueMultiplier[var14] = 0; // L: 1544 - VerticalAlignment.field1874[var14] = 0; // L: 1545 + for (var14 = 0; var14 < 104; ++var14) { + Tiles.Tiles_hue[var14] = 0; + User.Tiles_saturation[var14] = 0; + Tiles.Tiles_lightness[var14] = 0; + UserComparator5.Tiles_hueMultiplier[var14] = 0; + VerticalAlignment.field1874[var14] = 0; } - for (var14 = -5; var14 < 109; ++var14) { // L: 1547 - for (var15 = 0; var15 < 104; ++var15) { // L: 1548 - var16 = var14 + 5; // L: 1549 + for (var14 = -5; var14 < 109; ++var14) { + for (var15 = 0; var15 < 104; ++var15) { + var16 = var14 + 5; int var10002; - if (var16 >= 0 && var16 < 104) { // L: 1550 - var17 = Tiles.Tiles_underlays[var5][var16][var15] & 255; // L: 1551 - if (var17 > 0) { // L: 1552 - FloorUnderlayDefinition var83 = InterfaceParent.method2144(var17 - 1); // L: 1553 - var10000 = Tiles.Tiles_hue; // L: 1554 + if (var16 >= 0 && var16 < 104) { + var17 = Tiles.Tiles_underlays[var5][var16][var15] & 255; + if (var17 > 0) { + FloorUnderlayDefinition var83 = InterfaceParent.method2144(var17 - 1); + var10000 = Tiles.Tiles_hue; var10000[var15] += var83.hue; - var10000 = User.Tiles_saturation; // L: 1555 + var10000 = User.Tiles_saturation; var10000[var15] += var83.saturation; - var10000 = Tiles.Tiles_lightness; // L: 1556 + var10000 = Tiles.Tiles_lightness; var10000[var15] += var83.lightness; - var10000 = UserComparator5.Tiles_hueMultiplier; // L: 1557 + var10000 = UserComparator5.Tiles_hueMultiplier; var10000[var15] += var83.hueMultiplier; - var10002 = VerticalAlignment.field1874[var15]++; // L: 1558 + var10002 = VerticalAlignment.field1874[var15]++; } } - var17 = var14 - 5; // L: 1561 - if (var17 >= 0 && var17 < 104) { // L: 1562 - var18 = Tiles.Tiles_underlays[var5][var17][var15] & 255; // L: 1563 - if (var18 > 0) { // L: 1564 - FloorUnderlayDefinition var82 = InterfaceParent.method2144(var18 - 1); // L: 1565 - var10000 = Tiles.Tiles_hue; // L: 1566 + var17 = var14 - 5; + if (var17 >= 0 && var17 < 104) { + var18 = Tiles.Tiles_underlays[var5][var17][var15] & 255; + if (var18 > 0) { + FloorUnderlayDefinition var82 = InterfaceParent.method2144(var18 - 1); + var10000 = Tiles.Tiles_hue; var10000[var15] -= var82.hue; - var10000 = User.Tiles_saturation; // L: 1567 + var10000 = User.Tiles_saturation; var10000[var15] -= var82.saturation; - var10000 = Tiles.Tiles_lightness; // L: 1568 + var10000 = Tiles.Tiles_lightness; var10000[var15] -= var82.lightness; - var10000 = UserComparator5.Tiles_hueMultiplier; // L: 1569 + var10000 = UserComparator5.Tiles_hueMultiplier; var10000[var15] -= var82.hueMultiplier; - var10002 = VerticalAlignment.field1874[var15]--; // L: 1570 + var10002 = VerticalAlignment.field1874[var15]--; } } } - if (var14 >= 1 && var14 < 103) { // L: 1574 - var15 = 0; // L: 1575 - var16 = 0; // L: 1576 - var17 = 0; // L: 1577 - var18 = 0; // L: 1578 - var19 = 0; // L: 1579 + if (var14 >= 1 && var14 < 103) { + var15 = 0; + var16 = 0; + var17 = 0; + var18 = 0; + var19 = 0; - for (var52 = -5; var52 < 109; ++var52) { // L: 1580 - var21 = var52 + 5; // L: 1581 - if (var21 >= 0 && var21 < 104) { // L: 1582 - var15 += Tiles.Tiles_hue[var21]; // L: 1583 - var16 += User.Tiles_saturation[var21]; // L: 1584 - var17 += Tiles.Tiles_lightness[var21]; // L: 1585 - var18 += UserComparator5.Tiles_hueMultiplier[var21]; // L: 1586 - var19 += VerticalAlignment.field1874[var21]; // L: 1587 + for (var52 = -5; var52 < 109; ++var52) { + var21 = var52 + 5; + if (var21 >= 0 && var21 < 104) { + var15 += Tiles.Tiles_hue[var21]; + var16 += User.Tiles_saturation[var21]; + var17 += Tiles.Tiles_lightness[var21]; + var18 += UserComparator5.Tiles_hueMultiplier[var21]; + var19 += VerticalAlignment.field1874[var21]; } - var22 = var52 - 5; // L: 1589 - if (var22 >= 0 && var22 < 104) { // L: 1590 - var15 -= Tiles.Tiles_hue[var22]; // L: 1591 - var16 -= User.Tiles_saturation[var22]; // L: 1592 - var17 -= Tiles.Tiles_lightness[var22]; // L: 1593 - var18 -= UserComparator5.Tiles_hueMultiplier[var22]; // L: 1594 - var19 -= VerticalAlignment.field1874[var22]; // L: 1595 + var22 = var52 - 5; + if (var22 >= 0 && var22 < 104) { + var15 -= Tiles.Tiles_hue[var22]; + var16 -= User.Tiles_saturation[var22]; + var17 -= Tiles.Tiles_lightness[var22]; + var18 -= UserComparator5.Tiles_hueMultiplier[var22]; + var19 -= VerticalAlignment.field1874[var22]; } - if (var52 >= 1 && var52 < 103 && (!isLowDetail || (Tiles.Tiles_renderFlags[0][var14][var52] & 2) != 0 || (Tiles.Tiles_renderFlags[var5][var14][var52] & 16) == 0)) { // L: 1597 1598 1599 1600 - if (var5 < Tiles.Tiles_minPlane) { // L: 1603 + if (var52 >= 1 && var52 < 103 && (!isLowDetail || (Tiles.Tiles_renderFlags[0][var14][var52] & 2) != 0 || (Tiles.Tiles_renderFlags[var5][var14][var52] & 16) == 0)) { + if (var5 < Tiles.Tiles_minPlane) { Tiles.Tiles_minPlane = var5; } - var56 = Tiles.Tiles_underlays[var5][var14][var52] & 255; // L: 1604 - var59 = Tiles.Tiles_overlays[var5][var14][var52] & 255; // L: 1605 - if (var56 > 0 || var59 > 0) { // L: 1606 - var25 = Tiles.Tiles_heights[var5][var14][var52]; // L: 1607 - var26 = Tiles.Tiles_heights[var5][var14 + 1][var52]; // L: 1608 - var27 = Tiles.Tiles_heights[var5][var14 + 1][var52 + 1]; // L: 1609 - var28 = Tiles.Tiles_heights[var5][var14][var52 + 1]; // L: 1610 - var29 = class194.field2280[var14][var52]; // L: 1611 - var30 = class194.field2280[var14 + 1][var52]; // L: 1612 - int var60 = class194.field2280[var14 + 1][var52 + 1]; // L: 1613 - int var32 = class194.field2280[var14][var52 + 1]; // L: 1614 - var33 = -1; // L: 1615 - var34 = -1; // L: 1616 - if (var56 > 0) { // L: 1617 - var35 = var15 * 256 / var18; // L: 1618 - var36 = var16 / var19; // L: 1619 - var37 = var17 / var19; // L: 1620 - var33 = MusicPatchNode2.hslToRgb(var35, var36, var37); // L: 1621 - var35 = var35 + Tiles.rndHue & 255; // L: 1622 - var37 += Tiles.rndLightness; // L: 1623 - if (var37 < 0) { // L: 1624 + var56 = Tiles.Tiles_underlays[var5][var14][var52] & 255; + var59 = Tiles.Tiles_overlays[var5][var14][var52] & 255; + if (var56 > 0 || var59 > 0) { + var25 = Tiles.Tiles_heights[var5][var14][var52]; + var26 = Tiles.Tiles_heights[var5][var14 + 1][var52]; + var27 = Tiles.Tiles_heights[var5][var14 + 1][var52 + 1]; + var28 = Tiles.Tiles_heights[var5][var14][var52 + 1]; + var29 = class194.field2280[var14][var52]; + var30 = class194.field2280[var14 + 1][var52]; + int var60 = class194.field2280[var14 + 1][var52 + 1]; + int var32 = class194.field2280[var14][var52 + 1]; + var33 = -1; + var34 = -1; + if (var56 > 0) { + var35 = var15 * 256 / var18; + var36 = var16 / var19; + var37 = var17 / var19; + var33 = MusicPatchNode2.hslToRgb(var35, var36, var37); + var35 = var35 + Tiles.rndHue & 255; + var37 += Tiles.rndLightness; + if (var37 < 0) { var37 = 0; - } else if (var37 > 255) { // L: 1625 + } else if (var37 > 255) { var37 = 255; } - var34 = MusicPatchNode2.hslToRgb(var35, var36, var37); // L: 1626 + var34 = MusicPatchNode2.hslToRgb(var35, var36, var37); } - if (var5 > 0) { // L: 1628 - boolean var75 = true; // L: 1629 - if (var56 == 0 && Tiles.Tiles_shapes[var5][var14][var52] != 0) { // L: 1630 + if (var5 > 0) { + boolean var75 = true; + if (var56 == 0 && Tiles.Tiles_shapes[var5][var14][var52] != 0) { var75 = false; } - if (var59 > 0 && !class18.method302(var59 - 1).hideUnderlay) { // L: 1631 + if (var59 > 0 && !class18.method302(var59 - 1).hideUnderlay) { var75 = false; } - if (var75 && var25 == var26 && var25 == var27 && var25 == var28) { // L: 1632 1633 + if (var75 && var25 == var26 && var25 == var27 && var25 == var28) { var10000 = ClanChannelMember.field1504[var5][var14]; var10000[var52] |= 2340; } } - var35 = 0; // L: 1636 - if (var34 != -1) { // L: 1637 + var35 = 0; + if (var34 != -1) { var35 = Rasterizer3D.Rasterizer3D_colorPalette[Login.method1995(var34, 96)]; } - if (var59 == 0) { // L: 1638 - var65.addTile(var5, var14, var52, 0, 0, -1, var25, var26, var27, var28, Login.method1995(var33, var29), Login.method1995(var33, var30), Login.method1995(var33, var60), Login.method1995(var33, var32), 0, 0, 0, 0, var35, 0); // L: 1639 + if (var59 == 0) { + var65.addTile(var5, var14, var52, 0, 0, -1, var25, var26, var27, var28, Login.method1995(var33, var29), Login.method1995(var33, var30), Login.method1995(var33, var60), Login.method1995(var33, var32), 0, 0, 0, 0, var35, 0); } else { - var36 = Tiles.Tiles_shapes[var5][var14][var52] + 1; // L: 1642 - byte var76 = WorldMapLabelSize.field2580[var5][var14][var52]; // L: 1643 - FloorOverlayDefinition var61 = class18.method302(var59 - 1); // L: 1644 - var39 = var61.texture; // L: 1645 + var36 = Tiles.Tiles_shapes[var5][var14][var52] + 1; + byte var76 = WorldMapLabelSize.field2580[var5][var14][var52]; + FloorOverlayDefinition var61 = class18.method302(var59 - 1); + var39 = var61.texture; int var43; int var62; - if (var39 >= 0) { // L: 1648 - var41 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var39); // L: 1649 - var40 = -1; // L: 1650 - } else if (var61.primaryRgb == 16711935) { // L: 1653 - var40 = -2; // L: 1654 - var39 = -1; // L: 1655 - var41 = -2; // L: 1656 + if (var39 >= 0) { + var41 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var39); + var40 = -1; + } else if (var61.primaryRgb == 16711935) { + var40 = -2; + var39 = -1; + var41 = -2; } else { - var40 = MusicPatchNode2.hslToRgb(var61.hue, var61.saturation, var61.lightness); // L: 1659 - var62 = var61.hue + Tiles.rndHue & 255; // L: 1660 - var43 = var61.lightness + Tiles.rndLightness; // L: 1661 - if (var43 < 0) { // L: 1662 + var40 = MusicPatchNode2.hslToRgb(var61.hue, var61.saturation, var61.lightness); + var62 = var61.hue + Tiles.rndHue & 255; + var43 = var61.lightness + Tiles.rndLightness; + if (var43 < 0) { var43 = 0; - } else if (var43 > 255) { // L: 1663 + } else if (var43 > 255) { var43 = 255; } - var41 = MusicPatchNode2.hslToRgb(var62, var61.saturation, var43); // L: 1664 + var41 = MusicPatchNode2.hslToRgb(var62, var61.saturation, var43); } - var62 = 0; // L: 1667 - if (var41 != -2) { // L: 1668 + var62 = 0; + if (var41 != -2) { var62 = Rasterizer3D.Rasterizer3D_colorPalette[PendingSpawn.method2223(var41, 96)]; } - if (var61.secondaryRgb != -1) { // L: 1669 - var43 = var61.secondaryHue + Tiles.rndHue & 255; // L: 1670 - int var44 = var61.secondaryLightness + Tiles.rndLightness; // L: 1671 - if (var44 < 0) { // L: 1672 + if (var61.secondaryRgb != -1) { + var43 = var61.secondaryHue + Tiles.rndHue & 255; + int var44 = var61.secondaryLightness + Tiles.rndLightness; + if (var44 < 0) { var44 = 0; - } else if (var44 > 255) { // L: 1673 + } else if (var44 > 255) { var44 = 255; } - var41 = MusicPatchNode2.hslToRgb(var43, var61.secondarySaturation, var44); // L: 1674 - var62 = Rasterizer3D.Rasterizer3D_colorPalette[PendingSpawn.method2223(var41, 96)]; // L: 1675 + var41 = MusicPatchNode2.hslToRgb(var43, var61.secondarySaturation, var44); + var62 = Rasterizer3D.Rasterizer3D_colorPalette[PendingSpawn.method2223(var41, 96)]; } - var65.addTile(var5, var14, var52, var36, var76, var39, var25, var26, var27, var28, Login.method1995(var33, var29), Login.method1995(var33, var30), Login.method1995(var33, var60), Login.method1995(var33, var32), PendingSpawn.method2223(var40, var29), PendingSpawn.method2223(var40, var30), PendingSpawn.method2223(var40, var60), PendingSpawn.method2223(var40, var32), var35, var62); // L: 1677 + var65.addTile(var5, var14, var52, var36, var76, var39, var25, var26, var27, var28, Login.method1995(var33, var29), Login.method1995(var33, var30), Login.method1995(var33, var60), Login.method1995(var33, var32), PendingSpawn.method2223(var40, var29), PendingSpawn.method2223(var40, var30), PendingSpawn.method2223(var40, var60), PendingSpawn.method2223(var40, var32), var35, var62); } } } @@ -2512,87 +2512,87 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { } } - for (var14 = 1; var14 < 103; ++var14) { // L: 1684 - for (var15 = 1; var15 < 103; ++var15) { // L: 1685 - var65.setTileMinPlane(var5, var15, var14, Login.method1993(var5, var15, var14)); // L: 1686 + for (var14 = 1; var14 < 103; ++var14) { + for (var15 = 1; var15 < 103; ++var15) { + var65.setTileMinPlane(var5, var15, var14, Login.method1993(var5, var15, var14)); } } - Tiles.Tiles_underlays[var5] = null; // L: 1689 - Tiles.Tiles_overlays[var5] = null; // L: 1690 - Tiles.Tiles_shapes[var5] = null; // L: 1691 - WorldMapLabelSize.field2580[var5] = null; // L: 1692 - SoundCache.field321[var5] = null; // L: 1693 + Tiles.Tiles_underlays[var5] = null; + Tiles.Tiles_overlays[var5] = null; + Tiles.Tiles_shapes[var5] = null; + WorldMapLabelSize.field2580[var5] = null; + SoundCache.field321[var5] = null; } - var65.method3981(-50, -10, -50); // L: 1695 + var65.method3981(-50, -10, -50); - for (var5 = 0; var5 < 104; ++var5) { // L: 1696 - for (var6 = 0; var6 < 104; ++var6) { // L: 1697 - if ((Tiles.Tiles_renderFlags[1][var5][var6] & 2) == 2) { // L: 1698 + for (var5 = 0; var5 < 104; ++var5) { + for (var6 = 0; var6 < 104; ++var6) { + if ((Tiles.Tiles_renderFlags[1][var5][var6] & 2) == 2) { var65.setLinkBelow(var5, var6); } } } - var5 = 1; // L: 1701 - var6 = 2; // L: 1702 - var7 = 4; // L: 1703 + var5 = 1; + var6 = 2; + var7 = 4; - for (var69 = 0; var69 < 4; ++var69) { // L: 1704 - if (var69 > 0) { // L: 1705 - var5 <<= 3; // L: 1706 - var6 <<= 3; // L: 1707 - var7 <<= 3; // L: 1708 + for (var69 = 0; var69 < 4; ++var69) { + if (var69 > 0) { + var5 <<= 3; + var6 <<= 3; + var7 <<= 3; } - for (var53 = 0; var53 <= var69; ++var53) { // L: 1710 - for (var10 = 0; var10 <= 104; ++var10) { // L: 1711 - for (var11 = 0; var11 <= 104; ++var11) { // L: 1712 + for (var53 = 0; var53 <= var69; ++var53) { + for (var10 = 0; var10 <= 104; ++var10) { + for (var11 = 0; var11 <= 104; ++var11) { short var74; - if ((ClanChannelMember.field1504[var53][var11][var10] & var5) != 0) { // L: 1713 - var12 = var10; // L: 1714 - var72 = var10; // L: 1715 - var14 = var53; // L: 1716 + if ((ClanChannelMember.field1504[var53][var11][var10] & var5) != 0) { + var12 = var10; + var72 = var10; + var14 = var53; - for (var15 = var53; var12 > 0 && (ClanChannelMember.field1504[var53][var11][var12 - 1] & var5) != 0; --var12) { // L: 1717 1718 + for (var15 = var53; var12 > 0 && (ClanChannelMember.field1504[var53][var11][var12 - 1] & var5) != 0; --var12) { } - while (var72 < 104 && (ClanChannelMember.field1504[var53][var11][var72 + 1] & var5) != 0) { // L: 1719 + while (var72 < 104 && (ClanChannelMember.field1504[var53][var11][var72 + 1] & var5) != 0) { ++var72; } label957: - while (var14 > 0) { // L: 1720 - for (var16 = var12; var16 <= var72; ++var16) { // L: 1721 + while (var14 > 0) { + for (var16 = var12; var16 <= var72; ++var16) { if ((ClanChannelMember.field1504[var14 - 1][var11][var16] & var5) == 0) { break label957; } } - --var14; // L: 1722 + --var14; } label946: - while (var15 < var69) { // L: 1724 - for (var16 = var12; var16 <= var72; ++var16) { // L: 1725 + while (var15 < var69) { + for (var16 = var12; var16 <= var72; ++var16) { if ((ClanChannelMember.field1504[var15 + 1][var11][var16] & var5) == 0) { break label946; } } - ++var15; // L: 1726 + ++var15; } - var16 = (var15 + 1 - var14) * (var72 - var12 + 1); // L: 1728 - if (var16 >= 8) { // L: 1729 - var74 = 240; // L: 1730 - var18 = Tiles.Tiles_heights[var15][var11][var12] - var74; // L: 1731 - var19 = Tiles.Tiles_heights[var14][var11][var12]; // L: 1732 - Scene.Scene_addOccluder(var69, 1, var11 * 128, var11 * 128, var12 * 128, var72 * 128 + 128, var18, var19); // L: 1733 + var16 = (var15 + 1 - var14) * (var72 - var12 + 1); + if (var16 >= 8) { + var74 = 240; + var18 = Tiles.Tiles_heights[var15][var11][var12] - var74; + var19 = Tiles.Tiles_heights[var14][var11][var12]; + Scene.Scene_addOccluder(var69, 1, var11 * 128, var11 * 128, var12 * 128, var72 * 128 + 128, var18, var19); - for (var52 = var14; var52 <= var15; ++var52) { // L: 1734 - for (var21 = var12; var21 <= var72; ++var21) { // L: 1735 + for (var52 = var14; var52 <= var15; ++var52) { + for (var21 = var12; var21 <= var72; ++var21) { var10000 = ClanChannelMember.field1504[var52][var11]; var10000[var21] &= ~var5; } @@ -2600,49 +2600,49 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { } } - if ((ClanChannelMember.field1504[var53][var11][var10] & var6) != 0) { // L: 1739 - var12 = var11; // L: 1740 - var72 = var11; // L: 1741 - var14 = var53; // L: 1742 + if ((ClanChannelMember.field1504[var53][var11][var10] & var6) != 0) { + var12 = var11; + var72 = var11; + var14 = var53; - for (var15 = var53; var12 > 0 && (ClanChannelMember.field1504[var53][var12 - 1][var10] & var6) != 0; --var12) { // L: 1743 1744 + for (var15 = var53; var12 > 0 && (ClanChannelMember.field1504[var53][var12 - 1][var10] & var6) != 0; --var12) { } - while (var72 < 104 && (ClanChannelMember.field1504[var53][var72 + 1][var10] & var6) != 0) { // L: 1745 + while (var72 < 104 && (ClanChannelMember.field1504[var53][var72 + 1][var10] & var6) != 0) { ++var72; } label1010: - while (var14 > 0) { // L: 1746 - for (var16 = var12; var16 <= var72; ++var16) { // L: 1747 + while (var14 > 0) { + for (var16 = var12; var16 <= var72; ++var16) { if ((ClanChannelMember.field1504[var14 - 1][var16][var10] & var6) == 0) { break label1010; } } - --var14; // L: 1748 + --var14; } label999: - while (var15 < var69) { // L: 1750 - for (var16 = var12; var16 <= var72; ++var16) { // L: 1751 + while (var15 < var69) { + for (var16 = var12; var16 <= var72; ++var16) { if ((ClanChannelMember.field1504[var15 + 1][var16][var10] & var6) == 0) { break label999; } } - ++var15; // L: 1752 + ++var15; } - var16 = (var15 + 1 - var14) * (var72 - var12 + 1); // L: 1754 - if (var16 >= 8) { // L: 1755 - var74 = 240; // L: 1756 - var18 = Tiles.Tiles_heights[var15][var12][var10] - var74; // L: 1757 - var19 = Tiles.Tiles_heights[var14][var12][var10]; // L: 1758 - Scene.Scene_addOccluder(var69, 2, var12 * 128, var72 * 128 + 128, var10 * 128, var10 * 128, var18, var19); // L: 1759 + var16 = (var15 + 1 - var14) * (var72 - var12 + 1); + if (var16 >= 8) { + var74 = 240; + var18 = Tiles.Tiles_heights[var15][var12][var10] - var74; + var19 = Tiles.Tiles_heights[var14][var12][var10]; + Scene.Scene_addOccluder(var69, 2, var12 * 128, var72 * 128 + 128, var10 * 128, var10 * 128, var18, var19); - for (var52 = var14; var52 <= var15; ++var52) { // L: 1760 - for (var21 = var12; var21 <= var72; ++var21) { // L: 1761 + for (var52 = var14; var52 <= var15; ++var52) { + for (var21 = var12; var21 <= var72; ++var21) { var10000 = ClanChannelMember.field1504[var52][var21]; var10000[var10] &= ~var6; } @@ -2650,46 +2650,46 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { } } - if ((ClanChannelMember.field1504[var53][var11][var10] & var7) != 0) { // L: 1765 - var12 = var11; // L: 1766 - var72 = var11; // L: 1767 - var14 = var10; // L: 1768 + if ((ClanChannelMember.field1504[var53][var11][var10] & var7) != 0) { + var12 = var11; + var72 = var11; + var14 = var10; - for (var15 = var10; var14 > 0 && (ClanChannelMember.field1504[var53][var11][var14 - 1] & var7) != 0; --var14) { // L: 1769 1770 + for (var15 = var10; var14 > 0 && (ClanChannelMember.field1504[var53][var11][var14 - 1] & var7) != 0; --var14) { } - while (var15 < 104 && (ClanChannelMember.field1504[var53][var11][var15 + 1] & var7) != 0) { // L: 1771 + while (var15 < 104 && (ClanChannelMember.field1504[var53][var11][var15 + 1] & var7) != 0) { ++var15; } label1063: - while (var12 > 0) { // L: 1772 - for (var16 = var14; var16 <= var15; ++var16) { // L: 1773 + while (var12 > 0) { + for (var16 = var14; var16 <= var15; ++var16) { if ((ClanChannelMember.field1504[var53][var12 - 1][var16] & var7) == 0) { break label1063; } } - --var12; // L: 1774 + --var12; } label1052: - while (var72 < 104) { // L: 1776 - for (var16 = var14; var16 <= var15; ++var16) { // L: 1777 + while (var72 < 104) { + for (var16 = var14; var16 <= var15; ++var16) { if ((ClanChannelMember.field1504[var53][var72 + 1][var16] & var7) == 0) { break label1052; } } - ++var72; // L: 1778 + ++var72; } - if ((var72 - var12 + 1) * (var15 - var14 + 1) >= 4) { // L: 1780 - var16 = Tiles.Tiles_heights[var53][var12][var14]; // L: 1781 - Scene.Scene_addOccluder(var69, 4, var12 * 128, var72 * 128 + 128, var14 * 128, var15 * 128 + 128, var16, var16); // L: 1782 + if ((var72 - var12 + 1) * (var15 - var14 + 1) >= 4) { + var16 = Tiles.Tiles_heights[var53][var12][var14]; + Scene.Scene_addOccluder(var69, 4, var12 * 128, var72 * 128 + 128, var14 * 128, var15 * 128 + 128, var16, var16); - for (var17 = var12; var17 <= var72; ++var17) { // L: 1783 - for (var18 = var14; var18 <= var15; ++var18) { // L: 1784 + for (var17 = var12; var17 <= var72; ++var17) { + for (var18 = var14; var18 <= var15; ++var18) { var10000 = ClanChannelMember.field1504[var53][var17]; var10000[var18] &= ~var7; } @@ -2701,69 +2701,69 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { } } - ClientPacket.method5001(true); // L: 1793 - var5 = Tiles.Tiles_minPlane; // L: 1794 - if (var5 > class20.Client_plane) { // L: 1795 + ClientPacket.method5001(true); + var5 = Tiles.Tiles_minPlane; + if (var5 > class20.Client_plane) { var5 = class20.Client_plane; } - if (var5 < class20.Client_plane - 1) { // L: 1796 + if (var5 < class20.Client_plane - 1) { var5 = class20.Client_plane - 1; } - if (isLowDetail) { // L: 1797 + if (isLowDetail) { class7.scene.init(Tiles.Tiles_minPlane); } else { - class7.scene.init(0); // L: 1798 + class7.scene.init(0); } - for (var6 = 0; var6 < 104; ++var6) { // L: 1799 - for (var7 = 0; var7 < 104; ++var7) { // L: 1800 - MouseHandler.updateItemPile(var6, var7); // L: 1801 + for (var6 = 0; var6 < 104; ++var6) { + for (var7 = 0; var7 < 104; ++var7) { + MouseHandler.updateItemPile(var6, var7); } } - class148.playPcmPlayers(); // L: 1804 + class148.playPcmPlayers(); - for (PendingSpawn var79 = (PendingSpawn)pendingSpawns.last(); var79 != null; var79 = (PendingSpawn)pendingSpawns.previous()) { // L: 1806 1807 1813 - if (var79.hitpoints == -1) { // L: 1808 - var79.delay = 0; // L: 1809 - class4.method26(var79); // L: 1810 + for (PendingSpawn var79 = (PendingSpawn)pendingSpawns.last(); var79 != null; var79 = (PendingSpawn)pendingSpawns.previous()) { + if (var79.hitpoints == -1) { + var79.delay = 0; + class4.method26(var79); } else { - var79.remove(); // L: 1812 + var79.remove(); } } - ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 1816 + ObjectComposition.ObjectDefinition_cachedModelData.clear(); PacketBufferNode var80; - if (class295.client.hasFrame()) { // L: 1817 - var80 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2879, packetWriter.isaacCipher); // L: 1819 - var80.packetBuffer.writeInt(1057001181); // L: 1820 - packetWriter.addNode(var80); // L: 1821 + if (class295.client.hasFrame()) { + var80 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2879, packetWriter.isaacCipher); + var80.packetBuffer.writeInt(1057001181); + packetWriter.addNode(var80); } - if (!isInInstance) { // L: 1823 - var6 = (Messages.field1277 - 6) / 8; // L: 1824 - var7 = (Messages.field1277 + 6) / 8; // L: 1825 - var69 = (class4.field9 - 6) / 8; // L: 1826 - var53 = (class4.field9 + 6) / 8; // L: 1827 + if (!isInInstance) { + var6 = (Messages.field1277 - 6) / 8; + var7 = (Messages.field1277 + 6) / 8; + var69 = (class4.field9 - 6) / 8; + var53 = (class4.field9 + 6) / 8; - for (var10 = var6 - 1; var10 <= var7 + 1; ++var10) { // L: 1828 - for (var11 = var69 - 1; var11 <= var53 + 1; ++var11) { // L: 1829 - if (var10 < var6 || var10 > var7 || var11 < var69 || var11 > var53) { // L: 1830 - class140.archive5.loadRegionFromName("m" + var10 + "_" + var11); // L: 1831 - class140.archive5.loadRegionFromName("l" + var10 + "_" + var11); // L: 1832 + for (var10 = var6 - 1; var10 <= var7 + 1; ++var10) { + for (var11 = var69 - 1; var11 <= var53 + 1; ++var11) { + if (var10 < var6 || var10 > var7 || var11 < var69 || var11 > var53) { + class140.archive5.loadRegionFromName("m" + var10 + "_" + var11); + class140.archive5.loadRegionFromName("l" + var10 + "_" + var11); } } } } - VertexNormal.updateGameState(30); // L: 1836 - class148.playPcmPlayers(); // L: 1837 - class119.method2689(); // L: 1838 - var80 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2848, packetWriter.isaacCipher); // L: 1839 - packetWriter.addNode(var80); // L: 1840 - class17.method292(); // L: 1841 + VertexNormal.updateGameState(30); + class148.playPcmPlayers(); + class119.method2689(); + var80 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2848, packetWriter.isaacCipher); + packetWriter.addNode(var80); + class17.method292(); } } } @@ -2771,16 +2771,16 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { Skeleton.method3947(this, class114.fontPlain12); } - if (gameState == 30) { // L: 1843 + if (gameState == 30) { this.doCycleLoggedIn(); - } else if (gameState == 40 || gameState == 45) { // L: 1844 + } else if (gameState == 40 || gameState == 45) { this.doCycleLoggedOut(); } - return; // L: 1845 + return; } - var1.archive.load(var1.archiveDisk, (int)var1.key, var1.data, false); // L: 1070 + var1.archive.load(var1.archiveDisk, (int)var1.key, var1.data, false); } } @@ -2794,110 +2794,110 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { boolean var2; label168: { try { - if (class260.musicPlayerStatus == 2) { // L: 1852 - if (class21.musicTrack == null) { // L: 1853 - class21.musicTrack = MusicTrack.readTrack(class124.musicTrackArchive, VarcInt.musicTrackGroupId, class260.musicTrackFileId); // L: 1854 - if (class21.musicTrack == null) { // L: 1855 - var2 = false; // L: 1856 + if (class260.musicPlayerStatus == 2) { + if (class21.musicTrack == null) { + class21.musicTrack = MusicTrack.readTrack(class124.musicTrackArchive, VarcInt.musicTrackGroupId, class260.musicTrackFileId); + if (class21.musicTrack == null) { + var2 = false; break label168; } } - if (class257.soundCache == null) { // L: 1860 + if (class257.soundCache == null) { class257.soundCache = new SoundCache(class260.soundEffectsArchive, class331.musicSamplesArchive); } - if (class260.midiPcmStream.loadMusicTrack(class21.musicTrack, class260.musicPatchesArchive, class257.soundCache, 22050)) { // L: 1861 - class260.midiPcmStream.clearAll(); // L: 1862 - class260.midiPcmStream.setPcmStreamVolume(ChatChannel.musicTrackVolume); // L: 1863 - class260.midiPcmStream.setMusicTrack(class21.musicTrack, DynamicObject.musicTrackBoolean); // L: 1864 - class260.musicPlayerStatus = 0; // L: 1865 - class21.musicTrack = null; // L: 1866 - class257.soundCache = null; // L: 1867 - class124.musicTrackArchive = null; // L: 1868 - var2 = true; // L: 1869 + if (class260.midiPcmStream.loadMusicTrack(class21.musicTrack, class260.musicPatchesArchive, class257.soundCache, 22050)) { + class260.midiPcmStream.clearAll(); + class260.midiPcmStream.setPcmStreamVolume(ChatChannel.musicTrackVolume); + class260.midiPcmStream.setMusicTrack(class21.musicTrack, DynamicObject.musicTrackBoolean); + class260.musicPlayerStatus = 0; + class21.musicTrack = null; + class257.soundCache = null; + class124.musicTrackArchive = null; + var2 = true; break label168; } } - } catch (Exception var6) { // L: 1874 - var6.printStackTrace(); // L: 1875 - class260.midiPcmStream.clear(); // L: 1876 - class260.musicPlayerStatus = 0; // L: 1877 - class21.musicTrack = null; // L: 1878 - class257.soundCache = null; // L: 1879 - class124.musicTrackArchive = null; // L: 1880 + } catch (Exception var6) { + var6.printStackTrace(); + class260.midiPcmStream.clear(); + class260.musicPlayerStatus = 0; + class21.musicTrack = null; + class257.soundCache = null; + class124.musicTrackArchive = null; } - var2 = false; // L: 1882 + var2 = false; } - if (var2 && field743 && JagexCache.pcmPlayer0 != null) { // L: 1885 1886 + if (var2 && field743 && JagexCache.pcmPlayer0 != null) { JagexCache.pcmPlayer0.tryDiscard(); } - if ((gameState == 10 || gameState == 20 || gameState == 30) && field514 != 0L && Ignored.method6459() > field514) { // L: 1888 1889 - Occluder.setWindowedMode(class143.getWindowedMode()); // L: 1890 + if ((gameState == 10 || gameState == 20 || gameState == 30) && field514 != 0L && Ignored.method6459() > field514) { + Occluder.setWindowedMode(class143.getWindowedMode()); } int var4; - if (var1) { // L: 1893 - for (var4 = 0; var4 < 100; ++var4) { // L: 1894 + if (var1) { + for (var4 = 0; var4 < 100; ++var4) { field504[var4] = true; } } - if (gameState == 0) { // L: 1896 + if (gameState == 0) { this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1); - } else if (gameState == 5) { // L: 1897 + } else if (gameState == 5) { class253.drawTitle(class136.fontBold12, class307.fontPlain11, class114.fontPlain12); - } else if (gameState != 10 && gameState != 11) { // L: 1898 - if (gameState == 20) { // L: 1899 + } else if (gameState != 10 && gameState != 11) { + if (gameState == 20) { class253.drawTitle(class136.fontBold12, class307.fontPlain11, class114.fontPlain12); - } else if (gameState == 25) { // L: 1900 - if (field602 == 1) { // L: 1901 - if (field529 > field530) { // L: 1902 + } else if (gameState == 25) { + if (field602 == 1) { + if (field529 > field530) { field530 = field529; } - var4 = (field530 * 50 - field529 * 50) / field530; // L: 1903 - ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); // L: 1904 - } else if (field602 == 2) { // L: 1906 - if (field617 > field532) { // L: 1907 + var4 = (field530 * 50 - field529 * 50) / field530; + ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); + } else if (field602 == 2) { + if (field617 > field532) { field532 = field617; } - var4 = (field532 * 50 - field617 * 50) / field532 + 50; // L: 1908 - ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); // L: 1909 + var4 = (field532 * 50 - field617 * 50) / field532 + 50; + ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); } else { - ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait.", false); // L: 1911 + ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait.", false); } - } else if (gameState == 30) { // L: 1913 + } else if (gameState == 30) { this.drawLoggedIn(); - } else if (gameState == 40) { // L: 1914 + } else if (gameState == 40) { ArchiveDiskActionHandler.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); - } else if (gameState == 45) { // L: 1915 + } else if (gameState == 45) { ArchiveDiskActionHandler.drawLoadingMessage("Please wait...", false); } } else { class253.drawTitle(class136.fontBold12, class307.fontPlain11, class114.fontPlain12); } - if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { // L: 1916 - for (var4 = 0; var4 < rootWidgetCount; ++var4) { // L: 1917 - if (field686[var4]) { // L: 1918 - class19.rasterProvider.draw(rootWidgetXs[var4], rootWidgetYs[var4], rootWidgetWidths[var4], rootWidgetHeights[var4]); // L: 1919 - field686[var4] = false; // L: 1920 + if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { + for (var4 = 0; var4 < rootWidgetCount; ++var4) { + if (field686[var4]) { + class19.rasterProvider.draw(rootWidgetXs[var4], rootWidgetYs[var4], rootWidgetWidths[var4], rootWidgetHeights[var4]); + field686[var4] = false; } } - } else if (gameState > 0) { // L: 1924 - class19.rasterProvider.drawFull(0, 0); // L: 1925 + } else if (gameState > 0) { + class19.rasterProvider.drawFull(0, 0); - for (var4 = 0; var4 < rootWidgetCount; ++var4) { // L: 1926 + for (var4 = 0; var4 < rootWidgetCount; ++var4) { field686[var4] = false; } } - } // L: 1928 + } @ObfuscatedName("ah") @ObfuscatedSignature( @@ -2906,48 +2906,48 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { ) @Export("kill0") protected final void kill0() { - if (class339.varcs.hasUnwrittenChanges()) { // L: 1931 + if (class339.varcs.hasUnwrittenChanges()) { class339.varcs.write(); } - if (mouseRecorder != null) { // L: 1932 + if (mouseRecorder != null) { mouseRecorder.isRunning = false; } - mouseRecorder = null; // L: 1933 - packetWriter.close(); // L: 1934 - GrandExchangeEvents.method5716(); // L: 1935 - Friend.method6294(); // L: 1936 - WorldMapDecorationType.mouseWheel = null; // L: 1937 - if (JagexCache.pcmPlayer0 != null) { // L: 1938 + mouseRecorder = null; + packetWriter.close(); + GrandExchangeEvents.method5716(); + Friend.method6294(); + WorldMapDecorationType.mouseWheel = null; + if (JagexCache.pcmPlayer0 != null) { JagexCache.pcmPlayer0.shutdown(); } - if (PacketWriter.pcmPlayer1 != null) { // L: 1939 + if (PacketWriter.pcmPlayer1 != null) { PacketWriter.pcmPlayer1.shutdown(); } - GraphicsObject.method1956(); // L: 1940 - class213.method4356(); // L: 1941 - if (WorldMapData_1.urlRequester != null) { // L: 1942 - WorldMapData_1.urlRequester.close(); // L: 1943 - WorldMapData_1.urlRequester = null; // L: 1944 + GraphicsObject.method1956(); + class213.method4356(); + if (WorldMapData_1.urlRequester != null) { + WorldMapData_1.urlRequester.close(); + WorldMapData_1.urlRequester = null; } try { - JagexCache.JagexCache_dat2File.close(); // L: 1948 + JagexCache.JagexCache_dat2File.close(); - for (int var1 = 0; var1 < class143.idxCount; ++var1) { // L: 1949 + for (int var1 = 0; var1 < class143.idxCount; ++var1) { JagexCache.JagexCache_idxFiles[var1].close(); } - JagexCache.JagexCache_idx255File.close(); // L: 1950 - JagexCache.JagexCache_randomDat.close(); // L: 1951 - } catch (Exception var3) { // L: 1953 + JagexCache.JagexCache_idx255File.close(); + JagexCache.JagexCache_randomDat.close(); + } catch (Exception var3) { } - this.field510.method206(); // L: 1955 - } // L: 1956 + this.field510.method206(); + } @ObfuscatedName("av") @ObfuscatedSignature( @@ -2955,7 +2955,7 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { garbageValue = "-3" ) protected final void vmethod1151() { - } // L: 660 + } @ObfuscatedName("ey") @ObfuscatedSignature( @@ -2963,7 +2963,7 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { garbageValue = "1448065083" ) boolean method1154() { - return WorldMapAreaData.field2772 != null && !WorldMapAreaData.field2772.trim().isEmpty(); // L: 975 + return WorldMapAreaData.field2772 != null && !WorldMapAreaData.field2772.trim().isEmpty(); } @ObfuscatedName("eq") @@ -2972,10 +2972,10 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { garbageValue = "-82" ) void method1625(String var1) throws MalformedURLException, IOException { - class10 var2 = new class10(new URL(class257.field3044 + "public/v1/games/YCfdbvr2pM1zUYMxJRexZY/play"), class9.field36); // L: 979 - var2.method121("Authorization", "Bearer " + var1); // L: 980 - this.field613 = this.field510.method213(var2); // L: 981 - } // L: 982 + class10 var2 = new class10(new URL(class257.field3044 + "public/v1/games/YCfdbvr2pM1zUYMxJRexZY/play"), class9.field36); + var2.method121("Authorization", "Bearer " + var1); + this.field613 = this.field510.method213(var2); + } @ObfuscatedName("ff") @ObfuscatedSignature( @@ -2984,14 +2984,14 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { ) @Export("doCycleJs5") void doCycleJs5() { - if (gameState != 1000) { // L: 1997 - boolean var1 = class295.method5515(); // L: 1998 - if (!var1) { // L: 1999 + if (gameState != 1000) { + boolean var1 = class295.method5515(); + if (!var1) { this.doCycleJs5Connect(); } } - } // L: 2000 + } @ObfuscatedName("ft") @ObfuscatedSignature( @@ -3000,140 +3000,140 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { ) @Export("doCycleJs5Connect") void doCycleJs5Connect() { - if (NetCache.NetCache_crcMismatches >= 4) { // L: 2003 - this.error("js5crc"); // L: 2004 - VertexNormal.updateGameState(1000); // L: 2005 + if (NetCache.NetCache_crcMismatches >= 4) { + this.error("js5crc"); + VertexNormal.updateGameState(1000); } else { - if (NetCache.NetCache_ioExceptions >= 4) { // L: 2008 - if (gameState <= 5) { // L: 2009 - this.error("js5io"); // L: 2010 - VertexNormal.updateGameState(1000); // L: 2011 - return; // L: 2012 + if (NetCache.NetCache_ioExceptions >= 4) { + if (gameState <= 5) { + this.error("js5io"); + VertexNormal.updateGameState(1000); + return; } - field517 = 3000; // L: 2015 - NetCache.NetCache_ioExceptions = 3; // L: 2016 + field517 = 3000; + NetCache.NetCache_ioExceptions = 3; } - if (--field517 + 1 <= 0) { // L: 2019 + if (--field517 + 1 <= 0) { try { - if (js5ConnectState == 0) { // L: 2021 - ScriptEvent.js5SocketTask = GameEngine.taskHandler.newSocketTask(class185.worldHost, class129.currentPort); // L: 2022 - ++js5ConnectState; // L: 2023 + if (js5ConnectState == 0) { + ScriptEvent.js5SocketTask = GameEngine.taskHandler.newSocketTask(class185.worldHost, class129.currentPort); + ++js5ConnectState; } - if (js5ConnectState == 1) { // L: 2025 - if (ScriptEvent.js5SocketTask.status == 2) { // L: 2026 - this.js5Error(-1); // L: 2027 - return; // L: 2028 + if (js5ConnectState == 1) { + if (ScriptEvent.js5SocketTask.status == 2) { + this.js5Error(-1); + return; } - if (ScriptEvent.js5SocketTask.status == 1) { // L: 2030 + if (ScriptEvent.js5SocketTask.status == 1) { ++js5ConnectState; } } - if (js5ConnectState == 2) { // L: 2032 - if (useBufferedSocket) { // L: 2033 - FontName.js5Socket = Login.method1965((Socket)ScriptEvent.js5SocketTask.result, 40000, 5000); // L: 2034 + if (js5ConnectState == 2) { + if (useBufferedSocket) { + FontName.js5Socket = Login.method1965((Socket)ScriptEvent.js5SocketTask.result, 40000, 5000); } else { - FontName.js5Socket = new NetSocket((Socket)ScriptEvent.js5SocketTask.result, GameEngine.taskHandler, 5000); // L: 2037 + FontName.js5Socket = new NetSocket((Socket)ScriptEvent.js5SocketTask.result, GameEngine.taskHandler, 5000); } - Buffer var1 = new Buffer(5); // L: 2039 - var1.writeByte(15); // L: 2040 - var1.writeInt(202); // L: 2041 - FontName.js5Socket.write(var1.array, 0, 5); // L: 2042 - ++js5ConnectState; // L: 2043 - class120.field1450 = Ignored.method6459(); // L: 2044 + Buffer var1 = new Buffer(5); + var1.writeByte(15); + var1.writeInt(202); + FontName.js5Socket.write(var1.array, 0, 5); + ++js5ConnectState; + class120.field1450 = Ignored.method6459(); } - if (js5ConnectState == 3) { // L: 2046 - if (FontName.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { // L: 2047 - int var5 = FontName.js5Socket.readUnsignedByte(); // L: 2048 - if (var5 != 0) { // L: 2049 - this.js5Error(var5); // L: 2050 - return; // L: 2051 + if (js5ConnectState == 3) { + if (FontName.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { + int var5 = FontName.js5Socket.readUnsignedByte(); + if (var5 != 0) { + this.js5Error(var5); + return; } - ++js5ConnectState; // L: 2053 - } else if (Ignored.method6459() - class120.field1450 > 30000L) { // L: 2056 - this.js5Error(-2); // L: 2057 - return; // L: 2058 + ++js5ConnectState; + } else if (Ignored.method6459() - class120.field1450 > 30000L) { + this.js5Error(-2); + return; } } - if (js5ConnectState == 4) { // L: 2062 - AbstractSocket var10 = FontName.js5Socket; // L: 2063 - boolean var2 = gameState > 20; // L: 2064 - if (NetCache.NetCache_socket != null) { // L: 2066 + if (js5ConnectState == 4) { + AbstractSocket var10 = FontName.js5Socket; + boolean var2 = gameState > 20; + if (NetCache.NetCache_socket != null) { try { - NetCache.NetCache_socket.close(); // L: 2068 - } catch (Exception var8) { // L: 2070 + NetCache.NetCache_socket.close(); + } catch (Exception var8) { } - NetCache.NetCache_socket = null; // L: 2071 + NetCache.NetCache_socket = null; } - NetCache.NetCache_socket = var10; // L: 2073 - ClientPreferences.method2297(var2); // L: 2074 - NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 2075 - class279.NetCache_currentResponse = null; // L: 2076 - class149.NetCache_responseArchiveBuffer = null; // L: 2077 - NetCache.field3863 = 0; // L: 2078 + NetCache.NetCache_socket = var10; + ClientPreferences.method2297(var2); + NetCache.NetCache_responseHeaderBuffer.offset = 0; + class279.NetCache_currentResponse = null; + class149.NetCache_responseArchiveBuffer = null; + NetCache.field3863 = 0; while (true) { - NetFileRequest var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); // L: 2080 - if (var3 == null) { // L: 2081 + NetFileRequest var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); + if (var3 == null) { while (true) { - var3 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); // L: 2087 - if (var3 == null) { // L: 2088 - if (NetCache.field3866 != 0) { // L: 2094 + var3 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); + if (var3 == null) { + if (NetCache.field3866 != 0) { try { - Buffer var11 = new Buffer(4); // L: 2096 - var11.writeByte(4); // L: 2097 - var11.writeByte(NetCache.field3866); // L: 2098 - var11.writeShort(0); // L: 2099 - NetCache.NetCache_socket.write(var11.array, 0, 4); // L: 2100 + Buffer var11 = new Buffer(4); + var11.writeByte(4); + var11.writeByte(NetCache.field3866); + var11.writeShort(0); + NetCache.NetCache_socket.write(var11.array, 0, 4); } catch (IOException var7) { try { - NetCache.NetCache_socket.close(); // L: 2104 - } catch (Exception var6) { // L: 2106 + NetCache.NetCache_socket.close(); + } catch (Exception var6) { } - ++NetCache.NetCache_ioExceptions; // L: 2107 - NetCache.NetCache_socket = null; // L: 2108 + ++NetCache.NetCache_ioExceptions; + NetCache.NetCache_socket = null; } } - NetCache.NetCache_loadTime = 0; // L: 2111 - UserComparator7.field1319 = Ignored.method6459(); // L: 2112 - ScriptEvent.js5SocketTask = null; // L: 2114 - FontName.js5Socket = null; // L: 2115 - js5ConnectState = 0; // L: 2116 - js5Errors = 0; // L: 2117 - return; // L: 2123 + NetCache.NetCache_loadTime = 0; + UserComparator7.field1319 = Ignored.method6459(); + ScriptEvent.js5SocketTask = null; + FontName.js5Socket = null; + js5ConnectState = 0; + js5Errors = 0; + return; } - NetCache.NetCache_pendingWritesQueue.addLast(var3); // L: 2089 - NetCache.NetCache_pendingWrites.put(var3, var3.key); // L: 2090 - ++NetCache.NetCache_pendingWritesCount; // L: 2091 - --NetCache.NetCache_pendingResponsesCount; // L: 2092 + NetCache.NetCache_pendingWritesQueue.addLast(var3); + NetCache.NetCache_pendingWrites.put(var3, var3.key); + ++NetCache.NetCache_pendingWritesCount; + --NetCache.NetCache_pendingResponsesCount; } } - NetCache.NetCache_pendingPriorityWrites.put(var3, var3.key); // L: 2082 - ++NetCache.NetCache_pendingPriorityWritesCount; // L: 2083 - --NetCache.NetCache_pendingPriorityResponsesCount; // L: 2084 + NetCache.NetCache_pendingPriorityWrites.put(var3, var3.key); + ++NetCache.NetCache_pendingPriorityWritesCount; + --NetCache.NetCache_pendingPriorityResponsesCount; } } - } catch (IOException var9) { // L: 2120 - this.js5Error(-3); // L: 2121 + } catch (IOException var9) { + this.js5Error(-3); } } } - } // L: 2006 + } @ObfuscatedName("fk") @ObfuscatedSignature( @@ -3142,36 +3142,36 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { ) @Export("js5Error") void js5Error(int var1) { - ScriptEvent.js5SocketTask = null; // L: 2126 - FontName.js5Socket = null; // L: 2127 - js5ConnectState = 0; // L: 2128 - if (GameObject.worldPort == class129.currentPort) { // L: 2129 + ScriptEvent.js5SocketTask = null; + FontName.js5Socket = null; + js5ConnectState = 0; + if (GameObject.worldPort == class129.currentPort) { class129.currentPort = class133.js5Port; } else { - class129.currentPort = GameObject.worldPort; // L: 2130 + class129.currentPort = GameObject.worldPort; } - ++js5Errors; // L: 2131 - if (js5Errors < 2 || var1 != 7 && var1 != 9) { // L: 2132 - if (js5Errors >= 2 && var1 == 6) { // L: 2139 - this.error("js5connect_outofdate"); // L: 2140 - VertexNormal.updateGameState(1000); // L: 2141 - } else if (js5Errors >= 4) { // L: 2143 - if (gameState <= 5) { // L: 2144 - this.error("js5connect"); // L: 2145 - VertexNormal.updateGameState(1000); // L: 2146 + ++js5Errors; + if (js5Errors < 2 || var1 != 7 && var1 != 9) { + if (js5Errors >= 2 && var1 == 6) { + this.error("js5connect_outofdate"); + VertexNormal.updateGameState(1000); + } else if (js5Errors >= 4) { + if (gameState <= 5) { + this.error("js5connect"); + VertexNormal.updateGameState(1000); } else { - field517 = 3000; // L: 2148 + field517 = 3000; } } - } else if (gameState <= 5) { // L: 2133 - this.error("js5connect_full"); // L: 2134 - VertexNormal.updateGameState(1000); // L: 2135 + } else if (gameState <= 5) { + this.error("js5connect_full"); + VertexNormal.updateGameState(1000); } else { - field517 = 3000; // L: 2137 + field517 = 3000; } - } // L: 2150 + } @ObfuscatedName("fg") @ObfuscatedSignature( @@ -3180,395 +3180,395 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { ) @Export("doCycleLoggedOut") final void doCycleLoggedOut() { - Object var1 = packetWriter.getSocket(); // L: 2832 - PacketBuffer var2 = packetWriter.packetBuffer; // L: 2833 + Object var1 = packetWriter.getSocket(); + PacketBuffer var2 = packetWriter.packetBuffer; try { - if (loginState == 0) { // L: 2835 - if (class19.secureRandom == null && (secureRandomFuture.isDone() || field545 > 250)) { // L: 2836 - class19.secureRandom = secureRandomFuture.get(); // L: 2837 - secureRandomFuture.shutdown(); // L: 2838 - secureRandomFuture = null; // L: 2839 + if (loginState == 0) { + if (class19.secureRandom == null && (secureRandomFuture.isDone() || field545 > 250)) { + class19.secureRandom = secureRandomFuture.get(); + secureRandomFuture.shutdown(); + secureRandomFuture = null; } - if (class19.secureRandom != null) { // L: 2841 - if (var1 != null) { // L: 2842 - ((AbstractSocket)var1).close(); // L: 2843 - var1 = null; // L: 2844 + if (class19.secureRandom != null) { + if (var1 != null) { + ((AbstractSocket)var1).close(); + var1 = null; } - class334.socketTask = null; // L: 2846 - hadNetworkError = false; // L: 2847 - field545 = 0; // L: 2848 - if (field508.method7605()) { // L: 2849 + class334.socketTask = null; + hadNetworkError = false; + field545 = 0; + if (field508.method7605()) { try { - this.method1625(WorldMapAreaData.field2772); // L: 2851 - PacketBufferNode.method5016(20); // L: 2852 - } catch (Throwable var21) { // L: 2854 - AccessFile.RunException_sendStackTrace((String)null, var21); // L: 2855 - class29.getLoginError(65); // L: 2856 - return; // L: 2857 + this.method1625(WorldMapAreaData.field2772); + PacketBufferNode.method5016(20); + } catch (Throwable var21) { + AccessFile.RunException_sendStackTrace((String)null, var21); + class29.getLoginError(65); + return; } } else { - PacketBufferNode.method5016(1); // L: 2861 + PacketBufferNode.method5016(1); } } } - if (loginState == 20) { // L: 2865 - if (!this.field613.method309()) { // L: 2866 - return; // L: 2867 + if (loginState == 20) { + if (!this.field613.method309()) { + return; } - if (this.field613.method331()) { // L: 2869 - AccessFile.RunException_sendStackTrace(this.field613.method307(), (Throwable)null); // L: 2870 - class29.getLoginError(65); // L: 2871 - return; // L: 2872 + if (this.field613.method331()) { + AccessFile.RunException_sendStackTrace(this.field613.method307(), (Throwable)null); + class29.getLoginError(65); + return; } - class21 var3 = this.field613.method310(); // L: 2874 - if (var3.method338() != 200) { // L: 2875 - AccessFile.RunException_sendStackTrace("Response code: " + var3.method338() + "Response body: " + var3.method339(), (Throwable)null); // L: 2876 - class29.getLoginError(65); // L: 2877 - return; // L: 2878 + class21 var3 = this.field613.method310(); + if (var3.method338() != 200) { + AccessFile.RunException_sendStackTrace("Response code: " + var3.method338() + "Response body: " + var3.method339(), (Throwable)null); + class29.getLoginError(65); + return; } - field545 = 0; // L: 2880 - this.field576 = var3.method339(); // L: 2881 - PacketBufferNode.method5016(1); // L: 2882 + field545 = 0; + this.field576 = var3.method339(); + PacketBufferNode.method5016(1); } - if (loginState == 1) { // L: 2884 - if (class334.socketTask == null) { // L: 2885 - class334.socketTask = GameEngine.taskHandler.newSocketTask(class185.worldHost, class129.currentPort); // L: 2886 + if (loginState == 1) { + if (class334.socketTask == null) { + class334.socketTask = GameEngine.taskHandler.newSocketTask(class185.worldHost, class129.currentPort); } - if (class334.socketTask.status == 2) { // L: 2888 + if (class334.socketTask.status == 2) { throw new IOException(); } - if (class334.socketTask.status == 1) { // L: 2889 - if (useBufferedSocket) { // L: 2890 - var1 = Login.method1965((Socket)class334.socketTask.result, 40000, 5000); // L: 2891 + if (class334.socketTask.status == 1) { + if (useBufferedSocket) { + var1 = Login.method1965((Socket)class334.socketTask.result, 40000, 5000); } else { - var1 = new NetSocket((Socket)class334.socketTask.result, GameEngine.taskHandler, 5000); // L: 2894 + var1 = new NetSocket((Socket)class334.socketTask.result, GameEngine.taskHandler, 5000); } - packetWriter.setSocket((AbstractSocket)var1); // L: 2896 - class334.socketTask = null; // L: 2897 - PacketBufferNode.method5016(2); // L: 2898 + packetWriter.setSocket((AbstractSocket)var1); + class334.socketTask = null; + PacketBufferNode.method5016(2); } } PacketBufferNode var23; - if (loginState == 2) { // L: 2901 - packetWriter.clearBuffer(); // L: 2902 - var23 = class231.method4802(); // L: 2903 - var23.packetBuffer.writeByte(LoginPacket.field3032.id); // L: 2904 - packetWriter.addNode(var23); // L: 2905 - packetWriter.flush(); // L: 2906 - var2.offset = 0; // L: 2907 - PacketBufferNode.method5016(3); // L: 2908 + if (loginState == 2) { + packetWriter.clearBuffer(); + var23 = class231.method4802(); + var23.packetBuffer.writeByte(LoginPacket.field3032.id); + packetWriter.addNode(var23); + packetWriter.flush(); + var2.offset = 0; + PacketBufferNode.method5016(3); } int var4; boolean var12; - if (loginState == 3) { // L: 2910 - if (JagexCache.pcmPlayer0 != null) { // L: 2911 + if (loginState == 3) { + if (JagexCache.pcmPlayer0 != null) { JagexCache.pcmPlayer0.method747(); } - if (PacketWriter.pcmPlayer1 != null) { // L: 2912 + if (PacketWriter.pcmPlayer1 != null) { PacketWriter.pcmPlayer1.method747(); } - var12 = true; // L: 2913 - if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { // L: 2914 2915 + var12 = true; + if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { var12 = false; } - if (var12) { // L: 2917 - var4 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2918 - if (JagexCache.pcmPlayer0 != null) { // L: 2919 + if (var12) { + var4 = ((AbstractSocket)var1).readUnsignedByte(); + if (JagexCache.pcmPlayer0 != null) { JagexCache.pcmPlayer0.method747(); } - if (PacketWriter.pcmPlayer1 != null) { // L: 2920 + if (PacketWriter.pcmPlayer1 != null) { PacketWriter.pcmPlayer1.method747(); } - if (var4 != 0) { // L: 2921 - class29.getLoginError(var4); // L: 2922 - return; // L: 2923 + if (var4 != 0) { + class29.getLoginError(var4); + return; } - var2.offset = 0; // L: 2925 - PacketBufferNode.method5016(4); // L: 2926 + var2.offset = 0; + PacketBufferNode.method5016(4); } } int var34; - if (loginState == 4) { // L: 2929 - if (var2.offset < 8) { // L: 2930 - var34 = ((AbstractSocket)var1).available(); // L: 2931 - if (var34 > 8 - var2.offset) { // L: 2932 + if (loginState == 4) { + if (var2.offset < 8) { + var34 = ((AbstractSocket)var1).available(); + if (var34 > 8 - var2.offset) { var34 = 8 - var2.offset; } - if (var34 > 0) { // L: 2933 - ((AbstractSocket)var1).read(var2.array, var2.offset, var34); // L: 2934 - var2.offset += var34; // L: 2935 + if (var34 > 0) { + ((AbstractSocket)var1).read(var2.array, var2.offset, var34); + var2.offset += var34; } } - if (var2.offset == 8) { // L: 2938 - var2.offset = 0; // L: 2939 - Messages.field1272 = var2.readLong(); // L: 2940 - PacketBufferNode.method5016(5); // L: 2941 + if (var2.offset == 8) { + var2.offset = 0; + Messages.field1272 = var2.readLong(); + PacketBufferNode.method5016(5); } } int var7; int var9; int var14; - if (loginState == 5) { // L: 2944 - packetWriter.packetBuffer.offset = 0; // L: 2945 - packetWriter.clearBuffer(); // L: 2946 - PacketBuffer var24 = new PacketBuffer(500); // L: 2947 - int[] var13 = new int[]{class19.secureRandom.nextInt(), class19.secureRandom.nextInt(), class19.secureRandom.nextInt(), class19.secureRandom.nextInt()}; // L: 2948 2949 2950 2951 2952 - var24.offset = 0; // L: 2953 - var24.writeByte(1); // L: 2954 - var24.writeInt(var13[0]); // L: 2955 - var24.writeInt(var13[1]); // L: 2956 - var24.writeInt(var13[2]); // L: 2957 - var24.writeInt(var13[3]); // L: 2958 - var24.writeLong(Messages.field1272); // L: 2959 + if (loginState == 5) { + packetWriter.packetBuffer.offset = 0; + packetWriter.clearBuffer(); + PacketBuffer var24 = new PacketBuffer(500); + int[] var13 = new int[]{class19.secureRandom.nextInt(), class19.secureRandom.nextInt(), class19.secureRandom.nextInt(), class19.secureRandom.nextInt()}; + var24.offset = 0; + var24.writeByte(1); + var24.writeInt(var13[0]); + var24.writeInt(var13[1]); + var24.writeInt(var13[2]); + var24.writeInt(var13[3]); + var24.writeLong(Messages.field1272); int var10; - if (gameState == 40) { // L: 2960 - var24.writeInt(ArchiveLoader.field984[0]); // L: 2961 - var24.writeInt(ArchiveLoader.field984[1]); // L: 2962 - var24.writeInt(ArchiveLoader.field984[2]); // L: 2963 - var24.writeInt(ArchiveLoader.field984[3]); // L: 2964 + if (gameState == 40) { + var24.writeInt(ArchiveLoader.field984[0]); + var24.writeInt(ArchiveLoader.field984[1]); + var24.writeInt(ArchiveLoader.field984[2]); + var24.writeInt(ArchiveLoader.field984[3]); } else { - var24.writeByte(field507.rsOrdinal()); // L: 2967 - switch(field507.field1475) { // L: 2968 + var24.writeByte(field507.rsOrdinal()); + switch(field507.field1475) { case 0: case 3: - var24.writeMedium(class148.field1651); // L: 2972 - ++var24.offset; // L: 2973 - break; // L: 2974 + var24.writeMedium(class148.field1651); + ++var24.offset; + break; case 1: - LinkedHashMap var6 = SecureRandomFuture.clientPreferences.parameters; // L: 2984 - String var8 = Login.Login_username; // L: 2986 - var9 = var8.length(); // L: 2988 - var10 = 0; // L: 2989 + LinkedHashMap var6 = SecureRandomFuture.clientPreferences.parameters; + String var8 = Login.Login_username; + var9 = var8.length(); + var10 = 0; - for (int var11 = 0; var11 < var9; ++var11) { // L: 2990 + for (int var11 = 0; var11 < var9; ++var11) { var10 = (var10 << 5) - var10 + var8.charAt(var11); } - var24.writeInt((Integer)var6.get(var10)); // L: 2993 + var24.writeInt((Integer)var6.get(var10)); break; case 2: - var24.offset += 4; // L: 2978 + var24.offset += 4; } - if (field508.method7605()) { // L: 2997 - var24.writeByte(class422.field4524.rsOrdinal()); // L: 2998 - var24.writeStringCp1252NullTerminated(this.field576); // L: 2999 + if (field508.method7605()) { + var24.writeByte(class422.field4524.rsOrdinal()); + var24.writeStringCp1252NullTerminated(this.field576); } else { - var24.writeByte(class422.field4523.rsOrdinal()); // L: 3002 - var24.writeStringCp1252NullTerminated(Login.Login_password); // L: 3003 + var24.writeByte(class422.field4523.rsOrdinal()); + var24.writeStringCp1252NullTerminated(Login.Login_password); } } - var24.encryptRsa(class67.field856, class67.field857); // L: 3006 - ArchiveLoader.field984 = var13; // L: 3007 - PacketBufferNode var5 = class231.method4802(); // L: 3008 - var5.packetBuffer.offset = 0; // L: 3009 - if (gameState == 40) { // L: 3010 - var5.packetBuffer.writeByte(LoginPacket.field3037.id); // L: 3011 + var24.encryptRsa(class67.field856, class67.field857); + ArchiveLoader.field984 = var13; + PacketBufferNode var5 = class231.method4802(); + var5.packetBuffer.offset = 0; + if (gameState == 40) { + var5.packetBuffer.writeByte(LoginPacket.field3037.id); } else { - var5.packetBuffer.writeByte(LoginPacket.field3038.id); // L: 3014 + var5.packetBuffer.writeByte(LoginPacket.field3038.id); } - var5.packetBuffer.writeShort(0); // L: 3016 - var14 = var5.packetBuffer.offset; // L: 3017 - var5.packetBuffer.writeInt(202); // L: 3018 - var5.packetBuffer.writeInt(1); // L: 3019 - var5.packetBuffer.writeByte(clientType); // L: 3020 - var5.packetBuffer.writeByte(field499); // L: 3021 - var5.packetBuffer.writeBytes(var24.array, 0, var24.offset); // L: 3022 - var7 = var5.packetBuffer.offset; // L: 3023 - var5.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); // L: 3024 - var5.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); // L: 3025 - var5.packetBuffer.writeShort(class186.canvasWidth); // L: 3026 - var5.packetBuffer.writeShort(BoundaryObject.canvasHeight); // L: 3027 - Decimator.method1082(var5.packetBuffer); // L: 3028 - var5.packetBuffer.writeStringCp1252NullTerminated(class1.field3); // L: 3029 - var5.packetBuffer.writeInt(FriendLoginUpdate.field4096); // L: 3030 - Buffer var32 = new Buffer(Interpreter.platformInfo.size()); // L: 3031 - Interpreter.platformInfo.write(var32); // L: 3032 - var5.packetBuffer.writeBytes(var32.array, 0, var32.array.length); // L: 3033 - var5.packetBuffer.writeByte(clientType); // L: 3034 - var5.packetBuffer.writeInt(0); // L: 3035 - var5.packetBuffer.writeInt(0); // L: 3036 - var5.packetBuffer.method7407(WorldMapScaleHandler.archive6.hash); // L: 3037 - var5.packetBuffer.writeIntME(class9.archive3.hash); // L: 3038 - var5.packetBuffer.method7407(ChatChannel.archive14.hash); // L: 3039 - var5.packetBuffer.method7527(class1.archive13.hash); // L: 3040 - var5.packetBuffer.writeInt(TaskHandler.archive12.hash); // L: 3041 - var5.packetBuffer.writeInt(class148.archive19.hash); // L: 3042 - var5.packetBuffer.method7407(class133.archive15.hash); // L: 3043 - var5.packetBuffer.writeIntME(class19.archive4.hash); // L: 3044 - var5.packetBuffer.writeIntME(UserComparator6.archive8.hash); // L: 3045 - var5.packetBuffer.method7527(class126.archive17.hash); // L: 3046 - var5.packetBuffer.writeIntME(class115.archive7.hash); // L: 3047 - var5.packetBuffer.writeInt(Players.archive11.hash); // L: 3048 - var5.packetBuffer.method7407(VertexNormal.archive18.hash); // L: 3049 - var5.packetBuffer.writeInt(class140.archive5.hash); // L: 3050 - var5.packetBuffer.writeIntME(class131.archive2.hash); // L: 3051 - var5.packetBuffer.method7407(KeyHandler.archive4.hash); // L: 3052 - var5.packetBuffer.writeIntME(NetSocket.archive9.hash); // L: 3053 - var5.packetBuffer.writeInt(class257.archive10.hash); // L: 3054 - var5.packetBuffer.method7407(HealthBarUpdate.archive20.hash); // L: 3055 - var5.packetBuffer.method7407(class115.archive1.hash); // L: 3056 - var5.packetBuffer.xteaEncrypt(var13, var7, var5.packetBuffer.offset); // L: 3057 - var5.packetBuffer.writeLengthShort(var5.packetBuffer.offset - var14); // L: 3058 - packetWriter.addNode(var5); // L: 3059 - packetWriter.flush(); // L: 3060 - packetWriter.isaacCipher = new IsaacCipher(var13); // L: 3061 - int[] var15 = new int[4]; // L: 3062 + var5.packetBuffer.writeShort(0); + var14 = var5.packetBuffer.offset; + var5.packetBuffer.writeInt(202); + var5.packetBuffer.writeInt(1); + var5.packetBuffer.writeByte(clientType); + var5.packetBuffer.writeByte(field499); + var5.packetBuffer.writeBytes(var24.array, 0, var24.offset); + var7 = var5.packetBuffer.offset; + var5.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); + var5.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); + var5.packetBuffer.writeShort(class186.canvasWidth); + var5.packetBuffer.writeShort(BoundaryObject.canvasHeight); + Decimator.method1082(var5.packetBuffer); + var5.packetBuffer.writeStringCp1252NullTerminated(class1.field3); + var5.packetBuffer.writeInt(FriendLoginUpdate.field4096); + Buffer var32 = new Buffer(Interpreter.platformInfo.size()); + Interpreter.platformInfo.write(var32); + var5.packetBuffer.writeBytes(var32.array, 0, var32.array.length); + var5.packetBuffer.writeByte(clientType); + var5.packetBuffer.writeInt(0); + var5.packetBuffer.writeInt(0); + var5.packetBuffer.method7407(WorldMapScaleHandler.archive6.hash); + var5.packetBuffer.writeIntME(class9.archive3.hash); + var5.packetBuffer.method7407(ChatChannel.archive14.hash); + var5.packetBuffer.method7527(class1.archive13.hash); + var5.packetBuffer.writeInt(TaskHandler.archive12.hash); + var5.packetBuffer.writeInt(class148.archive19.hash); + var5.packetBuffer.method7407(class133.archive15.hash); + var5.packetBuffer.writeIntME(class19.archive4.hash); + var5.packetBuffer.writeIntME(UserComparator6.archive8.hash); + var5.packetBuffer.method7527(class126.archive17.hash); + var5.packetBuffer.writeIntME(class115.archive7.hash); + var5.packetBuffer.writeInt(Players.archive11.hash); + var5.packetBuffer.method7407(VertexNormal.archive18.hash); + var5.packetBuffer.writeInt(class140.archive5.hash); + var5.packetBuffer.writeIntME(class131.archive2.hash); + var5.packetBuffer.method7407(KeyHandler.field151.hash); + var5.packetBuffer.writeIntME(NetSocket.archive9.hash); + var5.packetBuffer.writeInt(class257.archive10.hash); + var5.packetBuffer.method7407(HealthBarUpdate.archive20.hash); + var5.packetBuffer.method7407(class115.archive1.hash); + var5.packetBuffer.xteaEncrypt(var13, var7, var5.packetBuffer.offset); + var5.packetBuffer.writeLengthShort(var5.packetBuffer.offset - var14); + packetWriter.addNode(var5); + packetWriter.flush(); + packetWriter.isaacCipher = new IsaacCipher(var13); + int[] var15 = new int[4]; - for (var10 = 0; var10 < 4; ++var10) { // L: 3063 + for (var10 = 0; var10 < 4; ++var10) { var15[var10] = var13[var10] + 50; } - var2.newIsaacCipher(var15); // L: 3064 - PacketBufferNode.method5016(6); // L: 3065 + var2.newIsaacCipher(var15); + PacketBufferNode.method5016(6); } - if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { // L: 3067 3068 - var34 = ((AbstractSocket)var1).readUnsignedByte(); // L: 3069 - if (var34 == 21 && gameState == 20) { // L: 3070 - PacketBufferNode.method5016(12); // L: 3071 - } else if (var34 == 2) { // L: 3073 - PacketBufferNode.method5016(14); // L: 3074 - } else if (var34 == 15 && gameState == 40) { // L: 3076 - packetWriter.serverPacketLength = -1; // L: 3077 - PacketBufferNode.method5016(19); // L: 3078 - } else if (var34 == 64) { // L: 3080 - PacketBufferNode.method5016(10); // L: 3081 - } else if (var34 == 23 && field541 < 1) { // L: 3083 - ++field541; // L: 3084 - PacketBufferNode.method5016(0); // L: 3085 - } else if (var34 == 29) { // L: 3087 - PacketBufferNode.method5016(17); // L: 3088 + if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { + var34 = ((AbstractSocket)var1).readUnsignedByte(); + if (var34 == 21 && gameState == 20) { + PacketBufferNode.method5016(12); + } else if (var34 == 2) { + PacketBufferNode.method5016(14); + } else if (var34 == 15 && gameState == 40) { + packetWriter.serverPacketLength = -1; + PacketBufferNode.method5016(19); + } else if (var34 == 64) { + PacketBufferNode.method5016(10); + } else if (var34 == 23 && field541 < 1) { + ++field541; + PacketBufferNode.method5016(0); + } else if (var34 == 29) { + PacketBufferNode.method5016(17); } else { - if (var34 != 69) { // L: 3090 - class29.getLoginError(var34); // L: 3094 - return; // L: 3095 + if (var34 != 69) { + class29.getLoginError(var34); + return; } - PacketBufferNode.method5016(7); // L: 3091 + PacketBufferNode.method5016(7); } } - if (loginState == 7 && ((AbstractSocket)var1).available() >= 2) { // L: 3099 3100 - ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 3101 - var2.offset = 0; // L: 3102 - WorldMapSection2.field2601 = var2.readUnsignedShort(); // L: 3103 - PacketBufferNode.method5016(8); // L: 3104 + if (loginState == 7 && ((AbstractSocket)var1).available() >= 2) { + ((AbstractSocket)var1).read(var2.array, 0, 2); + var2.offset = 0; + WorldMapSection2.field2601 = var2.readUnsignedShort(); + PacketBufferNode.method5016(8); } - if (loginState == 8 && ((AbstractSocket)var1).available() >= WorldMapSection2.field2601) { // L: 3107 3108 - var2.offset = 0; // L: 3109 - ((AbstractSocket)var1).read(var2.array, var2.offset, WorldMapSection2.field2601); // L: 3110 - class6 var25 = FontName.method7075()[var2.readUnsignedByte()]; // L: 3111 + if (loginState == 8 && ((AbstractSocket)var1).available() >= WorldMapSection2.field2601) { + var2.offset = 0; + ((AbstractSocket)var1).read(var2.array, var2.offset, WorldMapSection2.field2601); + class6 var25 = FontName.method7075()[var2.readUnsignedByte()]; try { - class3 var35 = KitDefinition.method3238(var25); // L: 3113 - this.field515 = new class7(var2, var35); // L: 3114 - PacketBufferNode.method5016(9); // L: 3115 - } catch (Exception var20) { // L: 3117 - class29.getLoginError(22); // L: 3118 - return; // L: 3119 + class3 var35 = KitDefinition.method3238(var25); + this.field515 = new class7(var2, var35); + PacketBufferNode.method5016(9); + } catch (Exception var20) { + class29.getLoginError(22); + return; } } - if (loginState == 9 && this.field515.method61()) { // L: 3123 3124 - this.field710 = this.field515.method75(); // L: 3125 - this.field515.method65(); // L: 3126 - this.field515 = null; // L: 3127 - if (this.field710 == null) { // L: 3128 - class29.getLoginError(22); // L: 3129 - return; // L: 3130 + if (loginState == 9 && this.field515.method61()) { + this.field710 = this.field515.method75(); + this.field515.method65(); + this.field515 = null; + if (this.field710 == null) { + class29.getLoginError(22); + return; } - packetWriter.clearBuffer(); // L: 3132 - var23 = class231.method4802(); // L: 3133 - var23.packetBuffer.writeByte(LoginPacket.field3034.id); // L: 3134 - var23.packetBuffer.writeShort(this.field710.offset); // L: 3135 - var23.packetBuffer.method7356(this.field710); // L: 3136 - packetWriter.addNode(var23); // L: 3137 - packetWriter.flush(); // L: 3138 - this.field710 = null; // L: 3139 - PacketBufferNode.method5016(6); // L: 3140 + packetWriter.clearBuffer(); + var23 = class231.method4802(); + var23.packetBuffer.writeByte(LoginPacket.field3034.id); + var23.packetBuffer.writeShort(this.field710.offset); + var23.packetBuffer.method7356(this.field710); + packetWriter.addNode(var23); + packetWriter.flush(); + this.field710 = null; + PacketBufferNode.method5016(6); } - if (loginState == 10 && ((AbstractSocket)var1).available() > 0) { // L: 3143 3144 - class10.field59 = ((AbstractSocket)var1).readUnsignedByte(); // L: 3145 - PacketBufferNode.method5016(11); // L: 3146 + if (loginState == 10 && ((AbstractSocket)var1).available() > 0) { + class10.field59 = ((AbstractSocket)var1).readUnsignedByte(); + PacketBufferNode.method5016(11); } - if (loginState == 11 && ((AbstractSocket)var1).available() >= class10.field59) { // L: 3149 3150 - ((AbstractSocket)var1).read(var2.array, 0, class10.field59); // L: 3151 - var2.offset = 0; // L: 3152 - PacketBufferNode.method5016(6); // L: 3153 + if (loginState == 11 && ((AbstractSocket)var1).available() >= class10.field59) { + ((AbstractSocket)var1).read(var2.array, 0, class10.field59); + var2.offset = 0; + PacketBufferNode.method5016(6); } - if (loginState == 12 && ((AbstractSocket)var1).available() > 0) { // L: 3156 3157 - field506 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; // L: 3158 - PacketBufferNode.method5016(13); // L: 3159 + if (loginState == 12 && ((AbstractSocket)var1).available() > 0) { + field506 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; + PacketBufferNode.method5016(13); } - if (loginState == 13) { // L: 3162 - field545 = 0; // L: 3163 - class19.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field506 / 60 + " seconds."); // L: 3164 - if (--field506 <= 0) { // L: 3165 + if (loginState == 13) { + field545 = 0; + class19.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field506 / 60 + " seconds."); + if (--field506 <= 0) { PacketBufferNode.method5016(0); } } else { - if (loginState == 14 && ((AbstractSocket)var1).available() >= 1) { // L: 3168 3169 - Canvas.field163 = ((AbstractSocket)var1).readUnsignedByte(); // L: 3170 - PacketBufferNode.method5016(15); // L: 3171 + if (loginState == 14 && ((AbstractSocket)var1).available() >= 1) { + Canvas.field163 = ((AbstractSocket)var1).readUnsignedByte(); + PacketBufferNode.method5016(15); } - if (loginState == 15 && ((AbstractSocket)var1).available() >= Canvas.field163) { // L: 3174 3175 - var12 = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 3176 - ((AbstractSocket)var1).read(var2.array, 0, 4); // L: 3177 - var2.offset = 0; // L: 3178 - boolean var26 = false; // L: 3179 - if (var12) { // L: 3180 - var4 = var2.readByteIsaac() << 24; // L: 3181 - var4 |= var2.readByteIsaac() << 16; // L: 3182 - var4 |= var2.readByteIsaac() << 8; // L: 3183 - var4 |= var2.readByteIsaac(); // L: 3184 - String var31 = Login.Login_username; // L: 3186 - var7 = var31.length(); // L: 3188 - int var16 = 0; // L: 3189 - var9 = 0; // L: 3190 + if (loginState == 15 && ((AbstractSocket)var1).available() >= Canvas.field163) { + var12 = ((AbstractSocket)var1).readUnsignedByte() == 1; + ((AbstractSocket)var1).read(var2.array, 0, 4); + var2.offset = 0; + boolean var26 = false; + if (var12) { + var4 = var2.readByteIsaac() << 24; + var4 |= var2.readByteIsaac() << 16; + var4 |= var2.readByteIsaac() << 8; + var4 |= var2.readByteIsaac(); + String var31 = Login.Login_username; + var7 = var31.length(); + int var16 = 0; + var9 = 0; while (true) { if (var9 >= var7) { - if (SecureRandomFuture.clientPreferences.parameters.size() >= 10 && !SecureRandomFuture.clientPreferences.parameters.containsKey(var16)) { // L: 3194 3195 - Iterator var33 = SecureRandomFuture.clientPreferences.parameters.entrySet().iterator(); // L: 3196 - var33.next(); // L: 3197 - var33.remove(); // L: 3198 + if (SecureRandomFuture.clientPreferences.parameters.size() >= 10 && !SecureRandomFuture.clientPreferences.parameters.containsKey(var16)) { + Iterator var33 = SecureRandomFuture.clientPreferences.parameters.entrySet().iterator(); + var33.next(); + var33.remove(); } - SecureRandomFuture.clientPreferences.parameters.put(var16, var4); // L: 3201 + SecureRandomFuture.clientPreferences.parameters.put(var16, var4); break; } @@ -3577,244 +3577,244 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { } } - if (Login_isUsernameRemembered) { // L: 3203 - SecureRandomFuture.clientPreferences.rememberedUsername = Login.Login_username; // L: 3204 + if (Login_isUsernameRemembered) { + SecureRandomFuture.clientPreferences.rememberedUsername = Login.Login_username; } else { - SecureRandomFuture.clientPreferences.rememberedUsername = null; // L: 3207 + SecureRandomFuture.clientPreferences.rememberedUsername = null; } - class127.savePreferences(); // L: 3209 - staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); // L: 3210 - playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 3211 - localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); // L: 3212 - localPlayerIndex <<= 8; // L: 3213 - localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); // L: 3214 - field594 = ((AbstractSocket)var1).readUnsignedByte(); // L: 3215 - ((AbstractSocket)var1).read(var2.array, 0, 1); // L: 3216 - var2.offset = 0; // L: 3217 - ServerPacket[] var28 = class129.ServerPacket_values(); // L: 3218 - var14 = var2.readSmartByteShortIsaac(); // L: 3219 - if (var14 < 0 || var14 >= var28.length) { // L: 3220 + class127.savePreferences(); + staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); + playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; + localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); + localPlayerIndex <<= 8; + localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); + field594 = ((AbstractSocket)var1).readUnsignedByte(); + ((AbstractSocket)var1).read(var2.array, 0, 1); + var2.offset = 0; + ServerPacket[] var28 = class129.ServerPacket_values(); + var14 = var2.readSmartByteShortIsaac(); + if (var14 < 0 || var14 >= var28.length) { throw new IOException(var14 + " " + var2.offset); } - packetWriter.serverPacket = var28[var14]; // L: 3221 - packetWriter.serverPacketLength = packetWriter.serverPacket.length; // L: 3222 - ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 3223 - var2.offset = 0; // L: 3224 - packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 3225 + packetWriter.serverPacket = var28[var14]; + packetWriter.serverPacketLength = packetWriter.serverPacket.length; + ((AbstractSocket)var1).read(var2.array, 0, 2); + var2.offset = 0; + packetWriter.serverPacketLength = var2.readUnsignedShort(); try { - Client var18 = class295.client; // L: 3227 - JSObject.getWindow(var18).call("zap", (Object[])null); // L: 3230 - } catch (Throwable var19) { // L: 3233 + Client var18 = class295.client; + JSObject.getWindow(var18).call("zap", (Object[])null); + } catch (Throwable var19) { } - PacketBufferNode.method5016(16); // L: 3234 + PacketBufferNode.method5016(16); } - if (loginState != 16) { // L: 3237 - if (loginState == 17 && ((AbstractSocket)var1).available() >= 2) { // L: 3350 3351 - var2.offset = 0; // L: 3352 - ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 3353 - var2.offset = 0; // L: 3354 - class126.field1497 = var2.readUnsignedShort(); // L: 3355 - PacketBufferNode.method5016(18); // L: 3356 + if (loginState != 16) { + if (loginState == 17 && ((AbstractSocket)var1).available() >= 2) { + var2.offset = 0; + ((AbstractSocket)var1).read(var2.array, 0, 2); + var2.offset = 0; + class126.field1497 = var2.readUnsignedShort(); + PacketBufferNode.method5016(18); } - if (loginState == 18 && ((AbstractSocket)var1).available() >= class126.field1497) { // L: 3359 3360 - var2.offset = 0; // L: 3361 - ((AbstractSocket)var1).read(var2.array, 0, class126.field1497); // L: 3362 - var2.offset = 0; // L: 3363 - String var29 = var2.readStringCp1252NullTerminated(); // L: 3364 - String var37 = var2.readStringCp1252NullTerminated(); // L: 3365 - String var30 = var2.readStringCp1252NullTerminated(); // L: 3366 - class19.setLoginResponseString(var29, var37, var30); // L: 3367 - VertexNormal.updateGameState(10); // L: 3368 + if (loginState == 18 && ((AbstractSocket)var1).available() >= class126.field1497) { + var2.offset = 0; + ((AbstractSocket)var1).read(var2.array, 0, class126.field1497); + var2.offset = 0; + String var29 = var2.readStringCp1252NullTerminated(); + String var37 = var2.readStringCp1252NullTerminated(); + String var30 = var2.readStringCp1252NullTerminated(); + class19.setLoginResponseString(var29, var37, var30); + VertexNormal.updateGameState(10); } - if (loginState == 19) { // L: 3371 - if (packetWriter.serverPacketLength == -1) { // L: 3372 - if (((AbstractSocket)var1).available() < 2) { // L: 3373 + if (loginState == 19) { + if (packetWriter.serverPacketLength == -1) { + if (((AbstractSocket)var1).available() < 2) { return; } - ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 3374 - var2.offset = 0; // L: 3375 - packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 3376 + ((AbstractSocket)var1).read(var2.array, 0, 2); + var2.offset = 0; + packetWriter.serverPacketLength = var2.readUnsignedShort(); } - if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 3378 - ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 3379 - var2.offset = 0; // L: 3380 - var34 = packetWriter.serverPacketLength; // L: 3381 - timer.method6244(); // L: 3382 - class116.method2662(); // L: 3383 - HorizontalAlignment.updatePlayer(var2); // L: 3384 - if (var34 != var2.offset) { // L: 3385 - throw new RuntimeException(); // L: 3386 + if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { + ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); + var2.offset = 0; + var34 = packetWriter.serverPacketLength; + timer.method6244(); + class116.method2662(); + HorizontalAlignment.updatePlayer(var2); + if (var34 != var2.offset) { + throw new RuntimeException(); } } } else { - ++field545; // L: 3390 - if (field545 > 2000) { // L: 3391 - if (field541 < 1) { // L: 3392 - if (GameObject.worldPort == class129.currentPort) { // L: 3393 + ++field545; + if (field545 > 2000) { + if (field541 < 1) { + if (GameObject.worldPort == class129.currentPort) { class129.currentPort = class133.js5Port; } else { - class129.currentPort = GameObject.worldPort; // L: 3394 + class129.currentPort = GameObject.worldPort; } - ++field541; // L: 3395 - PacketBufferNode.method5016(0); // L: 3396 + ++field541; + PacketBufferNode.method5016(0); } else { - class29.getLoginError(-3); // L: 3399 + class29.getLoginError(-3); } } } } else { - if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 3238 - var2.offset = 0; // L: 3239 - ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 3240 - timer.method6234(); // L: 3241 - mouseLastLastPressedTimeMillis = -1L; // L: 3244 - mouseRecorder.index = 0; // L: 3245 - World.hasFocus = true; // L: 3246 - hadFocus = true; // L: 3247 - field676 = -1L; // L: 3248 - class33.reflectionChecks = new IterableNodeDeque(); // L: 3250 - packetWriter.clearBuffer(); // L: 3252 - packetWriter.packetBuffer.offset = 0; // L: 3253 - packetWriter.serverPacket = null; // L: 3254 - packetWriter.field1289 = null; // L: 3255 - packetWriter.field1290 = null; // L: 3256 - packetWriter.field1291 = null; // L: 3257 - packetWriter.serverPacketLength = 0; // L: 3258 - packetWriter.field1287 = 0; // L: 3259 - rebootTimer = 0; // L: 3260 - logoutTimer = 0; // L: 3261 - hintArrowType = 0; // L: 3262 - UrlRequest.method2489(); // L: 3263 - class123.method2746(0); // L: 3264 - class123.method2745(); // L: 3265 - isItemSelected = 0; // L: 3266 - isSpellSelected = false; // L: 3267 - soundEffectCount = 0; // L: 3268 - camAngleY = 0; // L: 3269 - oculusOrbState = 0; // L: 3270 - Messages.field1273 = null; // L: 3271 - minimapState = 0; // L: 3272 - field570 = -1; // L: 3273 - destinationX = 0; // L: 3274 - destinationY = 0; // L: 3275 - playerAttackOption = AttackOption.AttackOption_hidden; // L: 3276 - npcAttackOption = AttackOption.AttackOption_hidden; // L: 3277 - npcCount = 0; // L: 3278 - Players.Players_count = 0; // L: 3280 + if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { + var2.offset = 0; + ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); + timer.method6234(); + mouseLastLastPressedTimeMillis = -1L; + mouseRecorder.index = 0; + World.hasFocus = true; + hadFocus = true; + field676 = -1L; + class33.reflectionChecks = new IterableNodeDeque(); + packetWriter.clearBuffer(); + packetWriter.packetBuffer.offset = 0; + packetWriter.serverPacket = null; + packetWriter.field1289 = null; + packetWriter.field1290 = null; + packetWriter.field1291 = null; + packetWriter.serverPacketLength = 0; + packetWriter.field1287 = 0; + rebootTimer = 0; + logoutTimer = 0; + hintArrowType = 0; + UrlRequest.method2489(); + class123.method2746(0); + class123.method2745(); + isItemSelected = 0; + isSpellSelected = false; + soundEffectCount = 0; + camAngleY = 0; + oculusOrbState = 0; + Messages.field1273 = null; + minimapState = 0; + field570 = -1; + destinationX = 0; + destinationY = 0; + playerAttackOption = AttackOption.AttackOption_hidden; + npcAttackOption = AttackOption.AttackOption_hidden; + npcCount = 0; + Players.Players_count = 0; - for (var34 = 0; var34 < 2048; ++var34) { // L: 3281 - Players.field1248[var34] = null; // L: 3282 - Players.field1246[var34] = class185.field2123; // L: 3283 + for (var34 = 0; var34 < 2048; ++var34) { + Players.field1248[var34] = null; + Players.field1246[var34] = class185.field2123; } - for (var34 = 0; var34 < 2048; ++var34) { // L: 3286 + for (var34 = 0; var34 < 2048; ++var34) { players[var34] = null; } - for (var34 = 0; var34 < 32768; ++var34) { // L: 3287 + for (var34 = 0; var34 < 32768; ++var34) { npcs[var34] = null; } - combatTargetPlayerIndex = -1; // L: 3288 - projectiles.clear(); // L: 3289 - graphicsObjects.clear(); // L: 3290 + combatTargetPlayerIndex = -1; + projectiles.clear(); + graphicsObjects.clear(); - for (var34 = 0; var34 < 4; ++var34) { // L: 3291 - for (var4 = 0; var4 < 104; ++var4) { // L: 3292 - for (int var17 = 0; var17 < 104; ++var17) { // L: 3293 - groundItems[var34][var4][var17] = null; // L: 3294 + for (var34 = 0; var34 < 4; ++var34) { + for (var4 = 0; var4 < 104; ++var4) { + for (int var17 = 0; var17 < 104; ++var17) { + groundItems[var34][var4][var17] = null; } } } - pendingSpawns = new NodeDeque(); // L: 3298 - GameEngine.friendSystem.clear(); // L: 3299 + pendingSpawns = new NodeDeque(); + GameEngine.friendSystem.clear(); - for (var34 = 0; var34 < class433.VarpDefinition_fileCount; ++var34) { // L: 3300 - VarpDefinition var36 = SecureRandomCallable.VarpDefinition_get(var34); // L: 3301 - if (var36 != null) { // L: 3302 - Varps.Varps_temp[var34] = 0; // L: 3303 - Varps.Varps_main[var34] = 0; // L: 3304 + for (var34 = 0; var34 < class433.VarpDefinition_fileCount; ++var34) { + VarpDefinition var36 = SecureRandomCallable.VarpDefinition_get(var34); + if (var36 != null) { + Varps.Varps_temp[var34] = 0; + Varps.Varps_main[var34] = 0; } } - class339.varcs.clearTransient(); // L: 3307 - followerIndex = -1; // L: 3308 - if (rootInterface != -1) { // L: 3309 + class339.varcs.clearTransient(); + followerIndex = -1; + if (rootInterface != -1) { class273.method5333(rootInterface); } - for (InterfaceParent var27 = (InterfaceParent)interfaceParents.first(); var27 != null; var27 = (InterfaceParent)interfaceParents.next()) { // L: 3310 - class10.closeInterface(var27, true); // L: 3311 + for (InterfaceParent var27 = (InterfaceParent)interfaceParents.first(); var27 != null; var27 = (InterfaceParent)interfaceParents.next()) { + class10.closeInterface(var27, true); } - rootInterface = -1; // L: 3313 - interfaceParents = new NodeHashTable(8); // L: 3314 - meslayerContinueWidget = null; // L: 3315 - UrlRequest.method2489(); // L: 3316 - playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); // L: 3317 + rootInterface = -1; + interfaceParents = new NodeHashTable(8); + meslayerContinueWidget = null; + UrlRequest.method2489(); + playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); - for (var34 = 0; var34 < 8; ++var34) { // L: 3318 - playerMenuActions[var34] = null; // L: 3319 - playerOptionsPriorities[var34] = false; // L: 3320 + for (var34 = 0; var34 < 8; ++var34) { + playerMenuActions[var34] = null; + playerOptionsPriorities[var34] = false; } - ItemContainer.itemContainers = new NodeHashTable(32); // L: 3323 - isLoading = true; // L: 3325 + ItemContainer.itemContainers = new NodeHashTable(32); + isLoading = true; - for (var34 = 0; var34 < 100; ++var34) { // L: 3326 + for (var34 = 0; var34 < 100; ++var34) { field504[var34] = true; } - var23 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2824, packetWriter.isaacCipher); // L: 3329 - var23.packetBuffer.writeByte(class143.getWindowedMode()); // L: 3330 - var23.packetBuffer.writeShort(class186.canvasWidth); // L: 3331 - var23.packetBuffer.writeShort(BoundaryObject.canvasHeight); // L: 3332 - packetWriter.addNode(var23); // L: 3333 - Players.friendsChat = null; // L: 3335 - class222.guestClanSettings = null; // L: 3336 - Arrays.fill(currentClanSettings, (Object)null); // L: 3337 - UserComparator5.guestClanChannel = null; // L: 3338 - Arrays.fill(currentClanChannels, (Object)null); // L: 3339 + var23 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2824, packetWriter.isaacCipher); + var23.packetBuffer.writeByte(class143.getWindowedMode()); + var23.packetBuffer.writeShort(class186.canvasWidth); + var23.packetBuffer.writeShort(BoundaryObject.canvasHeight); + packetWriter.addNode(var23); + Players.friendsChat = null; + class222.guestClanSettings = null; + Arrays.fill(currentClanSettings, (Object)null); + UserComparator5.guestClanChannel = null; + Arrays.fill(currentClanChannels, (Object)null); - for (var34 = 0; var34 < 8; ++var34) { // L: 3340 + for (var34 = 0; var34 < 8; ++var34) { grandExchangeOffers[var34] = new GrandExchangeOffer(); } - grandExchangeEvents = null; // L: 3341 - HorizontalAlignment.updatePlayer(var2); // L: 3343 - Messages.field1277 = -1; // L: 3344 - DevicePcmPlayerProvider.loadRegions(false, var2); // L: 3345 - packetWriter.serverPacket = null; // L: 3346 + grandExchangeEvents = null; + HorizontalAlignment.updatePlayer(var2); + Messages.field1277 = -1; + DevicePcmPlayerProvider.loadRegions(false, var2); + packetWriter.serverPacket = null; } } } - } catch (IOException var22) { // L: 3403 - if (field541 < 1) { // L: 3404 - if (class129.currentPort == GameObject.worldPort) { // L: 3405 + } catch (IOException var22) { + if (field541 < 1) { + if (class129.currentPort == GameObject.worldPort) { class129.currentPort = class133.js5Port; } else { - class129.currentPort = GameObject.worldPort; // L: 3406 + class129.currentPort = GameObject.worldPort; } - ++field541; // L: 3407 - PacketBufferNode.method5016(0); // L: 3408 + ++field541; + PacketBufferNode.method5016(0); } else { - class29.getLoginError(-2); // L: 3411 + class29.getLoginError(-2); } } - } // L: 3166 3348 3388 3397 3400 3409 3412 3414 + } @ObfuscatedName("fo") @ObfuscatedSignature( @@ -3823,49 +3823,49 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { ) @Export("doCycleLoggedIn") final void doCycleLoggedIn() { - if (rebootTimer > 1) { // L: 3676 + if (rebootTimer > 1) { --rebootTimer; } - if (logoutTimer > 0) { // L: 3677 + if (logoutTimer > 0) { --logoutTimer; } - if (hadNetworkError) { // L: 3678 - hadNetworkError = false; // L: 3679 - Varcs.method2411(); // L: 3680 + if (hadNetworkError) { + hadNetworkError = false; + Varcs.method2411(); } else { - if (!isMenuOpen) { // L: 3683 + if (!isMenuOpen) { WorldMapElement.addCancelMenuEntry(); } int var1; - for (var1 = 0; var1 < 100 && this.method1394(packetWriter); ++var1) { // L: 3684 3685 + for (var1 = 0; var1 < 100 && this.method1394(packetWriter); ++var1) { } - if (gameState == 30) { // L: 3687 + if (gameState == 30) { while (true) { - ReflectionCheck var2 = (ReflectionCheck)class33.reflectionChecks.last(); // L: 3691 + ReflectionCheck var2 = (ReflectionCheck)class33.reflectionChecks.last(); boolean var30; - if (var2 == null) { // L: 3692 - var30 = false; // L: 3693 + if (var2 == null) { + var30 = false; } else { - var30 = true; // L: 3696 + var30 = true; } int var3; PacketBufferNode var31; - if (!var30) { // L: 3698 + if (!var30) { PacketBufferNode var14; int var15; - if (timer.field4043) { // L: 3706 - var14 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2907, packetWriter.isaacCipher); // L: 3708 - var14.packetBuffer.writeByte(0); // L: 3709 - var15 = var14.packetBuffer.offset; // L: 3710 - timer.write(var14.packetBuffer); // L: 3711 - var14.packetBuffer.method7357(var14.packetBuffer.offset - var15); // L: 3712 - packetWriter.addNode(var14); // L: 3713 - timer.method6238(); // L: 3714 + if (timer.field4043) { + var14 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2907, packetWriter.isaacCipher); + var14.packetBuffer.writeByte(0); + var15 = var14.packetBuffer.offset; + timer.write(var14.packetBuffer); + var14.packetBuffer.method7357(var14.packetBuffer.offset - var15); + packetWriter.addNode(var14); + timer.method6238(); } int var4; @@ -3878,761 +3878,761 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { int var11; int var12; PacketBuffer var10000; - synchronized(mouseRecorder.lock) { // L: 3717 - if (!field713) { // L: 3718 - mouseRecorder.index = 0; // L: 3804 - } else if (MouseHandler.MouseHandler_lastButton != 0 || mouseRecorder.index >= 40) { // L: 3719 - var31 = null; // L: 3721 - var3 = 0; // L: 3722 - var4 = 0; // L: 3723 - var5 = 0; // L: 3724 - var6 = 0; // L: 3725 + synchronized(mouseRecorder.lock) { + if (!field713) { + mouseRecorder.index = 0; + } else if (MouseHandler.MouseHandler_lastButton != 0 || mouseRecorder.index >= 40) { + var31 = null; + var3 = 0; + var4 = 0; + var5 = 0; + var6 = 0; - for (var7 = 0; var7 < mouseRecorder.index && (var31 == null || var31.packetBuffer.offset - var3 < 246); ++var7) { // L: 3726 3727 - var4 = var7; // L: 3728 - var8 = mouseRecorder.ys[var7]; // L: 3729 - if (var8 < -1) { // L: 3730 + for (var7 = 0; var7 < mouseRecorder.index && (var31 == null || var31.packetBuffer.offset - var3 < 246); ++var7) { + var4 = var7; + var8 = mouseRecorder.ys[var7]; + if (var8 < -1) { var8 = -1; - } else if (var8 > 65534) { // L: 3731 + } else if (var8 > 65534) { var8 = 65534; } - var9 = mouseRecorder.xs[var7]; // L: 3732 - if (var9 < -1) { // L: 3733 + var9 = mouseRecorder.xs[var7]; + if (var9 < -1) { var9 = -1; - } else if (var9 > 65534) { // L: 3734 + } else if (var9 > 65534) { var9 = 65534; } - if (var9 != field483 || var8 != field746) { // L: 3735 - if (var31 == null) { // L: 3738 - var31 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2889, packetWriter.isaacCipher); // L: 3739 - var31.packetBuffer.writeByte(0); // L: 3740 - var3 = var31.packetBuffer.offset; // L: 3741 - var10000 = var31.packetBuffer; // L: 3742 + if (var9 != field483 || var8 != field746) { + if (var31 == null) { + var31 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2889, packetWriter.isaacCipher); + var31.packetBuffer.writeByte(0); + var3 = var31.packetBuffer.offset; + var10000 = var31.packetBuffer; var10000.offset += 2; - var5 = 0; // L: 3743 - var6 = 0; // L: 3744 + var5 = 0; + var6 = 0; } - if (field485 != -1L) { // L: 3749 - var10 = var9 - field483; // L: 3750 - var11 = var8 - field746; // L: 3751 - var12 = (int)((mouseRecorder.millis[var7] - field485) / 20L); // L: 3752 - var5 = (int)((long)var5 + (mouseRecorder.millis[var7] - field485) % 20L); // L: 3753 + if (field485 != -1L) { + var10 = var9 - field483; + var11 = var8 - field746; + var12 = (int)((mouseRecorder.millis[var7] - field485) / 20L); + var5 = (int)((long)var5 + (mouseRecorder.millis[var7] - field485) % 20L); } else { - var10 = var9; // L: 3756 - var11 = var8; // L: 3757 - var12 = Integer.MAX_VALUE; // L: 3758 + var10 = var9; + var11 = var8; + var12 = Integer.MAX_VALUE; } - field483 = var9; // L: 3760 - field746 = var8; // L: 3761 - if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { // L: 3762 - var10 += 32; // L: 3763 - var11 += 32; // L: 3764 - var31.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); // L: 3765 - } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { // L: 3767 - var10 += 128; // L: 3768 - var11 += 128; // L: 3769 - var31.packetBuffer.writeByte(var12 + 128); // L: 3770 - var31.packetBuffer.writeShort(var11 + (var10 << 8)); // L: 3771 - } else if (var12 < 32) { // L: 3773 - var31.packetBuffer.writeByte(var12 + 192); // L: 3774 - if (var9 != -1 && var8 != -1) { // L: 3775 - var31.packetBuffer.writeInt(var9 | var8 << 16); // L: 3776 + field483 = var9; + field746 = var8; + if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { + var10 += 32; + var11 += 32; + var31.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); + } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { + var10 += 128; + var11 += 128; + var31.packetBuffer.writeByte(var12 + 128); + var31.packetBuffer.writeShort(var11 + (var10 << 8)); + } else if (var12 < 32) { + var31.packetBuffer.writeByte(var12 + 192); + if (var9 != -1 && var8 != -1) { + var31.packetBuffer.writeInt(var9 | var8 << 16); } else { var31.packetBuffer.writeInt(Integer.MIN_VALUE); } } else { - var31.packetBuffer.writeShort((var12 & 8191) + 57344); // L: 3779 - if (var9 != -1 && var8 != -1) { // L: 3780 - var31.packetBuffer.writeInt(var9 | var8 << 16); // L: 3781 + var31.packetBuffer.writeShort((var12 & 8191) + 57344); + if (var9 != -1 && var8 != -1) { + var31.packetBuffer.writeInt(var9 | var8 << 16); } else { var31.packetBuffer.writeInt(Integer.MIN_VALUE); } } - ++var6; // L: 3783 - field485 = mouseRecorder.millis[var7]; // L: 3784 + ++var6; + field485 = mouseRecorder.millis[var7]; } } - if (var31 != null) { // L: 3786 - var31.packetBuffer.method7357(var31.packetBuffer.offset - var3); // L: 3787 - var7 = var31.packetBuffer.offset; // L: 3788 - var31.packetBuffer.offset = var3; // L: 3789 - var31.packetBuffer.writeByte(var5 / var6); // L: 3790 - var31.packetBuffer.writeByte(var5 % var6); // L: 3791 - var31.packetBuffer.offset = var7; // L: 3792 - packetWriter.addNode(var31); // L: 3793 + if (var31 != null) { + var31.packetBuffer.method7357(var31.packetBuffer.offset - var3); + var7 = var31.packetBuffer.offset; + var31.packetBuffer.offset = var3; + var31.packetBuffer.writeByte(var5 / var6); + var31.packetBuffer.writeByte(var5 % var6); + var31.packetBuffer.offset = var7; + packetWriter.addNode(var31); } - if (var4 >= mouseRecorder.index) { // L: 3795 + if (var4 >= mouseRecorder.index) { mouseRecorder.index = 0; } else { - MouseRecorder var43 = mouseRecorder; // L: 3797 + MouseRecorder var43 = mouseRecorder; var43.index -= var4; - System.arraycopy(mouseRecorder.xs, var4, mouseRecorder.xs, 0, mouseRecorder.index); // L: 3798 - System.arraycopy(mouseRecorder.ys, var4, mouseRecorder.ys, 0, mouseRecorder.index); // L: 3799 - System.arraycopy(mouseRecorder.millis, var4, mouseRecorder.millis, 0, mouseRecorder.index); // L: 3800 + System.arraycopy(mouseRecorder.xs, var4, mouseRecorder.xs, 0, mouseRecorder.index); + System.arraycopy(mouseRecorder.ys, var4, mouseRecorder.ys, 0, mouseRecorder.index); + System.arraycopy(mouseRecorder.millis, var4, mouseRecorder.millis, 0, mouseRecorder.index); } } } PacketBufferNode var18; - if (MouseHandler.MouseHandler_lastButton == 1 || !class150.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { // L: 3806 - long var16 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; // L: 3807 - if (var16 > 32767L) { // L: 3808 + if (MouseHandler.MouseHandler_lastButton == 1 || !class150.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { + long var16 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; + if (var16 > 32767L) { var16 = 32767L; } - mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; // L: 3809 - var3 = MouseHandler.MouseHandler_lastPressedY; // L: 3810 - if (var3 < 0) { // L: 3811 + mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; + var3 = MouseHandler.MouseHandler_lastPressedY; + if (var3 < 0) { var3 = 0; - } else if (var3 > BoundaryObject.canvasHeight) { // L: 3812 + } else if (var3 > BoundaryObject.canvasHeight) { var3 = BoundaryObject.canvasHeight; } - var4 = MouseHandler.MouseHandler_lastPressedX; // L: 3813 - if (var4 < 0) { // L: 3814 + var4 = MouseHandler.MouseHandler_lastPressedX; + if (var4 < 0) { var4 = 0; - } else if (var4 > class186.canvasWidth) { // L: 3815 + } else if (var4 > class186.canvasWidth) { var4 = class186.canvasWidth; } - var5 = (int)var16; // L: 3816 - var18 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2894, packetWriter.isaacCipher); // L: 3817 - var18.packetBuffer.writeShort((MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0) + (var5 << 1)); // L: 3818 - var18.packetBuffer.writeShort(var4); // L: 3819 - var18.packetBuffer.writeShort(var3); // L: 3820 - packetWriter.addNode(var18); // L: 3821 + var5 = (int)var16; + var18 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2894, packetWriter.isaacCipher); + var18.packetBuffer.writeShort((MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0) + (var5 << 1)); + var18.packetBuffer.writeShort(var4); + var18.packetBuffer.writeShort(var3); + packetWriter.addNode(var18); } - if (KeyHandler.field140 > 0) { // L: 3823 - var14 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2899, packetWriter.isaacCipher); // L: 3824 - var14.packetBuffer.writeShort(0); // L: 3825 - var15 = var14.packetBuffer.offset; // L: 3826 - long var19 = Ignored.method6459(); // L: 3827 + if (KeyHandler.field140 > 0) { + var14 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2899, packetWriter.isaacCipher); + var14.packetBuffer.writeShort(0); + var15 = var14.packetBuffer.offset; + long var19 = Ignored.method6459(); - for (var5 = 0; var5 < KeyHandler.field140; ++var5) { // L: 3828 - long var21 = var19 - field676; // L: 3829 - if (var21 > 16777215L) { // L: 3830 + for (var5 = 0; var5 < KeyHandler.field140; ++var5) { + long var21 = var19 - field676; + if (var21 > 16777215L) { var21 = 16777215L; } - field676 = var19; // L: 3831 - var14.packetBuffer.writeMedium((int)var21); // L: 3832 - var14.packetBuffer.method7362(KeyHandler.field139[var5]); // L: 3833 + field676 = var19; + var14.packetBuffer.writeMedium((int)var21); + var14.packetBuffer.method7362(KeyHandler.field139[var5]); } - var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var15); // L: 3835 - packetWriter.addNode(var14); // L: 3836 + var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var15); + packetWriter.addNode(var14); } - if (field560 > 0) { // L: 3838 + if (field560 > 0) { --field560; } - if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { // L: 3839 + if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { field561 = true; } - if (field561 && field560 <= 0) { // L: 3840 - field560 = 20; // L: 3841 - field561 = false; // L: 3842 - var14 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2869, packetWriter.isaacCipher); // L: 3844 - var14.packetBuffer.method7493(camAngleX); // L: 3845 - var14.packetBuffer.method7398(camAngleY); // L: 3846 - packetWriter.addNode(var14); // L: 3847 + if (field561 && field560 <= 0) { + field560 = 20; + field561 = false; + var14 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2869, packetWriter.isaacCipher); + var14.packetBuffer.method7493(camAngleX); + var14.packetBuffer.method7398(camAngleY); + packetWriter.addNode(var14); } - if (World.hasFocus && !hadFocus) { // L: 3849 - hadFocus = true; // L: 3850 - var14 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2861, packetWriter.isaacCipher); // L: 3852 - var14.packetBuffer.writeByte(1); // L: 3853 - packetWriter.addNode(var14); // L: 3854 + if (World.hasFocus && !hadFocus) { + hadFocus = true; + var14 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2861, packetWriter.isaacCipher); + var14.packetBuffer.writeByte(1); + packetWriter.addNode(var14); } - if (!World.hasFocus && hadFocus) { // L: 3856 - hadFocus = false; // L: 3857 - var14 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2861, packetWriter.isaacCipher); // L: 3859 - var14.packetBuffer.writeByte(0); // L: 3860 - packetWriter.addNode(var14); // L: 3861 + if (!World.hasFocus && hadFocus) { + hadFocus = false; + var14 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2861, packetWriter.isaacCipher); + var14.packetBuffer.writeByte(0); + packetWriter.addNode(var14); } - if (Varcs.worldMap != null) { // L: 3864 + if (Varcs.worldMap != null) { Varcs.worldMap.method6902(); } - class65.method1958(); // L: 3865 - class117.method2682(); // L: 3866 - class145.method2985(); // L: 3867 - if (gameState != 30) { // L: 3868 + class65.method1958(); + class117.method2682(); + class145.method2985(); + if (gameState != 30) { return; } - AbstractArchive.method5693(); // L: 3869 + AbstractArchive.method5693(); int var10002; - for (var1 = 0; var1 < soundEffectCount; ++var1) { // L: 3871 - var10002 = queuedSoundEffectDelays[var1]--; // L: 3872 - if (queuedSoundEffectDelays[var1] >= -10) { // L: 3873 - SoundEffect var32 = soundEffects[var1]; // L: 3885 - if (var32 == null) { // L: 3886 - var10000 = null; // L: 3887 - var32 = SoundEffect.readSoundEffect(KeyHandler.archive4, soundEffectIds[var1], 0); - if (var32 == null) { // L: 3888 + for (var1 = 0; var1 < soundEffectCount; ++var1) { + var10002 = queuedSoundEffectDelays[var1]--; + if (queuedSoundEffectDelays[var1] >= -10) { + SoundEffect var32 = soundEffects[var1]; + if (var32 == null) { + var10000 = null; + var32 = SoundEffect.readSoundEffect(KeyHandler.field151, soundEffectIds[var1], 0); + if (var32 == null) { continue; } - int[] var44 = queuedSoundEffectDelays; // L: 3889 + int[] var44 = queuedSoundEffectDelays; var44[var1] += var32.calculateDelay(); - soundEffects[var1] = var32; // L: 3890 + soundEffects[var1] = var32; } - if (queuedSoundEffectDelays[var1] < 0) { // L: 3896 - if (soundLocations[var1] != 0) { // L: 3898 - var4 = (soundLocations[var1] & 255) * 128; // L: 3899 - var5 = soundLocations[var1] >> 16 & 255; // L: 3900 - var6 = var5 * 128 + 64 - class340.localPlayer.x; // L: 3901 - if (var6 < 0) { // L: 3902 + if (queuedSoundEffectDelays[var1] < 0) { + if (soundLocations[var1] != 0) { + var4 = (soundLocations[var1] & 255) * 128; + var5 = soundLocations[var1] >> 16 & 255; + var6 = var5 * 128 + 64 - class340.localPlayer.x; + if (var6 < 0) { var6 = -var6; } - var7 = soundLocations[var1] >> 8 & 255; // L: 3903 - var8 = var7 * 128 + 64 - class340.localPlayer.y; // L: 3904 - if (var8 < 0) { // L: 3905 + var7 = soundLocations[var1] >> 8 & 255; + var8 = var7 * 128 + 64 - class340.localPlayer.y; + if (var8 < 0) { var8 = -var8; } - var9 = var8 + var6 - 128; // L: 3906 - if (var9 > var4) { // L: 3907 - queuedSoundEffectDelays[var1] = -100; // L: 3908 - continue; // L: 3909 + var9 = var8 + var6 - 128; + if (var9 > var4) { + queuedSoundEffectDelays[var1] = -100; + continue; } - if (var9 < 0) { // L: 3911 + if (var9 < 0) { var9 = 0; } - var3 = (var4 - var9) * SecureRandomFuture.clientPreferences.areaSoundEffectsVolume / var4; // L: 3912 + var3 = (var4 - var9) * SecureRandomFuture.clientPreferences.areaSoundEffectsVolume / var4; } else { - var3 = SecureRandomFuture.clientPreferences.soundEffectsVolume; // L: 3914 + var3 = SecureRandomFuture.clientPreferences.soundEffectsVolume; } - if (var3 > 0) { // L: 3915 - RawSound var23 = var32.toRawSound().resample(BoundaryObject.decimator); // L: 3916 - RawPcmStream var24 = RawPcmStream.createRawPcmStream(var23, 100, var3); // L: 3917 - var24.setNumLoops(queuedSoundEffectLoops[var1] - 1); // L: 3918 - class281.pcmStreamMixer.addSubStream(var24); // L: 3919 + if (var3 > 0) { + RawSound var23 = var32.toRawSound().resample(BoundaryObject.decimator); + RawPcmStream var24 = RawPcmStream.createRawPcmStream(var23, 100, var3); + var24.setNumLoops(queuedSoundEffectLoops[var1] - 1); + class281.pcmStreamMixer.addSubStream(var24); } - queuedSoundEffectDelays[var1] = -100; // L: 3921 + queuedSoundEffectDelays[var1] = -100; } } else { - --soundEffectCount; // L: 3874 + --soundEffectCount; - for (var15 = var1; var15 < soundEffectCount; ++var15) { // L: 3875 - soundEffectIds[var15] = soundEffectIds[var15 + 1]; // L: 3876 - soundEffects[var15] = soundEffects[var15 + 1]; // L: 3877 - queuedSoundEffectLoops[var15] = queuedSoundEffectLoops[var15 + 1]; // L: 3878 - queuedSoundEffectDelays[var15] = queuedSoundEffectDelays[var15 + 1]; // L: 3879 - soundLocations[var15] = soundLocations[var15 + 1]; // L: 3880 + for (var15 = var1; var15 < soundEffectCount; ++var15) { + soundEffectIds[var15] = soundEffectIds[var15 + 1]; + soundEffects[var15] = soundEffects[var15 + 1]; + queuedSoundEffectLoops[var15] = queuedSoundEffectLoops[var15 + 1]; + queuedSoundEffectDelays[var15] = queuedSoundEffectDelays[var15 + 1]; + soundLocations[var15] = soundLocations[var15 + 1]; } - --var1; // L: 3882 + --var1; } } - if (field743 && !Projectile.method2008()) { // L: 3924 - if (SecureRandomFuture.clientPreferences.musicVolume != 0 && currentTrackGroupId != -1) { // L: 3925 + if (field743 && !Projectile.method2008()) { + if (SecureRandomFuture.clientPreferences.musicVolume != 0 && currentTrackGroupId != -1) { NetSocket.method3118(WorldMapScaleHandler.archive6, currentTrackGroupId, 0, SecureRandomFuture.clientPreferences.musicVolume, false); } - field743 = false; // L: 3926 + field743 = false; } - ++packetWriter.field1287; // L: 3929 - if (packetWriter.field1287 > 750) { // L: 3930 - Varcs.method2411(); // L: 3931 - return; // L: 3932 + ++packetWriter.field1287; + if (packetWriter.field1287 > 750) { + Varcs.method2411(); + return; } - class341.method6257(); // L: 3934 - Canvas.method406(); // L: 3935 - class91.method2337(); // L: 3936 - ++field538; // L: 3937 - if (mouseCrossColor != 0) { // L: 3938 - mouseCrossState += 20; // L: 3939 - if (mouseCrossState >= 400) { // L: 3940 + class341.method6257(); + Canvas.method406(); + class91.method2337(); + ++field538; + if (mouseCrossColor != 0) { + mouseCrossState += 20; + if (mouseCrossState >= 400) { mouseCrossColor = 0; } } - if (WorldMapDecoration.field2722 != null) { // L: 3942 - ++field582; // L: 3943 - if (field582 >= 15) { // L: 3944 - SecureRandomCallable.invalidateWidget(WorldMapDecoration.field2722); // L: 3945 - WorldMapDecoration.field2722 = null; // L: 3946 + if (WorldMapDecoration.field2722 != null) { + ++field582; + if (field582 >= 15) { + SecureRandomCallable.invalidateWidget(WorldMapDecoration.field2722); + WorldMapDecoration.field2722 = null; } } - Widget var38 = class4.mousedOverWidgetIf1; // L: 3949 - Widget var33 = class281.field3375; // L: 3950 - class4.mousedOverWidgetIf1 = null; // L: 3951 - class281.field3375 = null; // L: 3952 - draggedOnWidget = null; // L: 3953 - field657 = false; // L: 3954 - field531 = false; // L: 3955 - field701 = 0; // L: 3956 + Widget var38 = class4.mousedOverWidgetIf1; + Widget var33 = class281.field3375; + class4.mousedOverWidgetIf1 = null; + class281.field3375 = null; + draggedOnWidget = null; + field657 = false; + field531 = false; + field701 = 0; - while (NPCComposition.isKeyDown() && field701 < 128) { // L: 3957 - if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && Players.field1247 == 66) { // L: 3958 - String var25 = method1668(); // L: 3959 - class295.client.method492(var25); // L: 3960 - } else if (oculusOrbState != 1 || ModeWhere.field3954 <= 0) { // L: 3963 - field522[field701] = Players.field1247; // L: 3966 - field758[field701] = ModeWhere.field3954; // L: 3967 - ++field701; // L: 3968 + while (NPCComposition.isKeyDown() && field701 < 128) { + if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && Players.field1247 == 66) { + String var25 = method1668(); + class295.client.method492(var25); + } else if (oculusOrbState != 1 || ModeWhere.field3954 <= 0) { + field522[field701] = Players.field1247; + field758[field701] = ModeWhere.field3954; + ++field701; } } - boolean var34 = staffModLevel >= 2; // L: 3972 - if (var34 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { // L: 3974 - var4 = class340.localPlayer.plane - mouseWheelRotation; // L: 3975 - if (var4 < 0) { // L: 3976 + boolean var34 = staffModLevel >= 2; + if (var34 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { + var4 = class340.localPlayer.plane - mouseWheelRotation; + if (var4 < 0) { var4 = 0; - } else if (var4 > 3) { // L: 3977 + } else if (var4 > 3) { var4 = 3; } - if (var4 != class340.localPlayer.plane) { // L: 3978 - BuddyRankComparator.method2547(class340.localPlayer.pathX[0] + class131.baseX, class340.localPlayer.pathY[0] + TileItem.baseY, var4, false); // L: 3979 + if (var4 != class340.localPlayer.plane) { + BuddyRankComparator.method2547(class340.localPlayer.pathX[0] + class131.baseX, class340.localPlayer.pathY[0] + TileItem.baseY, var4, false); } - mouseWheelRotation = 0; // L: 3981 + mouseWheelRotation = 0; } - if (rootInterface != -1) { // L: 3983 + if (rootInterface != -1) { class13.updateRootInterface(rootInterface, 0, 0, class186.canvasWidth, BoundaryObject.canvasHeight, 0, 0); } - ++cycleCntr; // L: 3984 + ++cycleCntr; while (true) { Widget var39; ScriptEvent var40; Widget var41; do { - var40 = (ScriptEvent)field680.removeLast(); // L: 3986 - if (var40 == null) { // L: 3987 + var40 = (ScriptEvent)field680.removeLast(); + if (var40 == null) { while (true) { do { - var40 = (ScriptEvent)field579.removeLast(); // L: 3998 - if (var40 == null) { // L: 3999 + var40 = (ScriptEvent)field579.removeLast(); + if (var40 == null) { while (true) { do { - var40 = (ScriptEvent)scriptEvents.removeLast(); // L: 4010 - if (var40 == null) { // L: 4011 - this.menu(); // L: 4021 - WorldMapLabelSize.method4358(); // L: 4022 - if (clickedWidget != null) { // L: 4023 + var40 = (ScriptEvent)scriptEvents.removeLast(); + if (var40 == null) { + this.menu(); + WorldMapLabelSize.method4358(); + if (clickedWidget != null) { this.method1174(); } - if (class143.dragInventoryWidget != null) { // L: 4024 - SecureRandomCallable.invalidateWidget(class143.dragInventoryWidget); // L: 4025 - ++itemDragDuration; // L: 4026 - if (MouseHandler.MouseHandler_currentButton == 0) { // L: 4027 - if (field572) { // L: 4028 - if (class143.dragInventoryWidget == FloorOverlayDefinition.hoveredItemContainer && dragItemSlotDestination != dragItemSlotSource) { // L: 4029 - Widget var42 = class143.dragInventoryWidget; // L: 4030 - byte var35 = 0; // L: 4031 - if (field641 == 1 && var42.contentType == 206) { // L: 4032 + if (class143.dragInventoryWidget != null) { + SecureRandomCallable.invalidateWidget(class143.dragInventoryWidget); + ++itemDragDuration; + if (MouseHandler.MouseHandler_currentButton == 0) { + if (field572) { + if (class143.dragInventoryWidget == FloorOverlayDefinition.hoveredItemContainer && dragItemSlotDestination != dragItemSlotSource) { + Widget var42 = class143.dragInventoryWidget; + byte var35 = 0; + if (field641 == 1 && var42.contentType == 206) { var35 = 1; } - if (var42.itemIds[dragItemSlotDestination] <= 0) { // L: 4033 + if (var42.itemIds[dragItemSlotDestination] <= 0) { var35 = 0; } - if (MouseHandler.method649(class363.getWidgetFlags(var42))) { // L: 4034 - var6 = dragItemSlotSource; // L: 4035 - var7 = dragItemSlotDestination; // L: 4036 - var42.itemIds[var7] = var42.itemIds[var6]; // L: 4037 - var42.itemQuantities[var7] = var42.itemQuantities[var6]; // L: 4038 - var42.itemIds[var6] = -1; // L: 4039 - var42.itemQuantities[var6] = 0; // L: 4040 - } else if (var35 == 1) { // L: 4042 - var6 = dragItemSlotSource; // L: 4043 - var7 = dragItemSlotDestination; // L: 4044 + if (MouseHandler.method649(class363.getWidgetFlags(var42))) { + var6 = dragItemSlotSource; + var7 = dragItemSlotDestination; + var42.itemIds[var7] = var42.itemIds[var6]; + var42.itemQuantities[var7] = var42.itemQuantities[var6]; + var42.itemIds[var6] = -1; + var42.itemQuantities[var6] = 0; + } else if (var35 == 1) { + var6 = dragItemSlotSource; + var7 = dragItemSlotDestination; - while (var6 != var7) { // L: 4045 - if (var6 > var7) { // L: 4046 - var42.swapItems(var6 - 1, var6); // L: 4047 - --var6; // L: 4048 - } else if (var6 < var7) { // L: 4050 - var42.swapItems(var6 + 1, var6); // L: 4051 - ++var6; // L: 4052 + while (var6 != var7) { + if (var6 > var7) { + var42.swapItems(var6 - 1, var6); + --var6; + } else if (var6 < var7) { + var42.swapItems(var6 + 1, var6); + ++var6; } } } else { - var42.swapItems(dragItemSlotDestination, dragItemSlotSource); // L: 4057 + var42.swapItems(dragItemSlotDestination, dragItemSlotSource); } - var18 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2811, packetWriter.isaacCipher); // L: 4060 - var18.packetBuffer.method7398(dragItemSlotDestination); // L: 4061 - var18.packetBuffer.method7362(var35); // L: 4062 - var18.packetBuffer.method7407(class143.dragInventoryWidget.id); // L: 4063 - var18.packetBuffer.method7493(dragItemSlotSource); // L: 4064 - packetWriter.addNode(var18); // L: 4065 + var18 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2811, packetWriter.isaacCipher); + var18.packetBuffer.method7398(dragItemSlotDestination); + var18.packetBuffer.method7362(var35); + var18.packetBuffer.method7407(class143.dragInventoryWidget.id); + var18.packetBuffer.method7493(dragItemSlotSource); + packetWriter.addNode(var18); } - } else if (this.shouldLeftClickOpenMenu()) { // L: 4069 - this.openMenu(draggedWidgetX, draggedWidgetY); // L: 4070 - } else if (menuOptionsCount > 0) { // L: 4072 - var4 = draggedWidgetX; // L: 4073 - var5 = draggedWidgetY; // L: 4074 - WorldMapIcon_1.method4385(class87.tempMenuAction, var4, var5); // L: 4076 - class87.tempMenuAction = null; // L: 4077 + } else if (this.shouldLeftClickOpenMenu()) { + this.openMenu(draggedWidgetX, draggedWidgetY); + } else if (menuOptionsCount > 0) { + var4 = draggedWidgetX; + var5 = draggedWidgetY; + WorldMapIcon_1.method4385(class87.tempMenuAction, var4, var5); + class87.tempMenuAction = null; } - field582 = 10; // L: 4081 - MouseHandler.MouseHandler_lastButton = 0; // L: 4082 - class143.dragInventoryWidget = null; // L: 4083 - } 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: 4086 4087 - field572 = true; // L: 4088 + field582 = 10; + MouseHandler.MouseHandler_lastButton = 0; + class143.dragInventoryWidget = null; + } else if (itemDragDuration >= 5 && (MouseHandler.MouseHandler_x > draggedWidgetX + 5 || MouseHandler.MouseHandler_x < draggedWidgetX - 5 || MouseHandler.MouseHandler_y > draggedWidgetY + 5 || MouseHandler.MouseHandler_y < draggedWidgetY - 5)) { + field572 = true; } } - if (Scene.shouldSendWalk()) { // L: 4093 - var4 = Scene.Scene_selectedX; // L: 4094 - var5 = Scene.Scene_selectedY; // L: 4095 - var18 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2859, packetWriter.isaacCipher); // L: 4097 - var18.packetBuffer.writeByte(5); // L: 4098 - var18.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 4099 - var18.packetBuffer.method7493(var5 + TileItem.baseY); // L: 4100 - var18.packetBuffer.method7349(var4 + class131.baseX); // L: 4101 - packetWriter.addNode(var18); // L: 4102 - Scene.method3990(); // L: 4103 - mouseCrossX = MouseHandler.MouseHandler_lastPressedX; // L: 4104 - mouseCrossY = MouseHandler.MouseHandler_lastPressedY; // L: 4105 - mouseCrossColor = 1; // L: 4106 - mouseCrossState = 0; // L: 4107 - destinationX = var4; // L: 4108 - destinationY = var5; // L: 4109 + if (Scene.shouldSendWalk()) { + var4 = Scene.Scene_selectedX; + var5 = Scene.Scene_selectedY; + var18 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2859, packetWriter.isaacCipher); + var18.packetBuffer.writeByte(5); + var18.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); + var18.packetBuffer.method7493(var5 + TileItem.baseY); + var18.packetBuffer.method7349(var4 + class131.baseX); + packetWriter.addNode(var18); + Scene.method3990(); + mouseCrossX = MouseHandler.MouseHandler_lastPressedX; + mouseCrossY = MouseHandler.MouseHandler_lastPressedY; + mouseCrossColor = 1; + mouseCrossState = 0; + destinationX = var4; + destinationY = var5; } - if (var38 != class4.mousedOverWidgetIf1) { // L: 4111 - if (var38 != null) { // L: 4112 + if (var38 != class4.mousedOverWidgetIf1) { + if (var38 != null) { SecureRandomCallable.invalidateWidget(var38); } - if (class4.mousedOverWidgetIf1 != null) { // L: 4113 + if (class4.mousedOverWidgetIf1 != null) { SecureRandomCallable.invalidateWidget(class4.mousedOverWidgetIf1); } } - if (var33 != class281.field3375 && field628 == field714) { // L: 4115 - if (var33 != null) { // L: 4116 + if (var33 != class281.field3375 && field628 == field714) { + if (var33 != null) { SecureRandomCallable.invalidateWidget(var33); } - if (class281.field3375 != null) { // L: 4117 + if (class281.field3375 != null) { SecureRandomCallable.invalidateWidget(class281.field3375); } } - if (class281.field3375 != null) { // L: 4119 - if (field714 < field628) { // L: 4120 - ++field714; // L: 4121 - if (field714 == field628) { // L: 4122 + if (class281.field3375 != null) { + if (field714 < field628) { + ++field714; + if (field714 == field628) { SecureRandomCallable.invalidateWidget(class281.field3375); } } - } else if (field714 > 0) { // L: 4125 + } else if (field714 > 0) { --field714; } - if (oculusOrbState == 0) { // L: 4127 - var4 = class340.localPlayer.x; // L: 4128 - var5 = class340.localPlayer.y; // L: 4129 - if (class7.oculusOrbFocalPointX - var4 < -500 || class7.oculusOrbFocalPointX - var4 > 500 || Actor.oculusOrbFocalPointY - var5 < -500 || Actor.oculusOrbFocalPointY - var5 > 500) { // L: 4130 - class7.oculusOrbFocalPointX = var4; // L: 4131 - Actor.oculusOrbFocalPointY = var5; // L: 4132 + if (oculusOrbState == 0) { + var4 = class340.localPlayer.x; + var5 = class340.localPlayer.y; + if (class7.oculusOrbFocalPointX - var4 < -500 || class7.oculusOrbFocalPointX - var4 > 500 || Actor.oculusOrbFocalPointY - var5 < -500 || Actor.oculusOrbFocalPointY - var5 > 500) { + class7.oculusOrbFocalPointX = var4; + Actor.oculusOrbFocalPointY = var5; } - if (var4 != class7.oculusOrbFocalPointX) { // L: 4134 + if (var4 != class7.oculusOrbFocalPointX) { class7.oculusOrbFocalPointX += (var4 - class7.oculusOrbFocalPointX) / 16; } - if (var5 != Actor.oculusOrbFocalPointY) { // L: 4135 + if (var5 != Actor.oculusOrbFocalPointY) { Actor.oculusOrbFocalPointY += (var5 - Actor.oculusOrbFocalPointY) / 16; } - var6 = class7.oculusOrbFocalPointX >> 7; // L: 4136 - var7 = Actor.oculusOrbFocalPointY >> 7; // L: 4137 - var8 = FaceNormal.getTileHeight(class7.oculusOrbFocalPointX, Actor.oculusOrbFocalPointY, class20.Client_plane); // L: 4138 - var9 = 0; // L: 4139 - if (var6 > 3 && var7 > 3 && var6 < 100 && var7 < 100) { // L: 4140 - for (var10 = var6 - 4; var10 <= var6 + 4; ++var10) { // L: 4141 - for (var11 = var7 - 4; var11 <= var7 + 4; ++var11) { // L: 4142 - var12 = class20.Client_plane; // L: 4143 - if (var12 < 3 && (Tiles.Tiles_renderFlags[1][var10][var11] & 2) == 2) { // L: 4144 + var6 = class7.oculusOrbFocalPointX >> 7; + var7 = Actor.oculusOrbFocalPointY >> 7; + var8 = FaceNormal.getTileHeight(class7.oculusOrbFocalPointX, Actor.oculusOrbFocalPointY, class20.Client_plane); + var9 = 0; + if (var6 > 3 && var7 > 3 && var6 < 100 && var7 < 100) { + for (var10 = var6 - 4; var10 <= var6 + 4; ++var10) { + for (var11 = var7 - 4; var11 <= var7 + 4; ++var11) { + var12 = class20.Client_plane; + if (var12 < 3 && (Tiles.Tiles_renderFlags[1][var10][var11] & 2) == 2) { ++var12; } - int var26 = var8 - Tiles.Tiles_heights[var12][var10][var11]; // L: 4145 - if (var26 > var9) { // L: 4146 + int var26 = var8 - Tiles.Tiles_heights[var12][var10][var11]; + if (var26 > var9) { var9 = var26; } } } } - var10 = var9 * 192; // L: 4150 - if (var10 > 98048) { // L: 4151 + var10 = var9 * 192; + if (var10 > 98048) { var10 = 98048; } - if (var10 < 32768) { // L: 4152 + if (var10 < 32768) { var10 = 32768; } - if (var10 > field562) { // L: 4153 + if (var10 > field562) { field562 += (var10 - field562) / 24; - } else if (var10 < field562) { // L: 4154 + } else if (var10 < field562) { field562 += (var10 - field562) / 80; } - MouseHandler.field231 = FaceNormal.getTileHeight(class340.localPlayer.x, class340.localPlayer.y, class20.Client_plane) - camFollowHeight; // L: 4155 - } else if (oculusOrbState == 1) { // L: 4157 - if (field612 && class340.localPlayer != null) { // L: 4159 - var4 = class340.localPlayer.pathX[0]; // L: 4160 - var5 = class340.localPlayer.pathY[0]; // L: 4161 - if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 4162 - class7.oculusOrbFocalPointX = class340.localPlayer.x; // L: 4163 - var6 = FaceNormal.getTileHeight(class340.localPlayer.x, class340.localPlayer.y, class20.Client_plane) - camFollowHeight; // L: 4164 - if (var6 < MouseHandler.field231) { // L: 4165 + MouseHandler.field231 = FaceNormal.getTileHeight(class340.localPlayer.x, class340.localPlayer.y, class20.Client_plane) - camFollowHeight; + } else if (oculusOrbState == 1) { + if (field612 && class340.localPlayer != null) { + var4 = class340.localPlayer.pathX[0]; + var5 = class340.localPlayer.pathY[0]; + if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { + class7.oculusOrbFocalPointX = class340.localPlayer.x; + var6 = FaceNormal.getTileHeight(class340.localPlayer.x, class340.localPlayer.y, class20.Client_plane) - camFollowHeight; + if (var6 < MouseHandler.field231) { MouseHandler.field231 = var6; } - Actor.oculusOrbFocalPointY = class340.localPlayer.y; // L: 4166 - field612 = false; // L: 4167 + Actor.oculusOrbFocalPointY = class340.localPlayer.y; + field612 = false; } } - short var36 = -1; // L: 4170 - if (KeyHandler.KeyHandler_pressedKeys[33]) { // L: 4171 + short var36 = -1; + if (KeyHandler.KeyHandler_pressedKeys[33]) { var36 = 0; - } else if (KeyHandler.KeyHandler_pressedKeys[49]) { // L: 4172 + } else if (KeyHandler.KeyHandler_pressedKeys[49]) { var36 = 1024; } - if (KeyHandler.KeyHandler_pressedKeys[48]) { // L: 4173 - if (var36 == 0) { // L: 4174 + if (KeyHandler.KeyHandler_pressedKeys[48]) { + if (var36 == 0) { var36 = 1792; - } else if (var36 == 1024) { // L: 4175 + } else if (var36 == 1024) { var36 = 1280; } else { - var36 = 1536; // L: 4176 + var36 = 1536; } - } else if (KeyHandler.KeyHandler_pressedKeys[50]) { // L: 4178 - if (var36 == 0) { // L: 4179 + } else if (KeyHandler.KeyHandler_pressedKeys[50]) { + if (var36 == 0) { var36 = 256; - } else if (var36 == 1024) { // L: 4180 + } else if (var36 == 1024) { var36 = 768; } else { - var36 = 512; // L: 4181 + var36 = 512; } } - byte var37 = 0; // L: 4183 - if (KeyHandler.KeyHandler_pressedKeys[35]) { // L: 4184 + byte var37 = 0; + if (KeyHandler.KeyHandler_pressedKeys[35]) { var37 = -1; - } else if (KeyHandler.KeyHandler_pressedKeys[51]) { // L: 4185 + } else if (KeyHandler.KeyHandler_pressedKeys[51]) { var37 = 1; } - var6 = 0; // L: 4186 - if (var36 >= 0 || var37 != 0) { // L: 4187 - var6 = KeyHandler.KeyHandler_pressedKeys[81] ? oculusOrbSlowedSpeed * 1403293651 * 97493083 : oculusOrbNormalSpeed * -535945653 * -682804381; // L: 4188 - var6 *= 16; // L: 4189 - field584 = var36; // L: 4190 - field555 = var37; // L: 4191 + var6 = 0; + if (var36 >= 0 || var37 != 0) { + var6 = KeyHandler.KeyHandler_pressedKeys[81] ? oculusOrbSlowedSpeed * 1403293651 * 97493083 : oculusOrbNormalSpeed * -535945653 * -682804381; + var6 *= 16; + field584 = var36; + field555 = var37; } - if (field542 < var6) { // L: 4193 - field542 += var6 / 8; // L: 4194 - if (field542 > var6) { // L: 4195 + if (field542 < var6) { + field542 += var6 / 8; + if (field542 > var6) { field542 = var6; } - } else if (field542 > var6) { // L: 4197 + } else if (field542 > var6) { field542 = field542 * 9 / 10; } - if (field542 > 0) { // L: 4198 - var7 = field542 / 16; // L: 4199 - if (field584 >= 0) { // L: 4200 - var4 = field584 - class379.cameraYaw & 2047; // L: 4201 - var8 = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 4202 - var9 = Rasterizer3D.Rasterizer3D_cosine[var4]; // L: 4203 - class7.oculusOrbFocalPointX += var8 * var7 / 65536; // L: 4204 - Actor.oculusOrbFocalPointY += var7 * var9 / 65536; // L: 4205 + if (field542 > 0) { + var7 = field542 / 16; + if (field584 >= 0) { + var4 = field584 - class379.cameraYaw & 2047; + var8 = Rasterizer3D.Rasterizer3D_sine[var4]; + var9 = Rasterizer3D.Rasterizer3D_cosine[var4]; + class7.oculusOrbFocalPointX += var8 * var7 / 65536; + Actor.oculusOrbFocalPointY += var7 * var9 / 65536; } - if (field555 != 0) { // L: 4207 - MouseHandler.field231 += var7 * field555; // L: 4208 - if (MouseHandler.field231 > 0) { // L: 4209 + if (field555 != 0) { + MouseHandler.field231 += var7 * field555; + if (MouseHandler.field231 > 0) { MouseHandler.field231 = 0; } } } else { - field584 = -1; // L: 4213 - field555 = -1; // L: 4214 + field584 = -1; + field555 = -1; } - if (KeyHandler.KeyHandler_pressedKeys[13]) { // L: 4216 - packetWriter.addNode(HitSplatDefinition.getPacketBufferNode(ClientPacket.field2867, packetWriter.isaacCipher)); // L: 4218 - oculusOrbState = 0; // L: 4219 + if (KeyHandler.KeyHandler_pressedKeys[13]) { + packetWriter.addNode(HitSplatDefinition.getPacketBufferNode(ClientPacket.field2867, packetWriter.isaacCipher)); + oculusOrbState = 0; } } - if (MouseHandler.MouseHandler_currentButton == 4 && class150.mouseCam) { // L: 4223 - var4 = MouseHandler.MouseHandler_y - mouseCamClickedY; // L: 4224 - camAngleDX = var4 * 2; // L: 4225 - mouseCamClickedY = var4 != -1 && var4 != 1 ? (MouseHandler.MouseHandler_y + mouseCamClickedY) / 2 : MouseHandler.MouseHandler_y * 84217699 * -688068021; // L: 4226 - var5 = mouseCamClickedX - MouseHandler.MouseHandler_x; // L: 4227 - camAngleDY = var5 * 2; // L: 4228 - mouseCamClickedX = var5 != -1 && var5 != 1 ? (mouseCamClickedX + MouseHandler.MouseHandler_x) / 2 : MouseHandler.MouseHandler_x * 635129293 * -971872507; // L: 4229 + if (MouseHandler.MouseHandler_currentButton == 4 && class150.mouseCam) { + var4 = MouseHandler.MouseHandler_y - mouseCamClickedY; + camAngleDX = var4 * 2; + mouseCamClickedY = var4 != -1 && var4 != 1 ? (MouseHandler.MouseHandler_y + mouseCamClickedY) / 2 : MouseHandler.MouseHandler_y * 84217699 * -688068021; + var5 = mouseCamClickedX - MouseHandler.MouseHandler_x; + camAngleDY = var5 * 2; + mouseCamClickedX = var5 != -1 && var5 != 1 ? (mouseCamClickedX + MouseHandler.MouseHandler_x) / 2 : MouseHandler.MouseHandler_x * 635129293 * -971872507; } else { - if (KeyHandler.KeyHandler_pressedKeys[96]) { // L: 4232 + if (KeyHandler.KeyHandler_pressedKeys[96]) { camAngleDY += (-24 - camAngleDY) / 2; - } else if (KeyHandler.KeyHandler_pressedKeys[97]) { // L: 4233 + } else if (KeyHandler.KeyHandler_pressedKeys[97]) { camAngleDY += (24 - camAngleDY) / 2; } else { - camAngleDY /= 2; // L: 4234 + camAngleDY /= 2; } - if (KeyHandler.KeyHandler_pressedKeys[98]) { // L: 4235 + if (KeyHandler.KeyHandler_pressedKeys[98]) { camAngleDX += (12 - camAngleDX) / 2; - } else if (KeyHandler.KeyHandler_pressedKeys[99]) { // L: 4236 + } else if (KeyHandler.KeyHandler_pressedKeys[99]) { camAngleDX += (-12 - camAngleDX) / 2; } else { - camAngleDX /= 2; // L: 4237 + camAngleDX /= 2; } - mouseCamClickedY = MouseHandler.MouseHandler_y; // L: 4238 - mouseCamClickedX = MouseHandler.MouseHandler_x; // L: 4239 + mouseCamClickedY = MouseHandler.MouseHandler_y; + mouseCamClickedX = MouseHandler.MouseHandler_x; } - camAngleY = camAngleDY / 2 + camAngleY & 2047; // L: 4241 - camAngleX += camAngleDX / 2; // L: 4242 - if (camAngleX < 128) { // L: 4243 + camAngleY = camAngleDY / 2 + camAngleY & 2047; + camAngleX += camAngleDX / 2; + if (camAngleX < 128) { camAngleX = 128; } - if (camAngleX > 383) { // L: 4244 + if (camAngleX > 383) { camAngleX = 383; } - if (field724) { // L: 4246 + if (field724) { GrandExchangeOfferOwnWorldComparator.method1148(); - } else if (isCameraLocked) { // L: 4247 - var4 = class167.field1811 * 128 + 64; // L: 4248 - var5 = VarpDefinition.field1748 * 128 + 64; // L: 4249 - var6 = FaceNormal.getTileHeight(var4, var5, class20.Client_plane) - UserComparator9.field1335; // L: 4250 - class1.method12(var4, var6, var5); // L: 4251 - var4 = PlayerComposition.field3193 * 128 + 64; // L: 4252 - var5 = MusicPatchNode.field3150 * 128 + 64; // L: 4253 - var6 = FaceNormal.getTileHeight(var4, var5, class20.Client_plane) - ModeWhere.field3951; // L: 4254 - var7 = var4 - UserComparator7.cameraX; // L: 4255 - var8 = var6 - AbstractByteArrayCopier.cameraY; // L: 4256 - var9 = var5 - UserComparator10.cameraZ; // L: 4257 - var10 = (int)Math.sqrt((double)(var7 * var7 + var9 * var9)); // L: 4258 - var11 = (int)(Math.atan2((double)var8, (double)var10) * 325.9490051269531D) & 2047; // L: 4259 - var12 = (int)(Math.atan2((double)var7, (double)var9) * -325.9490051269531D) & 2047; // L: 4260 - SecureRandomFuture.method2025(var11, var12); // L: 4261 + } else if (isCameraLocked) { + var4 = class167.field1811 * 128 + 64; + var5 = VarpDefinition.field1748 * 128 + 64; + var6 = FaceNormal.getTileHeight(var4, var5, class20.Client_plane) - UserComparator9.field1335; + class1.method12(var4, var6, var5); + var4 = PlayerComposition.field3193 * 128 + 64; + var5 = MusicPatchNode.field3150 * 128 + 64; + var6 = FaceNormal.getTileHeight(var4, var5, class20.Client_plane) - ModeWhere.field3951; + var7 = var4 - UserComparator7.cameraX; + var8 = var6 - AbstractByteArrayCopier.cameraY; + var9 = var5 - UserComparator10.cameraZ; + var10 = (int)Math.sqrt((double)(var7 * var7 + var9 * var9)); + var11 = (int)(Math.atan2((double)var8, (double)var10) * 325.9490051269531D) & 2047; + var12 = (int)(Math.atan2((double)var7, (double)var9) * -325.9490051269531D) & 2047; + SecureRandomFuture.method2025(var11, var12); } - for (var4 = 0; var4 < 5; ++var4) { // L: 4263 + for (var4 = 0; var4 < 5; ++var4) { var10002 = field729[var4]++; } - class339.varcs.tryWrite(); // L: 4264 - var4 = ++MouseHandler.MouseHandler_idleCycles - 1; // L: 4267 - var6 = KeyHandler.KeyHandler_idleCycles; // L: 4272 + class339.varcs.tryWrite(); + var4 = ++MouseHandler.MouseHandler_idleCycles - 1; + var6 = KeyHandler.KeyHandler_idleCycles; PacketBufferNode var27; - if (var4 > 15000 && var6 > 15000) { // L: 4275 - logoutTimer = 250; // L: 4276 - class123.method2746(14500); // L: 4277 - var27 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2837, packetWriter.isaacCipher); // L: 4279 - packetWriter.addNode(var27); // L: 4280 + if (var4 > 15000 && var6 > 15000) { + logoutTimer = 250; + class123.method2746(14500); + var27 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2837, packetWriter.isaacCipher); + packetWriter.addNode(var27); } - GameEngine.friendSystem.processFriendUpdates(); // L: 4282 - ++packetWriter.pendingWrites; // L: 4283 - if (packetWriter.pendingWrites > 50) { // L: 4284 - var27 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2814, packetWriter.isaacCipher); // L: 4286 - packetWriter.addNode(var27); // L: 4287 + GameEngine.friendSystem.processFriendUpdates(); + ++packetWriter.pendingWrites; + if (packetWriter.pendingWrites > 50) { + var27 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2814, packetWriter.isaacCipher); + packetWriter.addNode(var27); } try { - packetWriter.flush(); // L: 4290 - } catch (IOException var28) { // L: 4292 - Varcs.method2411(); // L: 4293 + packetWriter.flush(); + } catch (IOException var28) { + Varcs.method2411(); } - return; // L: 4295 + return; } - var41 = var40.widget; // L: 4012 - if (var41.childIndex < 0) { // L: 4013 + var41 = var40.widget; + if (var41.childIndex < 0) { break; } - var39 = ChatChannel.getWidget(var41.parentId); // L: 4014 - } while(var39 == null || var39.children == null || var41.childIndex >= var39.children.length || var41 != var39.children[var41.childIndex]); // L: 4015 + var39 = ChatChannel.getWidget(var41.parentId); + } while(var39 == null || var39.children == null || var41.childIndex >= var39.children.length || var41 != var39.children[var41.childIndex]); - class285.runScriptEvent(var40); // L: 4019 + class285.runScriptEvent(var40); } } - var41 = var40.widget; // L: 4000 - if (var41.childIndex < 0) { // L: 4001 + var41 = var40.widget; + if (var41.childIndex < 0) { break; } - var39 = ChatChannel.getWidget(var41.parentId); // L: 4002 - } while(var39 == null || var39.children == null || var41.childIndex >= var39.children.length || var41 != var39.children[var41.childIndex]); // L: 4003 + var39 = ChatChannel.getWidget(var41.parentId); + } while(var39 == null || var39.children == null || var41.childIndex >= var39.children.length || var41 != var39.children[var41.childIndex]); - class285.runScriptEvent(var40); // L: 4007 + class285.runScriptEvent(var40); } } - var41 = var40.widget; // L: 3988 - if (var41.childIndex < 0) { // L: 3989 + var41 = var40.widget; + if (var41.childIndex < 0) { break; } - var39 = ChatChannel.getWidget(var41.parentId); // L: 3990 - } while(var39 == null || var39.children == null || var41.childIndex >= var39.children.length || var41 != var39.children[var41.childIndex]); // L: 3991 + var39 = ChatChannel.getWidget(var41.parentId); + } while(var39 == null || var39.children == null || var41.childIndex >= var39.children.length || var41 != var39.children[var41.childIndex]); - class285.runScriptEvent(var40); // L: 3995 + class285.runScriptEvent(var40); } } - var31 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2852, packetWriter.isaacCipher); // L: 3699 - var31.packetBuffer.writeByte(0); // L: 3700 - var3 = var31.packetBuffer.offset; // L: 3701 - UserComparator3.performReflectionCheck(var31.packetBuffer); // L: 3702 - var31.packetBuffer.method7357(var31.packetBuffer.offset - var3); // L: 3703 - packetWriter.addNode(var31); // L: 3704 + var31 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2852, packetWriter.isaacCipher); + var31.packetBuffer.writeByte(0); + var3 = var31.packetBuffer.offset; + UserComparator3.performReflectionCheck(var31.packetBuffer); + var31.packetBuffer.method7357(var31.packetBuffer.offset - var3); + packetWriter.addNode(var31); } } } - } // L: 3681 + } @ObfuscatedName("gh") @ObfuscatedSignature( @@ -4641,26 +4641,26 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { ) @Export("resizeJS") void resizeJS() { - int var1 = class186.canvasWidth; // L: 5000 - int var2 = BoundaryObject.canvasHeight; // L: 5001 - if (super.contentWidth < var1) { // L: 5002 + int var1 = class186.canvasWidth; + int var2 = BoundaryObject.canvasHeight; + if (super.contentWidth < var1) { var1 = super.contentWidth; } - if (super.contentHeight < var2) { // L: 5003 + if (super.contentHeight < var2) { var2 = super.contentHeight; } - if (SecureRandomFuture.clientPreferences != null) { // L: 5004 + if (SecureRandomFuture.clientPreferences != null) { try { - Client var3 = class295.client; // L: 5006 - Object[] var4 = new Object[]{class143.getWindowedMode()}; // L: 5007 - JSObject.getWindow(var3).call("resize", var4); // L: 5010 - } catch (Throwable var5) { // L: 5013 + Client var3 = class295.client; + Object[] var4 = new Object[]{class143.getWindowedMode()}; + JSObject.getWindow(var3).call("resize", var4); + } catch (Throwable var5) { } } - } // L: 5015 + } @ObfuscatedName("gg") @ObfuscatedSignature( @@ -4669,138 +4669,138 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { ) @Export("drawLoggedIn") final void drawLoggedIn() { - if (rootInterface != -1) { // L: 5018 + if (rootInterface != -1) { GraphicsObject.method1955(rootInterface); } int var1; - for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 5019 - if (field504[var1]) { // L: 5020 + for (var1 = 0; var1 < rootWidgetCount; ++var1) { + if (field504[var1]) { field686[var1] = true; } - field687[var1] = field504[var1]; // L: 5021 - field504[var1] = false; // L: 5022 + field687[var1] = field504[var1]; + field504[var1] = false; } - field684 = cycle; // L: 5024 - viewportX = -1; // L: 5025 - viewportY = -1; // L: 5026 - FloorOverlayDefinition.hoveredItemContainer = null; // L: 5027 - if (rootInterface != -1) { // L: 5028 - rootWidgetCount = 0; // L: 5029 - class12.drawWidgets(rootInterface, 0, 0, class186.canvasWidth, BoundaryObject.canvasHeight, 0, 0, -1); // L: 5030 + field684 = cycle; + viewportX = -1; + viewportY = -1; + FloorOverlayDefinition.hoveredItemContainer = null; + if (rootInterface != -1) { + rootWidgetCount = 0; + class12.drawWidgets(rootInterface, 0, 0, class186.canvasWidth, BoundaryObject.canvasHeight, 0, 0, -1); } - Rasterizer2D.Rasterizer2D_resetClip(); // L: 5032 - if (showMouseCross) { // L: 5033 - if (mouseCrossColor == 1) { // L: 5034 - UserComparator5.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 5035 + Rasterizer2D.Rasterizer2D_resetClip(); + if (showMouseCross) { + if (mouseCrossColor == 1) { + UserComparator5.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); } - if (mouseCrossColor == 2) { // L: 5037 - UserComparator5.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 5038 + if (mouseCrossColor == 2) { + UserComparator5.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); } } - if (!isMenuOpen) { // L: 5041 - if (viewportX != -1) { // L: 5042 + if (!isMenuOpen) { + if (viewportX != -1) { Friend.method6288(viewportX, viewportY); } } else { - class4.method25(); // L: 5044 + class4.method25(); } - if (gameDrawingMode == 3) { // L: 5045 - for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 5046 - if (field687[var1]) { // L: 5047 - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); // L: 5048 - } else if (field686[var1]) { // L: 5050 - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); // L: 5051 + if (gameDrawingMode == 3) { + for (var1 = 0; var1 < rootWidgetCount; ++var1) { + if (field687[var1]) { + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); + } else if (field686[var1]) { + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); } } } - var1 = class20.Client_plane; // L: 5055 - int var2 = class340.localPlayer.x; // L: 5056 - int var3 = class340.localPlayer.y; // L: 5057 - int var4 = field538; // L: 5058 + var1 = class20.Client_plane; + int var2 = class340.localPlayer.x; + int var3 = class340.localPlayer.y; + int var4 = field538; - for (ObjectSound var5 = (ObjectSound)ObjectSound.objectSounds.last(); var5 != null; var5 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 5060 - if (var5.soundEffectId != -1 || var5.soundEffectIds != null) { // L: 5061 - int var6 = 0; // L: 5062 - if (var2 > var5.maxX) { // L: 5063 + for (ObjectSound var5 = (ObjectSound)ObjectSound.objectSounds.last(); var5 != null; var5 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var5.soundEffectId != -1 || var5.soundEffectIds != null) { + int var6 = 0; + if (var2 > var5.maxX) { var6 += var2 - var5.maxX; - } else if (var2 < var5.x) { // L: 5064 + } else if (var2 < var5.x) { var6 += var5.x - var2; } - if (var3 > var5.maxY) { // L: 5065 + if (var3 > var5.maxY) { var6 += var3 - var5.maxY; - } else if (var3 < var5.y) { // L: 5066 + } else if (var3 < var5.y) { var6 += var5.y - var3; } - if (var6 - 64 <= var5.field793 && SecureRandomFuture.clientPreferences.areaSoundEffectsVolume != 0 && var1 == var5.plane) { // L: 5067 - var6 -= 64; // L: 5078 - if (var6 < 0) { // L: 5079 + if (var6 - 64 <= var5.field793 && SecureRandomFuture.clientPreferences.areaSoundEffectsVolume != 0 && var1 == var5.plane) { + var6 -= 64; + if (var6 < 0) { var6 = 0; } - int var7 = (var5.field793 - var6) * SecureRandomFuture.clientPreferences.areaSoundEffectsVolume / var5.field793; // L: 5080 + int var7 = (var5.field793 - var6) * SecureRandomFuture.clientPreferences.areaSoundEffectsVolume / var5.field793; Object var10000; - if (var5.stream1 == null) { // L: 5081 - if (var5.soundEffectId >= 0) { // L: 5082 - var10000 = null; // L: 5083 - SoundEffect var8 = SoundEffect.readSoundEffect(KeyHandler.archive4, var5.soundEffectId, 0); - if (var8 != null) { // L: 5084 - RawSound var9 = var8.toRawSound().resample(BoundaryObject.decimator); // L: 5085 - RawPcmStream var10 = RawPcmStream.createRawPcmStream(var9, 100, var7); // L: 5086 - var10.setNumLoops(-1); // L: 5087 - class281.pcmStreamMixer.addSubStream(var10); // L: 5088 - var5.stream1 = var10; // L: 5089 + if (var5.stream1 == null) { + if (var5.soundEffectId >= 0) { + var10000 = null; + SoundEffect var8 = SoundEffect.readSoundEffect(KeyHandler.field151, var5.soundEffectId, 0); + if (var8 != null) { + RawSound var9 = var8.toRawSound().resample(BoundaryObject.decimator); + RawPcmStream var10 = RawPcmStream.createRawPcmStream(var9, 100, var7); + var10.setNumLoops(-1); + class281.pcmStreamMixer.addSubStream(var10); + var5.stream1 = var10; } } } else { - var5.stream1.method843(var7); // L: 5093 + var5.stream1.method843(var7); } - if (var5.stream2 == null) { // L: 5094 - if (var5.soundEffectIds != null && (var5.field789 -= var4) <= 0) { // L: 5095 - int var12 = (int)(Math.random() * (double)var5.soundEffectIds.length); // L: 5096 - var10000 = null; // L: 5097 - SoundEffect var13 = SoundEffect.readSoundEffect(KeyHandler.archive4, var5.soundEffectIds[var12], 0); - if (var13 != null) { // L: 5098 - RawSound var14 = var13.toRawSound().resample(BoundaryObject.decimator); // L: 5099 - RawPcmStream var11 = RawPcmStream.createRawPcmStream(var14, 100, var7); // L: 5100 - var11.setNumLoops(0); // L: 5101 - class281.pcmStreamMixer.addSubStream(var11); // L: 5102 - var5.stream2 = var11; // L: 5103 - var5.field789 = var5.field796 + (int)(Math.random() * (double)(var5.field797 - var5.field796)); // L: 5104 + if (var5.stream2 == null) { + if (var5.soundEffectIds != null && (var5.field789 -= var4) <= 0) { + int var12 = (int)(Math.random() * (double)var5.soundEffectIds.length); + var10000 = null; + SoundEffect var13 = SoundEffect.readSoundEffect(KeyHandler.field151, var5.soundEffectIds[var12], 0); + if (var13 != null) { + RawSound var14 = var13.toRawSound().resample(BoundaryObject.decimator); + RawPcmStream var11 = RawPcmStream.createRawPcmStream(var14, 100, var7); + var11.setNumLoops(0); + class281.pcmStreamMixer.addSubStream(var11); + var5.stream2 = var11; + var5.field789 = var5.field796 + (int)(Math.random() * (double)(var5.field797 - var5.field796)); } } } else { - var5.stream2.method843(var7); // L: 5109 - if (!var5.stream2.hasNext()) { // L: 5110 - var5.stream2 = null; // L: 5111 + var5.stream2.method843(var7); + if (!var5.stream2.hasNext()) { + var5.stream2 = null; } } } else { - if (var5.stream1 != null) { // L: 5068 - class281.pcmStreamMixer.removeSubStream(var5.stream1); // L: 5069 - var5.stream1 = null; // L: 5070 + if (var5.stream1 != null) { + class281.pcmStreamMixer.removeSubStream(var5.stream1); + var5.stream1 = null; } - if (var5.stream2 != null) { // L: 5072 - class281.pcmStreamMixer.removeSubStream(var5.stream2); // L: 5073 - var5.stream2 = null; // L: 5074 + if (var5.stream2 != null) { + class281.pcmStreamMixer.removeSubStream(var5.stream2); + var5.stream2 = null; } } } } - field538 = 0; // L: 5116 - } // L: 5117 + field538 = 0; + } @ObfuscatedName("hf") @ObfuscatedSignature( @@ -4808,291 +4808,291 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { garbageValue = "-1371711107" ) final boolean method1394(PacketWriter var1) { - AbstractSocket var2 = var1.getSocket(); // L: 6472 - PacketBuffer var3 = var1.packetBuffer; // L: 6473 - if (var2 == null) { // L: 6474 + AbstractSocket var2 = var1.getSocket(); + PacketBuffer var3 = var1.packetBuffer; + if (var2 == null) { return false; } else { int var6; String var19; try { int var5; - if (var1.serverPacket == null) { // L: 6476 - if (var1.field1278) { // L: 6477 - if (!var2.isAvailable(1)) { // L: 6478 + if (var1.serverPacket == null) { + if (var1.field1278) { + if (!var2.isAvailable(1)) { return false; } - var2.read(var1.packetBuffer.array, 0, 1); // L: 6479 - var1.field1287 = 0; // L: 6480 - var1.field1278 = false; // L: 6481 + var2.read(var1.packetBuffer.array, 0, 1); + var1.field1287 = 0; + var1.field1278 = false; } - var3.offset = 0; // L: 6483 - if (var3.method7311()) { // L: 6484 - if (!var2.isAvailable(1)) { // L: 6485 + var3.offset = 0; + if (var3.method7311()) { + if (!var2.isAvailable(1)) { return false; } - var2.read(var1.packetBuffer.array, 1, 1); // L: 6486 - var1.field1287 = 0; // L: 6487 + var2.read(var1.packetBuffer.array, 1, 1); + var1.field1287 = 0; } - var1.field1278 = true; // L: 6489 - ServerPacket[] var4 = class129.ServerPacket_values(); // L: 6490 - var5 = var3.readSmartByteShortIsaac(); // L: 6491 - if (var5 < 0 || var5 >= var4.length) { // L: 6492 + var1.field1278 = true; + ServerPacket[] var4 = class129.ServerPacket_values(); + var5 = var3.readSmartByteShortIsaac(); + if (var5 < 0 || var5 >= var4.length) { throw new IOException(var5 + " " + var3.offset); } - var1.serverPacket = var4[var5]; // L: 6493 - var1.serverPacketLength = var1.serverPacket.length; // L: 6494 + var1.serverPacket = var4[var5]; + var1.serverPacketLength = var1.serverPacket.length; } - if (var1.serverPacketLength == -1) { // L: 6496 - if (!var2.isAvailable(1)) { // L: 6497 + if (var1.serverPacketLength == -1) { + if (!var2.isAvailable(1)) { return false; } - var1.getSocket().read(var3.array, 0, 1); // L: 6498 - var1.serverPacketLength = var3.array[0] & 255; // L: 6499 + var1.getSocket().read(var3.array, 0, 1); + var1.serverPacketLength = var3.array[0] & 255; } - if (var1.serverPacketLength == -2) { // L: 6501 - if (!var2.isAvailable(2)) { // L: 6502 + if (var1.serverPacketLength == -2) { + if (!var2.isAvailable(2)) { return false; } - var1.getSocket().read(var3.array, 0, 2); // L: 6503 - var3.offset = 0; // L: 6504 - var1.serverPacketLength = var3.readUnsignedShort(); // L: 6505 + var1.getSocket().read(var3.array, 0, 2); + var3.offset = 0; + var1.serverPacketLength = var3.readUnsignedShort(); } - if (!var2.isAvailable(var1.serverPacketLength)) { // L: 6507 + if (!var2.isAvailable(var1.serverPacketLength)) { return false; } - var3.offset = 0; // L: 6508 - var2.read(var3.array, 0, var1.serverPacketLength); // L: 6509 - var1.field1287 = 0; // L: 6510 - timer.method6253(); // L: 6511 - var1.field1291 = var1.field1290; // L: 6512 - var1.field1290 = var1.field1289; // L: 6513 - var1.field1289 = var1.serverPacket; // L: 6514 + var3.offset = 0; + var2.read(var3.array, 0, var1.serverPacketLength); + var1.field1287 = 0; + timer.method6253(); + var1.field1291 = var1.field1290; + var1.field1290 = var1.field1289; + var1.field1289 = var1.serverPacket; int var7; int var17; Widget var52; - if (ServerPacket.field2978 == var1.serverPacket) { // L: 6515 - var17 = var3.method7403(); // L: 6516 - var5 = var3.method7411(); // L: 6517 - var6 = var3.readUnsignedShort(); // L: 6518 - var7 = var3.method7403(); // L: 6519 - var52 = ChatChannel.getWidget(var5); // L: 6520 - if (var17 != var52.modelAngleX || var6 != var52.modelAngleY || var7 != var52.modelZoom) { // L: 6521 - var52.modelAngleX = var17; // L: 6522 - var52.modelAngleY = var6; // L: 6523 - var52.modelZoom = var7; // L: 6524 - SecureRandomCallable.invalidateWidget(var52); // L: 6525 + if (ServerPacket.field2978 == var1.serverPacket) { + var17 = var3.method7403(); + var5 = var3.method7411(); + var6 = var3.readUnsignedShort(); + var7 = var3.method7403(); + var52 = ChatChannel.getWidget(var5); + if (var17 != var52.modelAngleX || var6 != var52.modelAngleY || var7 != var52.modelZoom) { + var52.modelAngleX = var17; + var52.modelAngleY = var6; + var52.modelZoom = var7; + SecureRandomCallable.invalidateWidget(var52); } - var1.serverPacket = null; // L: 6527 - return true; // L: 6528 + var1.serverPacket = null; + return true; } - if (ServerPacket.field3011 == var1.serverPacket) { // L: 6530 - var17 = var3.readUnsignedShort(); // L: 6531 - var5 = var3.readUnsignedByte(); // L: 6532 - var6 = var3.readUnsignedShort(); // L: 6533 - LoginScreenAnimation.queueSoundEffect(var17, var5, var6); // L: 6534 - var1.serverPacket = null; // L: 6535 - return true; // L: 6536 + if (ServerPacket.field3011 == var1.serverPacket) { + var17 = var3.readUnsignedShort(); + var5 = var3.readUnsignedByte(); + var6 = var3.readUnsignedShort(); + LoginScreenAnimation.queueSoundEffect(var17, var5, var6); + var1.serverPacket = null; + return true; } Widget var18; - if (ServerPacket.field2952 == var1.serverPacket) { // L: 6538 - var17 = var3.method7411(); // L: 6539 - var5 = var3.readShort(); // L: 6540 - var18 = ChatChannel.getWidget(var17); // L: 6541 - if (var5 != var18.sequenceId || var5 == -1) { // L: 6542 - var18.sequenceId = var5; // L: 6543 - var18.modelFrame = 0; // L: 6544 - var18.modelFrameCycle = 0; // L: 6545 - SecureRandomCallable.invalidateWidget(var18); // L: 6546 + if (ServerPacket.field2952 == var1.serverPacket) { + var17 = var3.method7411(); + var5 = var3.readShort(); + var18 = ChatChannel.getWidget(var17); + if (var5 != var18.sequenceId || var5 == -1) { + var18.sequenceId = var5; + var18.modelFrame = 0; + var18.modelFrameCycle = 0; + SecureRandomCallable.invalidateWidget(var18); } - var1.serverPacket = null; // L: 6548 - return true; // L: 6549 + var1.serverPacket = null; + return true; } - if (ServerPacket.field2972 == var1.serverPacket) { // L: 6551 - DirectByteArrayCopier.method5328(class253.field2915); // L: 6552 - var1.serverPacket = null; // L: 6553 - return true; // L: 6554 + if (ServerPacket.field2972 == var1.serverPacket) { + DirectByteArrayCopier.method5328(class253.field2915); + var1.serverPacket = null; + return true; } - if (ServerPacket.field3002 == var1.serverPacket) { // L: 6556 - if (BuddyRankComparator.field1342 == null) { // L: 6557 + if (ServerPacket.field3002 == var1.serverPacket) { + if (BuddyRankComparator.field1342 == null) { BuddyRankComparator.field1342 = new class370(Ignored.HitSplatDefinition_cached); } - class426 var49 = Ignored.HitSplatDefinition_cached.method6761(var3); // L: 6558 - BuddyRankComparator.field1342.field4221.vmethod7129(var49.field4539, var49.field4537); // L: 6559 - field695[++field734 - 1 & 31] = var49.field4539; // L: 6560 - var1.serverPacket = null; // L: 6561 - return true; // L: 6562 + class426 var49 = Ignored.HitSplatDefinition_cached.method6761(var3); + BuddyRankComparator.field1342.field4221.vmethod7129(var49.field4539, var49.field4537); + field695[++field734 - 1 & 31] = var49.field4539; + var1.serverPacket = null; + return true; } int var15; String var24; byte var68; - if (ServerPacket.field3005 == var1.serverPacket) { // L: 6564 - var68 = var3.readByte(); // L: 6565 - var19 = var3.readStringCp1252NullTerminated(); // L: 6566 - long var20 = (long)var3.readUnsignedShort(); // L: 6567 - long var22 = (long)var3.readMedium(); // L: 6568 - PlayerType var55 = (PlayerType)class130.findEnumerated(SpotAnimationDefinition.PlayerType_values(), var3.readUnsignedByte()); // L: 6569 - long var11 = (var20 << 32) + var22; // L: 6570 - boolean var56 = false; // L: 6571 - ClanChannel var14 = null; // L: 6572 - var14 = var68 >= 0 ? currentClanChannels[var68] : UserComparator5.guestClanChannel; // L: 6574 - if (var14 == null) { // L: 6575 - var56 = true; // L: 6576 + if (ServerPacket.field3005 == var1.serverPacket) { + var68 = var3.readByte(); + var19 = var3.readStringCp1252NullTerminated(); + long var20 = (long)var3.readUnsignedShort(); + long var22 = (long)var3.readMedium(); + PlayerType var55 = (PlayerType)class130.findEnumerated(SpotAnimationDefinition.PlayerType_values(), var3.readUnsignedByte()); + long var11 = (var20 << 32) + var22; + boolean var56 = false; + ClanChannel var14 = null; + var14 = var68 >= 0 ? currentClanChannels[var68] : UserComparator5.guestClanChannel; + if (var14 == null) { + var56 = true; } else { var15 = 0; while (true) { if (var15 >= 100) { - if (var55.isUser && GameEngine.friendSystem.isIgnored(new Username(var19, class194.loginType))) { // L: 6585 6586 + if (var55.isUser && GameEngine.friendSystem.isIgnored(new Username(var19, class194.loginType))) { var56 = true; } break; } - if (crossWorldMessageIds[var15] == var11) { // L: 6580 - var56 = true; // L: 6581 - break; // L: 6582 + if (crossWorldMessageIds[var15] == var11) { + var56 = true; + break; } - ++var15; // L: 6579 + ++var15; } } - if (!var56) { // L: 6589 - crossWorldMessageIds[crossWorldMessageIdsIndex] = var11; // L: 6590 - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6591 - var24 = AbstractFont.escapeBrackets(SequenceDefinition.method3689(var3)); // L: 6592 - int var16 = var68 >= 0 ? 41 : 44; // L: 6593 - if (var55.modIcon != -1) { // L: 6594 + if (!var56) { + crossWorldMessageIds[crossWorldMessageIdsIndex] = var11; + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; + var24 = AbstractFont.escapeBrackets(SequenceDefinition.method3689(var3)); + int var16 = var68 >= 0 ? 41 : 44; + if (var55.modIcon != -1) { DevicePcmPlayerProvider.addChatMessage(var16, class221.method4705(var55.modIcon) + var19, var24, var14.name); } else { - DevicePcmPlayerProvider.addChatMessage(var16, var19, var24, var14.name); // L: 6595 + DevicePcmPlayerProvider.addChatMessage(var16, var19, var24, var14.name); } } - var1.serverPacket = null; // L: 6597 - return true; // L: 6598 + var1.serverPacket = null; + return true; } String var45; - if (ServerPacket.field3001 == var1.serverPacket) { // L: 6600 - var45 = var3.readStringCp1252NullTerminated(); // L: 6601 - Object[] var67 = new Object[var45.length() + 1]; // L: 6602 + if (ServerPacket.field3001 == var1.serverPacket) { + var45 = var3.readStringCp1252NullTerminated(); + Object[] var67 = new Object[var45.length() + 1]; - for (var6 = var45.length() - 1; var6 >= 0; --var6) { // L: 6603 - if (var45.charAt(var6) == 's') { // L: 6604 + for (var6 = var45.length() - 1; var6 >= 0; --var6) { + if (var45.charAt(var6) == 's') { var67[var6 + 1] = var3.readStringCp1252NullTerminated(); } else { - var67[var6 + 1] = new Integer(var3.readInt()); // L: 6605 + var67[var6 + 1] = new Integer(var3.readInt()); } } - var67[0] = new Integer(var3.readInt()); // L: 6607 - ScriptEvent var72 = new ScriptEvent(); // L: 6608 - var72.args = var67; // L: 6609 - class285.runScriptEvent(var72); // L: 6610 - var1.serverPacket = null; // L: 6611 - return true; // L: 6612 + var67[0] = new Integer(var3.readInt()); + ScriptEvent var72 = new ScriptEvent(); + var72.args = var67; + class285.runScriptEvent(var72); + var1.serverPacket = null; + return true; } - if (ServerPacket.field2980 == var1.serverPacket) { // L: 6614 - UserComparator6.method2551(); // L: 6615 - weight = var3.readShort(); // L: 6616 - field471 = cycleCntr; // L: 6617 - var1.serverPacket = null; // L: 6618 - return true; // L: 6619 + if (ServerPacket.field2980 == var1.serverPacket) { + UserComparator6.method2551(); + weight = var3.readShort(); + field471 = cycleCntr; + var1.serverPacket = null; + return true; } - if (ServerPacket.field3023 == var1.serverPacket) { // L: 6621 - destinationX = var3.readUnsignedByte(); // L: 6622 - if (destinationX == 255) { // L: 6623 + if (ServerPacket.field3023 == var1.serverPacket) { + destinationX = var3.readUnsignedByte(); + if (destinationX == 255) { destinationX = 0; } - destinationY = var3.readUnsignedByte(); // L: 6624 - if (destinationY == 255) { // L: 6625 + destinationY = var3.readUnsignedByte(); + if (destinationY == 255) { destinationY = 0; } - var1.serverPacket = null; // L: 6626 - return true; // L: 6627 + var1.serverPacket = null; + return true; } - if (ServerPacket.field2930 == var1.serverPacket) { // L: 6629 - var17 = var3.readInt(); // L: 6630 - var5 = var3.readInt(); // L: 6631 - var6 = class143.getGcDuration(); // L: 6632 - PacketBufferNode var73 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2890, packetWriter.isaacCipher); // L: 6634 - var73.packetBuffer.writeByte(GameEngine.fps); // L: 6635 - var73.packetBuffer.method7343(var6); // L: 6636 - var73.packetBuffer.method7407(var17); // L: 6637 - var73.packetBuffer.writeIntME(var5); // L: 6638 - packetWriter.addNode(var73); // L: 6639 - var1.serverPacket = null; // L: 6640 - return true; // L: 6641 + if (ServerPacket.field2930 == var1.serverPacket) { + var17 = var3.readInt(); + var5 = var3.readInt(); + var6 = class143.getGcDuration(); + PacketBufferNode var73 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2890, packetWriter.isaacCipher); + var73.packetBuffer.writeByte(GameEngine.fps); + var73.packetBuffer.method7343(var6); + var73.packetBuffer.method7407(var17); + var73.packetBuffer.writeIntME(var5); + packetWriter.addNode(var73); + var1.serverPacket = null; + return true; } - if (ServerPacket.field2955 == var1.serverPacket) { // L: 6643 - if (Players.friendsChat != null) { // L: 6644 - Players.friendsChat.method6305(var3); // L: 6645 + if (ServerPacket.field2955 == var1.serverPacket) { + if (Players.friendsChat != null) { + Players.friendsChat.method6305(var3); } - class334.method6216(); // L: 6647 - var1.serverPacket = null; // L: 6648 - return true; // L: 6649 + class334.method6216(); + var1.serverPacket = null; + return true; } Widget var25; - if (ServerPacket.field2960 == var1.serverPacket) { // L: 6651 - var17 = var3.readShort(); // L: 6652 - var5 = var3.readInt(); // L: 6653 - var6 = var3.method7405(); // L: 6654 - var25 = ChatChannel.getWidget(var5); // L: 6655 - if (var17 != var25.rawX || var6 != var25.rawY || var25.xAlignment != 0 || var25.yAlignment != 0) { // L: 6656 - var25.rawX = var17; // L: 6657 - var25.rawY = var6; // L: 6658 - var25.xAlignment = 0; // L: 6659 - var25.yAlignment = 0; // L: 6660 - SecureRandomCallable.invalidateWidget(var25); // L: 6661 - this.alignWidget(var25); // L: 6662 - if (var25.type == 0) { // L: 6663 + if (ServerPacket.field2960 == var1.serverPacket) { + var17 = var3.readShort(); + var5 = var3.readInt(); + var6 = var3.method7405(); + var25 = ChatChannel.getWidget(var5); + if (var17 != var25.rawX || var6 != var25.rawY || var25.xAlignment != 0 || var25.yAlignment != 0) { + var25.rawX = var17; + var25.rawY = var6; + var25.xAlignment = 0; + var25.yAlignment = 0; + SecureRandomCallable.invalidateWidget(var25); + this.alignWidget(var25); + if (var25.type == 0) { class115.revalidateWidgetScroll(MouseRecorder.Widget_interfaceComponents[var5 >> 16], var25, false); } } - var1.serverPacket = null; // L: 6665 - return true; // L: 6666 + var1.serverPacket = null; + return true; } - if (ServerPacket.field2996 == var1.serverPacket) { // L: 6668 - DirectByteArrayCopier.method5328(class253.field2918); // L: 6669 - var1.serverPacket = null; // L: 6670 - return true; // L: 6671 + if (ServerPacket.field2996 == var1.serverPacket) { + DirectByteArrayCopier.method5328(class253.field2918); + var1.serverPacket = null; + return true; } - if (ServerPacket.field2998 == var1.serverPacket) { // L: 6673 - BuddyRankComparator.field1342 = null; // L: 6674 - var1.serverPacket = null; // L: 6675 - return true; // L: 6676 + if (ServerPacket.field2998 == var1.serverPacket) { + BuddyRankComparator.field1342 = null; + var1.serverPacket = null; + return true; } int var9; @@ -5100,1297 +5100,1297 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { int var26; int var27; InterfaceParent var71; - if (ServerPacket.field3021 == var1.serverPacket) { // L: 6678 - var17 = var3.offset + var1.serverPacketLength; // L: 6679 - var5 = var3.readUnsignedShort(); // L: 6680 - var6 = var3.readUnsignedShort(); // L: 6681 - if (var5 != rootInterface) { // L: 6682 - rootInterface = var5; // L: 6683 - this.resizeRoot(false); // L: 6684 - class140.Widget_resetModelFrames(rootInterface); // L: 6685 - class33.runWidgetOnLoadListener(rootInterface); // L: 6686 + if (ServerPacket.field3021 == var1.serverPacket) { + var17 = var3.offset + var1.serverPacketLength; + var5 = var3.readUnsignedShort(); + var6 = var3.readUnsignedShort(); + if (var5 != rootInterface) { + rootInterface = var5; + this.resizeRoot(false); + class140.Widget_resetModelFrames(rootInterface); + class33.runWidgetOnLoadListener(rootInterface); - for (var7 = 0; var7 < 100; ++var7) { // L: 6687 + for (var7 = 0; var7 < 100; ++var7) { field504[var7] = true; } } InterfaceParent var54; - for (; var6-- > 0; var54.field1014 = true) { // L: 6689 6699 - var7 = var3.readInt(); // L: 6690 - var26 = var3.readUnsignedShort(); // L: 6691 - var9 = var3.readUnsignedByte(); // L: 6692 - var54 = (InterfaceParent)interfaceParents.get((long)var7); // L: 6693 - if (var54 != null && var26 != var54.group) { // L: 6694 - class10.closeInterface(var54, true); // L: 6695 - var54 = null; // L: 6696 + for (; var6-- > 0; var54.field1014 = true) { + var7 = var3.readInt(); + var26 = var3.readUnsignedShort(); + var9 = var3.readUnsignedByte(); + var54 = (InterfaceParent)interfaceParents.get((long)var7); + if (var54 != null && var26 != var54.group) { + class10.closeInterface(var54, true); + var54 = null; } - if (var54 == null) { // L: 6698 + if (var54 == null) { var54 = ChatChannel.method2058(var7, var26, var9); } } - for (var71 = (InterfaceParent)interfaceParents.first(); var71 != null; var71 = (InterfaceParent)interfaceParents.next()) { // L: 6701 - if (var71.field1014) { // L: 6702 + for (var71 = (InterfaceParent)interfaceParents.first(); var71 != null; var71 = (InterfaceParent)interfaceParents.next()) { + if (var71.field1014) { var71.field1014 = false; } else { - class10.closeInterface(var71, true); // L: 6704 + class10.closeInterface(var71, true); } } - widgetFlags = new NodeHashTable(512); // L: 6707 + widgetFlags = new NodeHashTable(512); - while (var3.offset < var17) { // L: 6708 - var7 = var3.readInt(); // L: 6709 - var26 = var3.readUnsignedShort(); // L: 6710 - var9 = var3.readUnsignedShort(); // L: 6711 - var27 = var3.readInt(); // L: 6712 + while (var3.offset < var17) { + var7 = var3.readInt(); + var26 = var3.readUnsignedShort(); + var9 = var3.readUnsignedShort(); + var27 = var3.readInt(); - for (int var74 = var26; var74 <= var9; ++var74) { // L: 6713 - var12 = (long)var74 + ((long)var7 << 32); // L: 6714 - widgetFlags.put(new IntegerNode(var27), var12); // L: 6715 + for (int var74 = var26; var74 <= var9; ++var74) { + var12 = (long)var74 + ((long)var7 << 32); + widgetFlags.put(new IntegerNode(var27), var12); } } - var1.serverPacket = null; // L: 6718 - return true; // L: 6719 + var1.serverPacket = null; + return true; } - if (ServerPacket.field3018 == var1.serverPacket) { // L: 6721 - var17 = var3.readInt(); // L: 6722 - var5 = var3.readUnsignedShort(); // L: 6723 - if (var17 < -70000) { // L: 6724 + if (ServerPacket.field3018 == var1.serverPacket) { + var17 = var3.readInt(); + var5 = var3.readUnsignedShort(); + if (var17 < -70000) { var5 += 32768; } - if (var17 >= 0) { // L: 6726 + if (var17 >= 0) { var18 = ChatChannel.getWidget(var17); } else { - var18 = null; // L: 6727 + var18 = null; } - if (var18 != null) { // L: 6728 - for (var7 = 0; var7 < var18.itemIds.length; ++var7) { // L: 6729 - var18.itemIds[var7] = 0; // L: 6730 - var18.itemQuantities[var7] = 0; // L: 6731 + if (var18 != null) { + for (var7 = 0; var7 < var18.itemIds.length; ++var7) { + var18.itemIds[var7] = 0; + var18.itemQuantities[var7] = 0; } } - class141.clearItemContainer(var5); // L: 6734 - var7 = var3.readUnsignedShort(); // L: 6735 + class141.clearItemContainer(var5); + var7 = var3.readUnsignedShort(); - for (var26 = 0; var26 < var7; ++var26) { // L: 6736 - var9 = var3.method7392(); // L: 6737 - if (var9 == 255) { // L: 6738 + for (var26 = 0; var26 < var7; ++var26) { + var9 = var3.method7392(); + if (var9 == 255) { var9 = var3.readInt(); } - var27 = var3.method7401(); // L: 6739 - if (var18 != null && var26 < var18.itemIds.length) { // L: 6740 6741 - var18.itemIds[var26] = var27; // L: 6742 - var18.itemQuantities[var26] = var9; // L: 6743 + var27 = var3.method7401(); + if (var18 != null && var26 < var18.itemIds.length) { + var18.itemIds[var26] = var27; + var18.itemQuantities[var26] = var9; } - GraphicsObject.itemContainerSetItem(var5, var26, var27 - 1, var9); // L: 6746 + GraphicsObject.itemContainerSetItem(var5, var26, var27 - 1, var9); } - if (var18 != null) { // L: 6748 + if (var18 != null) { SecureRandomCallable.invalidateWidget(var18); } - UserComparator6.method2551(); // L: 6749 - changedItemContainers[++field665 - 1 & 31] = var5 & 32767; // L: 6750 - var1.serverPacket = null; // L: 6751 - return true; // L: 6752 + UserComparator6.method2551(); + changedItemContainers[++field665 - 1 & 31] = var5 & 32767; + var1.serverPacket = null; + return true; } - if (ServerPacket.field2944 == var1.serverPacket) { // L: 6754 - var17 = var3.readUnsignedByte(); // L: 6755 - VarpDefinition.method3168(var17); // L: 6756 - var1.serverPacket = null; // L: 6757 - return true; // L: 6758 + if (ServerPacket.field2944 == var1.serverPacket) { + var17 = var3.readUnsignedByte(); + VarpDefinition.method3168(var17); + var1.serverPacket = null; + return true; } - if (ServerPacket.field3027 == var1.serverPacket && isCameraLocked) { // L: 6760 6761 - field724 = true; // L: 6762 - Renderable.field2358 = var3.readUnsignedByte(); // L: 6763 - ItemComposition.field2012 = var3.readUnsignedByte(); // L: 6764 - WorldMapSection1.field2755 = var3.readUnsignedByte(); // L: 6765 - ChatChannel.field956 = var3.readUnsignedByte(); // L: 6766 + if (ServerPacket.field3027 == var1.serverPacket && isCameraLocked) { + field724 = true; + Renderable.field2358 = var3.readUnsignedByte(); + ItemComposition.field2012 = var3.readUnsignedByte(); + WorldMapSection1.field2755 = var3.readUnsignedByte(); + ChatChannel.field956 = var3.readUnsignedByte(); - for (var17 = 0; var17 < 5; ++var17) { // L: 6767 + for (var17 = 0; var17 < 5; ++var17) { field725[var17] = false; } - var1.serverPacket = null; // L: 6768 - return true; // L: 6769 + var1.serverPacket = null; + return true; } - if (ServerPacket.field2949 == var1.serverPacket) { // L: 6772 - World var48 = new World(); // L: 6773 - var48.host = var3.readStringCp1252NullTerminated(); // L: 6774 - var48.id = var3.readUnsignedShort(); // L: 6775 - var5 = var3.readInt(); // L: 6776 - var48.properties = var5; // L: 6777 - VertexNormal.updateGameState(45); // L: 6778 - var2.close(); // L: 6779 - var2 = null; // L: 6780 - BoundaryObject.changeWorld(var48); // L: 6781 - var1.serverPacket = null; // L: 6782 - return false; // L: 6783 + if (ServerPacket.field2949 == var1.serverPacket) { + World var48 = new World(); + var48.host = var3.readStringCp1252NullTerminated(); + var48.id = var3.readUnsignedShort(); + var5 = var3.readInt(); + var48.properties = var5; + VertexNormal.updateGameState(45); + var2.close(); + var2 = null; + BoundaryObject.changeWorld(var48); + var1.serverPacket = null; + return false; } - if (ServerPacket.field2984 == var1.serverPacket) { // L: 6785 - DevicePcmPlayerProvider.loadRegions(false, var1.packetBuffer); // L: 6786 - var1.serverPacket = null; // L: 6787 - return true; // L: 6788 + if (ServerPacket.field2984 == var1.serverPacket) { + DevicePcmPlayerProvider.loadRegions(false, var1.packetBuffer); + var1.serverPacket = null; + return true; } - if (ServerPacket.field2940 == var1.serverPacket) { // L: 6790 - field583 = cycleCntr; // L: 6791 - var68 = var3.readByte(); // L: 6792 - class143 var65 = new class143(var3); // L: 6793 + if (ServerPacket.field2940 == var1.serverPacket) { + field583 = cycleCntr; + var68 = var3.readByte(); + class143 var65 = new class143(var3); ClanChannel var70; - if (var68 >= 0) { // L: 6795 + if (var68 >= 0) { var70 = currentClanChannels[var68]; } else { - var70 = UserComparator5.guestClanChannel; // L: 6796 + var70 = UserComparator5.guestClanChannel; } - var65.method2960(var70); // L: 6797 - var1.serverPacket = null; // L: 6798 - return true; // L: 6799 + var65.method2960(var70); + var1.serverPacket = null; + return true; } - if (ServerPacket.field2938 == var1.serverPacket) { // L: 6801 - var17 = var3.readUnsignedShort(); // L: 6802 - rootInterface = var17; // L: 6803 - this.resizeRoot(false); // L: 6804 - class140.Widget_resetModelFrames(var17); // L: 6805 - class33.runWidgetOnLoadListener(rootInterface); // L: 6806 + if (ServerPacket.field2938 == var1.serverPacket) { + var17 = var3.readUnsignedShort(); + rootInterface = var17; + this.resizeRoot(false); + class140.Widget_resetModelFrames(var17); + class33.runWidgetOnLoadListener(rootInterface); - for (var5 = 0; var5 < 100; ++var5) { // L: 6807 + for (var5 = 0; var5 < 100; ++var5) { field504[var5] = true; } - var1.serverPacket = null; // L: 6808 - return true; // L: 6809 + var1.serverPacket = null; + return true; } - if (ServerPacket.field3029 == var1.serverPacket) { // L: 6811 - var17 = var3.readInt(); // L: 6812 - var5 = var3.readInt(); // L: 6813 - InterfaceParent var69 = (InterfaceParent)interfaceParents.get((long)var17); // L: 6814 - var71 = (InterfaceParent)interfaceParents.get((long)var5); // L: 6815 - if (var71 != null) { // L: 6816 + if (ServerPacket.field3029 == var1.serverPacket) { + var17 = var3.readInt(); + var5 = var3.readInt(); + InterfaceParent var69 = (InterfaceParent)interfaceParents.get((long)var17); + var71 = (InterfaceParent)interfaceParents.get((long)var5); + if (var71 != null) { class10.closeInterface(var71, var69 == null || var71.group != var69.group); } - if (var69 != null) { // L: 6817 - var69.remove(); // L: 6818 - interfaceParents.put(var69, (long)var5); // L: 6819 + if (var69 != null) { + var69.remove(); + interfaceParents.put(var69, (long)var5); } - var52 = ChatChannel.getWidget(var17); // L: 6821 - if (var52 != null) { // L: 6822 + var52 = ChatChannel.getWidget(var17); + if (var52 != null) { SecureRandomCallable.invalidateWidget(var52); } - var52 = ChatChannel.getWidget(var5); // L: 6823 - if (var52 != null) { // L: 6824 - SecureRandomCallable.invalidateWidget(var52); // L: 6825 - class115.revalidateWidgetScroll(MouseRecorder.Widget_interfaceComponents[var52.id >>> 16], var52, true); // L: 6826 + var52 = ChatChannel.getWidget(var5); + if (var52 != null) { + SecureRandomCallable.invalidateWidget(var52); + class115.revalidateWidgetScroll(MouseRecorder.Widget_interfaceComponents[var52.id >>> 16], var52, true); } - if (rootInterface != -1) { // L: 6828 + if (rootInterface != -1) { Message.runIntfCloseListeners(rootInterface, 1); } - var1.serverPacket = null; // L: 6829 - return true; // L: 6830 + var1.serverPacket = null; + return true; } - if (ServerPacket.field2937 == var1.serverPacket) { // L: 6832 - DirectByteArrayCopier.method5328(class253.field2919); // L: 6833 - var1.serverPacket = null; // L: 6834 - return true; // L: 6835 + if (ServerPacket.field2937 == var1.serverPacket) { + DirectByteArrayCopier.method5328(class253.field2919); + var1.serverPacket = null; + return true; } - if (ServerPacket.field2934 == var1.serverPacket) { // L: 6837 - if (var1.serverPacketLength == 0) { // L: 6838 - Players.friendsChat = null; // L: 6839 + if (ServerPacket.field2934 == var1.serverPacket) { + if (var1.serverPacketLength == 0) { + Players.friendsChat = null; } else { - if (Players.friendsChat == null) { // L: 6842 - Players.friendsChat = new FriendsChat(class194.loginType, class295.client); // L: 6843 + if (Players.friendsChat == null) { + Players.friendsChat = new FriendsChat(class194.loginType, class295.client); } - Players.friendsChat.readUpdate(var3); // L: 6845 + Players.friendsChat.readUpdate(var3); } - class334.method6216(); // L: 6847 - var1.serverPacket = null; // L: 6848 - return true; // L: 6849 + class334.method6216(); + var1.serverPacket = null; + return true; } - if (ServerPacket.field2989 == var1.serverPacket) { // L: 6851 - UserComparator6.method2551(); // L: 6852 - runEnergy = var3.readUnsignedByte(); // L: 6853 - field471 = cycleCntr; // L: 6854 - var1.serverPacket = null; // L: 6855 - return true; // L: 6856 + if (ServerPacket.field2989 == var1.serverPacket) { + UserComparator6.method2551(); + runEnergy = var3.readUnsignedByte(); + field471 = cycleCntr; + var1.serverPacket = null; + return true; } - if (ServerPacket.field2961 == var1.serverPacket) { // L: 6858 - for (var17 = 0; var17 < class433.VarpDefinition_fileCount; ++var17) { // L: 6859 - VarpDefinition var64 = SecureRandomCallable.VarpDefinition_get(var17); // L: 6860 - if (var64 != null) { // L: 6861 - Varps.Varps_temp[var17] = 0; // L: 6862 - Varps.Varps_main[var17] = 0; // L: 6863 + if (ServerPacket.field2961 == var1.serverPacket) { + for (var17 = 0; var17 < class433.VarpDefinition_fileCount; ++var17) { + VarpDefinition var64 = SecureRandomCallable.VarpDefinition_get(var17); + if (var64 != null) { + Varps.Varps_temp[var17] = 0; + Varps.Varps_main[var17] = 0; } } - UserComparator6.method2551(); // L: 6866 - changedVarpCount += 32; // L: 6867 - var1.serverPacket = null; // L: 6868 - return true; // L: 6869 + UserComparator6.method2551(); + changedVarpCount += 32; + var1.serverPacket = null; + return true; } - if (ServerPacket.field2982 == var1.serverPacket) { // L: 6871 - DirectByteArrayCopier.method5328(class253.field2913); // L: 6872 - var1.serverPacket = null; // L: 6873 - return true; // L: 6874 + if (ServerPacket.field2982 == var1.serverPacket) { + DirectByteArrayCopier.method5328(class253.field2913); + var1.serverPacket = null; + return true; } - if (ServerPacket.field3016 == var1.serverPacket) { // L: 6876 - class167.field1813 = var3.method7520(); // L: 6877 - class17.field90 = var3.readUnsignedByte(); // L: 6878 + if (ServerPacket.field3016 == var1.serverPacket) { + class167.field1813 = var3.method7520(); + class17.field90 = var3.readUnsignedByte(); - while (var3.offset < var1.serverPacketLength) { // L: 6879 - var17 = var3.readUnsignedByte(); // L: 6880 - class253 var63 = Timer.method6230()[var17]; // L: 6881 - DirectByteArrayCopier.method5328(var63); // L: 6882 + while (var3.offset < var1.serverPacketLength) { + var17 = var3.readUnsignedByte(); + class253 var63 = Timer.method6230()[var17]; + DirectByteArrayCopier.method5328(var63); } - var1.serverPacket = null; // L: 6884 - return true; // L: 6885 + var1.serverPacket = null; + return true; } - if (ServerPacket.field2991 == var1.serverPacket) { // L: 6887 - DirectByteArrayCopier.method5328(class253.field2914); // L: 6888 - var1.serverPacket = null; // L: 6889 - return true; // L: 6890 + if (ServerPacket.field2991 == var1.serverPacket) { + DirectByteArrayCopier.method5328(class253.field2914); + var1.serverPacket = null; + return true; } long var29; long var31; long var33; - if (ServerPacket.field2931 == var1.serverPacket) { // L: 6892 - var45 = var3.readStringCp1252NullTerminated(); // L: 6893 - var29 = var3.readLong(); // L: 6894 - var31 = (long)var3.readUnsignedShort(); // L: 6895 - var33 = (long)var3.readMedium(); // L: 6896 - PlayerType var75 = (PlayerType)class130.findEnumerated(SpotAnimationDefinition.PlayerType_values(), var3.readUnsignedByte()); // L: 6897 - var12 = var33 + (var31 << 32); // L: 6898 - boolean var77 = false; // L: 6899 + if (ServerPacket.field2931 == var1.serverPacket) { + var45 = var3.readStringCp1252NullTerminated(); + var29 = var3.readLong(); + var31 = (long)var3.readUnsignedShort(); + var33 = (long)var3.readMedium(); + PlayerType var75 = (PlayerType)class130.findEnumerated(SpotAnimationDefinition.PlayerType_values(), var3.readUnsignedByte()); + var12 = var33 + (var31 << 32); + boolean var77 = false; - for (var15 = 0; var15 < 100; ++var15) { // L: 6900 - if (var12 == crossWorldMessageIds[var15]) { // L: 6901 - var77 = true; // L: 6902 - break; // L: 6903 + for (var15 = 0; var15 < 100; ++var15) { + if (var12 == crossWorldMessageIds[var15]) { + var77 = true; + break; } } - if (var75.isUser && GameEngine.friendSystem.isIgnored(new Username(var45, class194.loginType))) { // L: 6906 6907 + if (var75.isUser && GameEngine.friendSystem.isIgnored(new Username(var45, class194.loginType))) { var77 = true; } - if (!var77 && field590 == 0) { // L: 6909 - crossWorldMessageIds[crossWorldMessageIdsIndex] = var12; // L: 6910 - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6911 - var24 = AbstractFont.escapeBrackets(class412.method7287(SequenceDefinition.method3689(var3))); // L: 6912 - if (var75.modIcon != -1) { // L: 6913 + if (!var77 && field590 == 0) { + crossWorldMessageIds[crossWorldMessageIdsIndex] = var12; + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; + var24 = AbstractFont.escapeBrackets(class412.method7287(SequenceDefinition.method3689(var3))); + if (var75.modIcon != -1) { DevicePcmPlayerProvider.addChatMessage(9, class221.method4705(var75.modIcon) + var45, var24, GraphicsDefaults.base37DecodeLong(var29)); } else { - DevicePcmPlayerProvider.addChatMessage(9, var45, var24, GraphicsDefaults.base37DecodeLong(var29)); // L: 6914 + DevicePcmPlayerProvider.addChatMessage(9, var45, var24, GraphicsDefaults.base37DecodeLong(var29)); } } - var1.serverPacket = null; // L: 6916 - return true; // L: 6917 + var1.serverPacket = null; + return true; } boolean var66; - if (ServerPacket.field3017 == var1.serverPacket) { // L: 6919 - var66 = var3.readUnsignedByte() == 1; // L: 6920 - var5 = var3.method7411(); // L: 6921 - var18 = ChatChannel.getWidget(var5); // L: 6922 - if (var66 != var18.isHidden) { // L: 6923 - var18.isHidden = var66; // L: 6924 - SecureRandomCallable.invalidateWidget(var18); // L: 6925 + if (ServerPacket.field3017 == var1.serverPacket) { + var66 = var3.readUnsignedByte() == 1; + var5 = var3.method7411(); + var18 = ChatChannel.getWidget(var5); + if (var66 != var18.isHidden) { + var18.isHidden = var66; + SecureRandomCallable.invalidateWidget(var18); } - var1.serverPacket = null; // L: 6927 - return true; // L: 6928 + var1.serverPacket = null; + return true; } - if (ServerPacket.field2965 == var1.serverPacket) { // L: 6930 - isCameraLocked = false; // L: 6931 + if (ServerPacket.field2965 == var1.serverPacket) { + isCameraLocked = false; - for (var17 = 0; var17 < 5; ++var17) { // L: 6932 + for (var17 = 0; var17 < 5; ++var17) { field725[var17] = false; } - var1.serverPacket = null; // L: 6933 - return true; // L: 6934 + var1.serverPacket = null; + return true; } - if (ServerPacket.field2986 == var1.serverPacket) { // L: 6936 - if (rootInterface != -1) { // L: 6937 + if (ServerPacket.field2986 == var1.serverPacket) { + if (rootInterface != -1) { Message.runIntfCloseListeners(rootInterface, 0); } - var1.serverPacket = null; // L: 6938 - return true; // L: 6939 + var1.serverPacket = null; + return true; } - if (ServerPacket.field3000 == var1.serverPacket) { // L: 6941 - DirectByteArrayCopier.method5328(class253.field2912); // L: 6942 - var1.serverPacket = null; // L: 6943 - return true; // L: 6944 + if (ServerPacket.field3000 == var1.serverPacket) { + DirectByteArrayCopier.method5328(class253.field2912); + var1.serverPacket = null; + return true; } - if (ServerPacket.field2948 == var1.serverPacket) { // L: 6946 - DirectByteArrayCopier.method5328(class253.field2916); // L: 6947 - var1.serverPacket = null; // L: 6948 - return true; // L: 6949 + if (ServerPacket.field2948 == var1.serverPacket) { + DirectByteArrayCopier.method5328(class253.field2916); + var1.serverPacket = null; + return true; } - if (ServerPacket.field3004 == var1.serverPacket) { // L: 6951 - GrandExchangeOfferOwnWorldComparator.updateNpcs(false, var3); // L: 6952 - var1.serverPacket = null; // L: 6953 - return true; // L: 6954 + if (ServerPacket.field3004 == var1.serverPacket) { + GrandExchangeOfferOwnWorldComparator.updateNpcs(false, var3); + var1.serverPacket = null; + return true; } - if (ServerPacket.field2968 == var1.serverPacket) { // L: 6956 - GameEngine.friendSystem.readUpdate(var3, var1.serverPacketLength); // L: 6957 - field671 = cycleCntr; // L: 6958 - var1.serverPacket = null; // L: 6959 - return true; // L: 6960 + if (ServerPacket.field2968 == var1.serverPacket) { + GameEngine.friendSystem.readUpdate(var3, var1.serverPacketLength); + field671 = cycleCntr; + var1.serverPacket = null; + return true; } - if (ServerPacket.field2957 == var1.serverPacket) { // L: 6962 - var17 = var3.method7401(); // L: 6963 - var5 = var3.method7411(); // L: 6964 - var18 = ChatChannel.getWidget(var5); // L: 6965 - if (var18 != null && var18.type == 0) { // L: 6966 - if (var17 > var18.scrollHeight - var18.height) { // L: 6967 + if (ServerPacket.field2957 == var1.serverPacket) { + var17 = var3.method7401(); + var5 = var3.method7411(); + var18 = ChatChannel.getWidget(var5); + if (var18 != null && var18.type == 0) { + if (var17 > var18.scrollHeight - var18.height) { var17 = var18.scrollHeight - var18.height; } - if (var17 < 0) { // L: 6968 + if (var17 < 0) { var17 = 0; } - if (var17 != var18.scrollY) { // L: 6969 - var18.scrollY = var17; // L: 6970 - SecureRandomCallable.invalidateWidget(var18); // L: 6971 + if (var17 != var18.scrollY) { + var18.scrollY = var17; + SecureRandomCallable.invalidateWidget(var18); } } - var1.serverPacket = null; // L: 6974 - return true; // L: 6975 + var1.serverPacket = null; + return true; } - if (ServerPacket.field2994 == var1.serverPacket) { // L: 6977 - DirectByteArrayCopier.method5328(class253.field2920); // L: 6978 - var1.serverPacket = null; // L: 6979 - return true; // L: 6980 + if (ServerPacket.field2994 == var1.serverPacket) { + DirectByteArrayCopier.method5328(class253.field2920); + var1.serverPacket = null; + return true; } - if (ServerPacket.field3026 == var1.serverPacket) { // L: 6982 - GameEngine.friendSystem.ignoreList.read(var3, var1.serverPacketLength); // L: 6983 - Skeleton.FriendSystem_invalidateIgnoreds(); // L: 6984 - field671 = cycleCntr; // L: 6985 - var1.serverPacket = null; // L: 6986 - return true; // L: 6987 + if (ServerPacket.field3026 == var1.serverPacket) { + GameEngine.friendSystem.ignoreList.read(var3, var1.serverPacketLength); + Skeleton.FriendSystem_invalidateIgnoreds(); + field671 = cycleCntr; + var1.serverPacket = null; + return true; } - if (ServerPacket.field2970 == var1.serverPacket) { // L: 6989 - var17 = var3.readInt(); // L: 6990 - var5 = var3.readUnsignedShort(); // L: 6991 - if (var17 < -70000) { // L: 6992 + if (ServerPacket.field2970 == var1.serverPacket) { + var17 = var3.readInt(); + var5 = var3.readUnsignedShort(); + if (var17 < -70000) { var5 += 32768; } - if (var17 >= 0) { // L: 6994 + if (var17 >= 0) { var18 = ChatChannel.getWidget(var17); } else { - var18 = null; // L: 6995 + var18 = null; } - for (; var3.offset < var1.serverPacketLength; GraphicsObject.itemContainerSetItem(var5, var7, var26 - 1, var9)) { // L: 6996 7010 - var7 = var3.readUShortSmart(); // L: 6997 - var26 = var3.readUnsignedShort(); // L: 6998 - var9 = 0; // L: 6999 - if (var26 != 0) { // L: 7000 - var9 = var3.readUnsignedByte(); // L: 7001 - if (var9 == 255) { // L: 7002 + for (; var3.offset < var1.serverPacketLength; GraphicsObject.itemContainerSetItem(var5, var7, var26 - 1, var9)) { + var7 = var3.readUShortSmart(); + var26 = var3.readUnsignedShort(); + var9 = 0; + if (var26 != 0) { + var9 = var3.readUnsignedByte(); + if (var9 == 255) { var9 = var3.readInt(); } } - if (var18 != null && var7 >= 0 && var7 < var18.itemIds.length) { // L: 7004 7005 - var18.itemIds[var7] = var26; // L: 7006 - var18.itemQuantities[var7] = var9; // L: 7007 + if (var18 != null && var7 >= 0 && var7 < var18.itemIds.length) { + var18.itemIds[var7] = var26; + var18.itemQuantities[var7] = var9; } } - if (var18 != null) { // L: 7012 + if (var18 != null) { SecureRandomCallable.invalidateWidget(var18); } - UserComparator6.method2551(); // L: 7013 - changedItemContainers[++field665 - 1 & 31] = var5 & 32767; // L: 7014 - var1.serverPacket = null; // L: 7015 - return true; // L: 7016 + UserComparator6.method2551(); + changedItemContainers[++field665 - 1 & 31] = var5 & 32767; + var1.serverPacket = null; + return true; } - if (ServerPacket.field2942 == var1.serverPacket) { // L: 7018 - isCameraLocked = true; // L: 7019 - field724 = false; // L: 7020 - PlayerComposition.field3193 = var3.readUnsignedByte(); // L: 7021 - MusicPatchNode.field3150 = var3.readUnsignedByte(); // L: 7022 - ModeWhere.field3951 = var3.readUnsignedShort(); // L: 7023 - WorldMapSection1.field2755 = var3.readUnsignedByte(); // L: 7024 - ChatChannel.field956 = var3.readUnsignedByte(); // L: 7025 - if (ChatChannel.field956 >= 100) { // L: 7026 - var17 = PlayerComposition.field3193 * 128 + 64; // L: 7027 - var5 = MusicPatchNode.field3150 * 128 + 64; // L: 7028 - var6 = FaceNormal.getTileHeight(var17, var5, class20.Client_plane) - ModeWhere.field3951; // L: 7029 - var7 = var17 - UserComparator7.cameraX; // L: 7030 - var26 = var6 - AbstractByteArrayCopier.cameraY; // L: 7031 - var9 = var5 - UserComparator10.cameraZ; // L: 7032 - var27 = (int)Math.sqrt((double)(var7 * var7 + var9 * var9)); // L: 7033 - UserComparator7.cameraPitch = (int)(Math.atan2((double)var26, (double)var27) * 325.9490051269531D) & 2047; // L: 7034 - class379.cameraYaw = (int)(Math.atan2((double)var7, (double)var9) * -325.9490051269531D) & 2047; // L: 7035 - if (UserComparator7.cameraPitch < 128) { // L: 7036 + if (ServerPacket.field2942 == var1.serverPacket) { + isCameraLocked = true; + field724 = false; + PlayerComposition.field3193 = var3.readUnsignedByte(); + MusicPatchNode.field3150 = var3.readUnsignedByte(); + ModeWhere.field3951 = var3.readUnsignedShort(); + WorldMapSection1.field2755 = var3.readUnsignedByte(); + ChatChannel.field956 = var3.readUnsignedByte(); + if (ChatChannel.field956 >= 100) { + var17 = PlayerComposition.field3193 * 128 + 64; + var5 = MusicPatchNode.field3150 * 128 + 64; + var6 = FaceNormal.getTileHeight(var17, var5, class20.Client_plane) - ModeWhere.field3951; + var7 = var17 - UserComparator7.cameraX; + var26 = var6 - AbstractByteArrayCopier.cameraY; + var9 = var5 - UserComparator10.cameraZ; + var27 = (int)Math.sqrt((double)(var7 * var7 + var9 * var9)); + UserComparator7.cameraPitch = (int)(Math.atan2((double)var26, (double)var27) * 325.9490051269531D) & 2047; + class379.cameraYaw = (int)(Math.atan2((double)var7, (double)var9) * -325.9490051269531D) & 2047; + if (UserComparator7.cameraPitch < 128) { UserComparator7.cameraPitch = 128; } - if (UserComparator7.cameraPitch > 383) { // L: 7037 + if (UserComparator7.cameraPitch > 383) { UserComparator7.cameraPitch = 383; } } - var1.serverPacket = null; // L: 7039 - return true; // L: 7040 + var1.serverPacket = null; + return true; } - if (ServerPacket.field3007 == var1.serverPacket) { // L: 7042 - isCameraLocked = true; // L: 7043 - field724 = false; // L: 7044 - class167.field1811 = var3.readUnsignedByte(); // L: 7045 - VarpDefinition.field1748 = var3.readUnsignedByte(); // L: 7046 - UserComparator9.field1335 = var3.readUnsignedShort(); // L: 7047 - Renderable.field2358 = var3.readUnsignedByte(); // L: 7048 - ItemComposition.field2012 = var3.readUnsignedByte(); // L: 7049 - if (ItemComposition.field2012 >= 100) { // L: 7050 - UserComparator7.cameraX = class167.field1811 * 128 + 64; // L: 7051 - UserComparator10.cameraZ = VarpDefinition.field1748 * 128 + 64; // L: 7052 - AbstractByteArrayCopier.cameraY = FaceNormal.getTileHeight(UserComparator7.cameraX, UserComparator10.cameraZ, class20.Client_plane) - UserComparator9.field1335; // L: 7053 + if (ServerPacket.field3007 == var1.serverPacket) { + isCameraLocked = true; + field724 = false; + class167.field1811 = var3.readUnsignedByte(); + VarpDefinition.field1748 = var3.readUnsignedByte(); + UserComparator9.field1335 = var3.readUnsignedShort(); + Renderable.field2358 = var3.readUnsignedByte(); + ItemComposition.field2012 = var3.readUnsignedByte(); + if (ItemComposition.field2012 >= 100) { + UserComparator7.cameraX = class167.field1811 * 128 + 64; + UserComparator10.cameraZ = VarpDefinition.field1748 * 128 + 64; + AbstractByteArrayCopier.cameraY = FaceNormal.getTileHeight(UserComparator7.cameraX, UserComparator10.cameraZ, class20.Client_plane) - UserComparator9.field1335; } - var1.serverPacket = null; // L: 7055 - return true; // L: 7056 + var1.serverPacket = null; + return true; } - if (ServerPacket.field2983 == var1.serverPacket) { // L: 7058 - var17 = var3.method7401(); // L: 7059 - var5 = var3.method7394(); // L: 7060 - var6 = var3.readInt(); // L: 7061 - var71 = (InterfaceParent)interfaceParents.get((long)var6); // L: 7062 - if (var71 != null) { // L: 7063 + if (ServerPacket.field2983 == var1.serverPacket) { + var17 = var3.method7401(); + var5 = var3.method7394(); + var6 = var3.readInt(); + var71 = (InterfaceParent)interfaceParents.get((long)var6); + if (var71 != null) { class10.closeInterface(var71, var17 != var71.group); } - ChatChannel.method2058(var6, var17, var5); // L: 7064 - var1.serverPacket = null; // L: 7065 - return true; // L: 7066 + ChatChannel.method2058(var6, var17, var5); + var1.serverPacket = null; + return true; } - if (ServerPacket.field3020 == var1.serverPacket) { // L: 7068 - class12.field72 = true; // L: 7069 - GrandExchangeOfferOwnWorldComparator.updateNpcs(true, var3); // L: 7070 - var1.serverPacket = null; // L: 7071 - return true; // L: 7072 + if (ServerPacket.field3020 == var1.serverPacket) { + class12.field72 = true; + GrandExchangeOfferOwnWorldComparator.updateNpcs(true, var3); + var1.serverPacket = null; + return true; } - if (ServerPacket.field2990 == var1.serverPacket) { // L: 7074 - var17 = var3.readUnsignedByte(); // L: 7075 - if (var3.readUnsignedByte() == 0) { // L: 7076 - grandExchangeOffers[var17] = new GrandExchangeOffer(); // L: 7077 - var3.offset += 18; // L: 7078 + if (ServerPacket.field2990 == var1.serverPacket) { + var17 = var3.readUnsignedByte(); + if (var3.readUnsignedByte() == 0) { + grandExchangeOffers[var17] = new GrandExchangeOffer(); + var3.offset += 18; } else { - --var3.offset; // L: 7081 - grandExchangeOffers[var17] = new GrandExchangeOffer(var3, false); // L: 7082 + --var3.offset; + grandExchangeOffers[var17] = new GrandExchangeOffer(var3, false); } - field675 = cycleCntr; // L: 7084 - var1.serverPacket = null; // L: 7085 - return true; // L: 7086 + field675 = cycleCntr; + var1.serverPacket = null; + return true; } - if (ServerPacket.field2951 == var1.serverPacket) { // L: 7088 - Strings.method5509(); // L: 7089 - var68 = var3.readByte(); // L: 7090 - if (var1.serverPacketLength == 1) { // L: 7091 - if (var68 >= 0) { // L: 7092 + if (ServerPacket.field2951 == var1.serverPacket) { + Strings.method5509(); + var68 = var3.readByte(); + if (var1.serverPacketLength == 1) { + if (var68 >= 0) { currentClanSettings[var68] = null; } else { - class222.guestClanSettings = null; // L: 7093 + class222.guestClanSettings = null; } - var1.serverPacket = null; // L: 7094 - return true; // L: 7095 + var1.serverPacket = null; + return true; } - if (var68 >= 0) { // L: 7097 - currentClanSettings[var68] = new ClanSettings(var3); // L: 7098 + if (var68 >= 0) { + currentClanSettings[var68] = new ClanSettings(var3); } else { - class222.guestClanSettings = new ClanSettings(var3); // L: 7101 + class222.guestClanSettings = new ClanSettings(var3); } - var1.serverPacket = null; // L: 7103 - return true; // L: 7104 + var1.serverPacket = null; + return true; } - if (ServerPacket.field2993 == var1.serverPacket) { // L: 7106 - Strings.method5509(); // L: 7107 - var68 = var3.readByte(); // L: 7108 - class129 var61 = new class129(var3); // L: 7109 + if (ServerPacket.field2993 == var1.serverPacket) { + Strings.method5509(); + var68 = var3.readByte(); + class129 var61 = new class129(var3); ClanSettings var62; - if (var68 >= 0) { // L: 7111 + if (var68 >= 0) { var62 = currentClanSettings[var68]; } else { - var62 = class222.guestClanSettings; // L: 7112 + var62 = class222.guestClanSettings; } - var61.method2781(var62); // L: 7113 - var1.serverPacket = null; // L: 7114 - return true; // L: 7115 + var61.method2781(var62); + var1.serverPacket = null; + return true; } - if (ServerPacket.field2939 == var1.serverPacket) { // L: 7117 - class167.field1813 = var3.readUnsignedByte(); // L: 7118 - class17.field90 = var3.method7394(); // L: 7119 - var1.serverPacket = null; // L: 7120 - return true; // L: 7121 + if (ServerPacket.field2939 == var1.serverPacket) { + class167.field1813 = var3.readUnsignedByte(); + class17.field90 = var3.method7394(); + var1.serverPacket = null; + return true; } - if (ServerPacket.field2973 == var1.serverPacket) { // L: 7123 - DevicePcmPlayerProvider.loadRegions(true, var1.packetBuffer); // L: 7124 - var1.serverPacket = null; // L: 7125 - return true; // L: 7126 + if (ServerPacket.field2973 == var1.serverPacket) { + DevicePcmPlayerProvider.loadRegions(true, var1.packetBuffer); + var1.serverPacket = null; + return true; } - if (ServerPacket.field2932 == var1.serverPacket) { // L: 7128 - hintArrowType = var3.readUnsignedByte(); // L: 7129 - if (hintArrowType == 1) { // L: 7130 + if (ServerPacket.field2932 == var1.serverPacket) { + hintArrowType = var3.readUnsignedByte(); + if (hintArrowType == 1) { hintArrowNpcIndex = var3.readUnsignedShort(); } - if (hintArrowType >= 2 && hintArrowType <= 6) { // L: 7131 - if (hintArrowType == 2) { // L: 7132 - hintArrowSubX = 64; // L: 7133 - hintArrowSubY = 64; // L: 7134 + if (hintArrowType >= 2 && hintArrowType <= 6) { + if (hintArrowType == 2) { + hintArrowSubX = 64; + hintArrowSubY = 64; } - if (hintArrowType == 3) { // L: 7136 - hintArrowSubX = 0; // L: 7137 - hintArrowSubY = 64; // L: 7138 + if (hintArrowType == 3) { + hintArrowSubX = 0; + hintArrowSubY = 64; } - if (hintArrowType == 4) { // L: 7140 - hintArrowSubX = 128; // L: 7141 - hintArrowSubY = 64; // L: 7142 + if (hintArrowType == 4) { + hintArrowSubX = 128; + hintArrowSubY = 64; } - if (hintArrowType == 5) { // L: 7144 - hintArrowSubX = 64; // L: 7145 - hintArrowSubY = 0; // L: 7146 + if (hintArrowType == 5) { + hintArrowSubX = 64; + hintArrowSubY = 0; } - if (hintArrowType == 6) { // L: 7148 - hintArrowSubX = 64; // L: 7149 - hintArrowSubY = 128; // L: 7150 + if (hintArrowType == 6) { + hintArrowSubX = 64; + hintArrowSubY = 128; } - hintArrowType = 2; // L: 7152 - hintArrowX = var3.readUnsignedShort(); // L: 7153 - hintArrowY = var3.readUnsignedShort(); // L: 7154 - hintArrowHeight = var3.readUnsignedByte(); // L: 7155 + hintArrowType = 2; + hintArrowX = var3.readUnsignedShort(); + hintArrowY = var3.readUnsignedShort(); + hintArrowHeight = var3.readUnsignedByte(); } - if (hintArrowType == 10) { // L: 7157 + if (hintArrowType == 10) { hintArrowPlayerIndex = var3.readUnsignedShort(); } - var1.serverPacket = null; // L: 7158 - return true; // L: 7159 + var1.serverPacket = null; + return true; } - if (ServerPacket.field2935 == var1.serverPacket) { // L: 7161 - var17 = var3.method7412(); // L: 7162 - var5 = var3.method7411(); // L: 7163 - var6 = var3.method7401(); // L: 7164 - if (var6 == 65535) { // L: 7165 + if (ServerPacket.field2935 == var1.serverPacket) { + var17 = var3.method7412(); + var5 = var3.method7411(); + var6 = var3.method7401(); + if (var6 == 65535) { var6 = -1; } - var25 = ChatChannel.getWidget(var5); // L: 7166 + var25 = ChatChannel.getWidget(var5); ItemComposition var51; - if (!var25.isIf3) { // L: 7167 - if (var6 == -1) { // L: 7168 - var25.modelType = 0; // L: 7169 - var1.serverPacket = null; // L: 7170 - return true; // L: 7171 + if (!var25.isIf3) { + if (var6 == -1) { + var25.modelType = 0; + var1.serverPacket = null; + return true; } - var51 = UserComparator6.ItemDefinition_get(var6); // L: 7173 - var25.modelType = 4; // L: 7174 - var25.modelId = var6; // L: 7175 - var25.modelAngleX = var51.xan2d; // L: 7176 - var25.modelAngleY = var51.yan2d; // L: 7177 - var25.modelZoom = var51.zoom2d * 100 / var17; // L: 7178 - SecureRandomCallable.invalidateWidget(var25); // L: 7179 + var51 = UserComparator6.ItemDefinition_get(var6); + var25.modelType = 4; + var25.modelId = var6; + var25.modelAngleX = var51.xan2d; + var25.modelAngleY = var51.yan2d; + var25.modelZoom = var51.zoom2d * 100 / var17; + SecureRandomCallable.invalidateWidget(var25); } else { - var25.itemId = var6; // L: 7182 - var25.itemQuantity = var17; // L: 7183 - var51 = UserComparator6.ItemDefinition_get(var6); // L: 7184 - var25.modelAngleX = var51.xan2d; // L: 7185 - var25.modelAngleY = var51.yan2d; // L: 7186 - var25.modelAngleZ = var51.zan2d; // L: 7187 - var25.modelOffsetX = var51.offsetX2d; // L: 7188 - var25.modelOffsetY = var51.offsetY2d; // L: 7189 - var25.modelZoom = var51.zoom2d; // L: 7190 - if (var51.isStackable == 1) { // L: 7191 + var25.itemId = var6; + var25.itemQuantity = var17; + var51 = UserComparator6.ItemDefinition_get(var6); + var25.modelAngleX = var51.xan2d; + var25.modelAngleY = var51.yan2d; + var25.modelAngleZ = var51.zan2d; + var25.modelOffsetX = var51.offsetX2d; + var25.modelOffsetY = var51.offsetY2d; + var25.modelZoom = var51.zoom2d; + if (var51.isStackable == 1) { var25.itemQuantityMode = 1; } else { - var25.itemQuantityMode = 2; // L: 7192 + var25.itemQuantityMode = 2; } - if (var25.field3280 > 0) { // L: 7193 + if (var25.field3280 > 0) { var25.modelZoom = var25.modelZoom * 32 / var25.field3280; - } else if (var25.rawWidth > 0) { // L: 7194 + } else if (var25.rawWidth > 0) { var25.modelZoom = var25.modelZoom * 32 / var25.rawWidth; } - SecureRandomCallable.invalidateWidget(var25); // L: 7195 + SecureRandomCallable.invalidateWidget(var25); } - var1.serverPacket = null; // L: 7197 - return true; // L: 7198 + var1.serverPacket = null; + return true; } - if (ServerPacket.field2988 == var1.serverPacket) { // L: 7200 - var17 = var3.method7412(); // L: 7201 - var5 = var3.method7401(); // L: 7202 - if (var5 == 65535) { // L: 7203 + if (ServerPacket.field2988 == var1.serverPacket) { + var17 = var3.method7412(); + var5 = var3.method7401(); + if (var5 == 65535) { var5 = -1; } - var6 = var3.method7401(); // L: 7204 - if (var6 == 65535) { // L: 7205 + var6 = var3.method7401(); + if (var6 == 65535) { var6 = -1; } - var7 = var3.readInt(); // L: 7206 + var7 = var3.readInt(); - for (var26 = var5; var26 <= var6; ++var26) { // L: 7207 - var33 = ((long)var7 << 32) + (long)var26; // L: 7208 - Node var35 = widgetFlags.get(var33); // L: 7209 - if (var35 != null) { // L: 7210 + for (var26 = var5; var26 <= var6; ++var26) { + var33 = ((long)var7 << 32) + (long)var26; + Node var35 = widgetFlags.get(var33); + if (var35 != null) { var35.remove(); } - widgetFlags.put(new IntegerNode(var17), var33); // L: 7211 + widgetFlags.put(new IntegerNode(var17), var33); } - var1.serverPacket = null; // L: 7213 - return true; // L: 7214 + var1.serverPacket = null; + return true; } - if (ServerPacket.field2967 == var1.serverPacket) { // L: 7216 - class12.field72 = true; // L: 7217 - GrandExchangeOfferOwnWorldComparator.updateNpcs(false, var3); // L: 7218 - var1.serverPacket = null; // L: 7219 - return true; // L: 7220 + if (ServerPacket.field2967 == var1.serverPacket) { + class12.field72 = true; + GrandExchangeOfferOwnWorldComparator.updateNpcs(false, var3); + var1.serverPacket = null; + return true; } - if (ServerPacket.field2943 == var1.serverPacket) { // L: 7222 - GameEngine.friendSystem.method1764(); // L: 7223 - field671 = cycleCntr; // L: 7224 - var1.serverPacket = null; // L: 7225 - return true; // L: 7226 + if (ServerPacket.field2943 == var1.serverPacket) { + GameEngine.friendSystem.method1764(); + field671 = cycleCntr; + var1.serverPacket = null; + return true; } - if (ServerPacket.field2981 == var1.serverPacket) { // L: 7228 - BuddyRankComparator.field1342 = new class370(Ignored.HitSplatDefinition_cached); // L: 7229 - var1.serverPacket = null; // L: 7230 - return true; // L: 7231 + if (ServerPacket.field2981 == var1.serverPacket) { + BuddyRankComparator.field1342 = new class370(Ignored.HitSplatDefinition_cached); + var1.serverPacket = null; + return true; } - if (ServerPacket.field2945 == var1.serverPacket) { // L: 7233 - rebootTimer = var3.readUnsignedShort() * 30; // L: 7234 - field471 = cycleCntr; // L: 7235 - var1.serverPacket = null; // L: 7236 - return true; // L: 7237 + if (ServerPacket.field2945 == var1.serverPacket) { + rebootTimer = var3.readUnsignedShort() * 30; + field471 = cycleCntr; + var1.serverPacket = null; + return true; } Widget var58; - if (ServerPacket.field2985 == var1.serverPacket) { // L: 7239 - var17 = var3.method7412(); // L: 7240 - var58 = ChatChannel.getWidget(var17); // L: 7241 + if (ServerPacket.field2985 == var1.serverPacket) { + var17 = var3.method7412(); + var58 = ChatChannel.getWidget(var17); - for (var6 = 0; var6 < var58.itemIds.length; ++var6) { // L: 7242 - var58.itemIds[var6] = -1; // L: 7243 - var58.itemIds[var6] = 0; // L: 7244 + for (var6 = 0; var6 < var58.itemIds.length; ++var6) { + var58.itemIds[var6] = -1; + var58.itemIds[var6] = 0; } - SecureRandomCallable.invalidateWidget(var58); // L: 7246 - var1.serverPacket = null; // L: 7247 - return true; // L: 7248 + SecureRandomCallable.invalidateWidget(var58); + var1.serverPacket = null; + return true; } - if (ServerPacket.field3008 == var1.serverPacket) { // L: 7250 - var45 = var3.readStringCp1252NullTerminated(); // L: 7251 - var5 = var3.method7568(); // L: 7252 - var18 = ChatChannel.getWidget(var5); // L: 7253 - if (!var45.equals(var18.text)) { // L: 7254 - var18.text = var45; // L: 7255 - SecureRandomCallable.invalidateWidget(var18); // L: 7256 + if (ServerPacket.field3008 == var1.serverPacket) { + var45 = var3.readStringCp1252NullTerminated(); + var5 = var3.method7568(); + var18 = ChatChannel.getWidget(var5); + if (!var45.equals(var18.text)) { + var18.text = var45; + SecureRandomCallable.invalidateWidget(var18); } - var1.serverPacket = null; // L: 7258 - return true; // L: 7259 + var1.serverPacket = null; + return true; } - if (ServerPacket.field2963 == var1.serverPacket) { // L: 7261 - var17 = var3.readUnsignedByte(); // L: 7262 - var5 = var3.readUnsignedByte(); // L: 7263 - var6 = var3.readUnsignedByte(); // L: 7264 - var7 = var3.readUnsignedByte(); // L: 7265 - field725[var17] = true; // L: 7266 - field726[var17] = var5; // L: 7267 - field679[var17] = var6; // L: 7268 - field618[var17] = var7; // L: 7269 - field729[var17] = 0; // L: 7270 - var1.serverPacket = null; // L: 7271 - return true; // L: 7272 + if (ServerPacket.field2963 == var1.serverPacket) { + var17 = var3.readUnsignedByte(); + var5 = var3.readUnsignedByte(); + var6 = var3.readUnsignedByte(); + var7 = var3.readUnsignedByte(); + field725[var17] = true; + field726[var17] = var5; + field679[var17] = var6; + field618[var17] = var7; + field729[var17] = 0; + var1.serverPacket = null; + return true; } - if (ServerPacket.field2958 == var1.serverPacket) { // L: 7274 - for (var17 = 0; var17 < players.length; ++var17) { // L: 7275 - if (players[var17] != null) { // L: 7276 + if (ServerPacket.field2958 == var1.serverPacket) { + for (var17 = 0; var17 < players.length; ++var17) { + if (players[var17] != null) { players[var17].sequence = -1; } } - for (var17 = 0; var17 < npcs.length; ++var17) { // L: 7278 - if (npcs[var17] != null) { // L: 7279 + for (var17 = 0; var17 < npcs.length; ++var17) { + if (npcs[var17] != null) { npcs[var17].sequence = -1; } } - var1.serverPacket = null; // L: 7281 - return true; // L: 7282 + var1.serverPacket = null; + return true; } - if (ServerPacket.field3015 == var1.serverPacket) { // L: 7284 - Projectile.privateChatMode = WorldMapData_0.method4353(var3.readUnsignedByte()); // L: 7285 - var1.serverPacket = null; // L: 7286 - return true; // L: 7287 + if (ServerPacket.field3015 == var1.serverPacket) { + Projectile.privateChatMode = WorldMapData_0.method4353(var3.readUnsignedByte()); + var1.serverPacket = null; + return true; } - if (ServerPacket.field2976 == var1.serverPacket) { // L: 7289 - var17 = var3.readInt(); // L: 7290 - if (var17 != field607) { // L: 7291 - field607 = var17; // L: 7292 - class291.method5502(); // L: 7293 + if (ServerPacket.field2976 == var1.serverPacket) { + var17 = var3.readInt(); + if (var17 != field607) { + field607 = var17; + class291.method5502(); } - var1.serverPacket = null; // L: 7295 - return true; // L: 7296 + var1.serverPacket = null; + return true; } - if (ServerPacket.field2969 == var1.serverPacket) { // L: 7298 - UserComparator4.method2499(var3.readStringCp1252NullTerminated()); // L: 7299 - var1.serverPacket = null; // L: 7300 - return true; // L: 7301 + if (ServerPacket.field2969 == var1.serverPacket) { + UserComparator4.method2499(var3.readStringCp1252NullTerminated()); + var1.serverPacket = null; + return true; } - if (ServerPacket.field2962 == var1.serverPacket) { // L: 7303 - publicChatMode = var3.readUnsignedByte(); // L: 7304 - tradeChatMode = var3.method7520(); // L: 7305 - var1.serverPacket = null; // L: 7306 - return true; // L: 7307 + if (ServerPacket.field2962 == var1.serverPacket) { + publicChatMode = var3.readUnsignedByte(); + tradeChatMode = var3.method7520(); + var1.serverPacket = null; + return true; } String var57; - if (ServerPacket.field2999 == var1.serverPacket) { // L: 7309 - var17 = var3.readUShortSmart(); // L: 7310 - boolean var53 = var3.readUnsignedByte() == 1; // L: 7311 - var57 = ""; // L: 7312 - boolean var50 = false; // L: 7313 - if (var53) { // L: 7314 - var57 = var3.readStringCp1252NullTerminated(); // L: 7315 - if (GameEngine.friendSystem.isIgnored(new Username(var57, class194.loginType))) { // L: 7316 + if (ServerPacket.field2999 == var1.serverPacket) { + var17 = var3.readUShortSmart(); + boolean var53 = var3.readUnsignedByte() == 1; + var57 = ""; + boolean var50 = false; + if (var53) { + var57 = var3.readStringCp1252NullTerminated(); + if (GameEngine.friendSystem.isIgnored(new Username(var57, class194.loginType))) { var50 = true; } } - String var8 = var3.readStringCp1252NullTerminated(); // L: 7318 - if (!var50) { // L: 7319 + String var8 = var3.readStringCp1252NullTerminated(); + if (!var50) { class194.addGameMessage(var17, var57, var8); } - var1.serverPacket = null; // L: 7320 - return true; // L: 7321 + var1.serverPacket = null; + return true; } - if (ServerPacket.field3009 == var1.serverPacket) { // L: 7323 - var66 = var3.readBoolean(); // L: 7324 - if (var66) { // L: 7325 - if (Messages.field1273 == null) { // L: 7326 + if (ServerPacket.field3009 == var1.serverPacket) { + var66 = var3.readBoolean(); + if (var66) { + if (Messages.field1273 == null) { Messages.field1273 = new class312(); } } else { - Messages.field1273 = null; // L: 7328 + Messages.field1273 = null; } - var1.serverPacket = null; // L: 7329 - return true; // L: 7330 + var1.serverPacket = null; + return true; } - if (ServerPacket.field2953 == var1.serverPacket) { // L: 7332 - var17 = var3.method7411(); // L: 7333 - var5 = var3.method7403(); // L: 7334 - var6 = var3.readUnsignedShort(); // L: 7335 - var25 = ChatChannel.getWidget(var17); // L: 7336 - var25.field3260 = var6 + (var5 << 16); // L: 7337 - var1.serverPacket = null; // L: 7338 - return true; // L: 7339 + if (ServerPacket.field2953 == var1.serverPacket) { + var17 = var3.method7411(); + var5 = var3.method7403(); + var6 = var3.readUnsignedShort(); + var25 = ChatChannel.getWidget(var17); + var25.field3260 = var6 + (var5 << 16); + var1.serverPacket = null; + return true; } int var13; String var41; - if (ServerPacket.field3012 == var1.serverPacket) { // L: 7341 - var45 = var3.readStringCp1252NullTerminated(); // L: 7342 - var29 = (long)var3.readUnsignedShort(); // L: 7343 - var31 = (long)var3.readMedium(); // L: 7344 - PlayerType var37 = (PlayerType)class130.findEnumerated(SpotAnimationDefinition.PlayerType_values(), var3.readUnsignedByte()); // L: 7345 - long var38 = (var29 << 32) + var31; // L: 7346 - boolean var40 = false; // L: 7347 + if (ServerPacket.field3012 == var1.serverPacket) { + var45 = var3.readStringCp1252NullTerminated(); + var29 = (long)var3.readUnsignedShort(); + var31 = (long)var3.readMedium(); + PlayerType var37 = (PlayerType)class130.findEnumerated(SpotAnimationDefinition.PlayerType_values(), var3.readUnsignedByte()); + long var38 = (var29 << 32) + var31; + boolean var40 = false; - for (var13 = 0; var13 < 100; ++var13) { // L: 7348 - if (crossWorldMessageIds[var13] == var38) { // L: 7349 - var40 = true; // L: 7350 - break; // L: 7351 + for (var13 = 0; var13 < 100; ++var13) { + if (crossWorldMessageIds[var13] == var38) { + var40 = true; + break; } } - if (GameEngine.friendSystem.isIgnored(new Username(var45, class194.loginType))) { // L: 7354 + if (GameEngine.friendSystem.isIgnored(new Username(var45, class194.loginType))) { var40 = true; } - if (!var40 && field590 == 0) { // L: 7355 - crossWorldMessageIds[crossWorldMessageIdsIndex] = var38; // L: 7356 - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 7357 - var41 = AbstractFont.escapeBrackets(class412.method7287(SequenceDefinition.method3689(var3))); // L: 7358 + if (!var40 && field590 == 0) { + crossWorldMessageIds[crossWorldMessageIdsIndex] = var38; + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; + var41 = AbstractFont.escapeBrackets(class412.method7287(SequenceDefinition.method3689(var3))); byte var76; - if (var37.isPrivileged) { // L: 7360 + if (var37.isPrivileged) { var76 = 7; } else { - var76 = 3; // L: 7361 + var76 = 3; } - if (var37.modIcon != -1) { // L: 7362 + if (var37.modIcon != -1) { class194.addGameMessage(var76, class221.method4705(var37.modIcon) + var45, var41); } else { - class194.addGameMessage(var76, var45, var41); // L: 7363 + class194.addGameMessage(var76, var45, var41); } } - var1.serverPacket = null; // L: 7365 - return true; // L: 7366 + var1.serverPacket = null; + return true; } - if (ServerPacket.field3025 == var1.serverPacket) { // L: 7368 - LoginScreenAnimation.logOut(); // L: 7369 - var1.serverPacket = null; // L: 7370 - return false; // L: 7371 + if (ServerPacket.field3025 == var1.serverPacket) { + LoginScreenAnimation.logOut(); + var1.serverPacket = null; + return false; } - if (ServerPacket.field3024 == var1.serverPacket) { // L: 7373 - var68 = var3.method7465(); // L: 7374 - var5 = var3.readUnsignedShort(); // L: 7375 - Varps.Varps_temp[var5] = var68; // L: 7376 - if (Varps.Varps_main[var5] != var68) { // L: 7377 - Varps.Varps_main[var5] = var68; // L: 7378 + if (ServerPacket.field3024 == var1.serverPacket) { + var68 = var3.method7465(); + var5 = var3.readUnsignedShort(); + Varps.Varps_temp[var5] = var68; + if (Varps.Varps_main[var5] != var68) { + Varps.Varps_main[var5] = var68; } - class281.changeGameOptions(var5); // L: 7380 - changedVarps[++changedVarpCount - 1 & 31] = var5; // L: 7381 - var1.serverPacket = null; // L: 7382 - return true; // L: 7383 + class281.changeGameOptions(var5); + changedVarps[++changedVarpCount - 1 & 31] = var5; + var1.serverPacket = null; + return true; } - if (ServerPacket.field2971 == var1.serverPacket) { // L: 7385 - var17 = var3.method7392(); // L: 7386 - var5 = var3.method7392(); // L: 7387 - var57 = var3.readStringCp1252NullTerminated(); // L: 7388 - if (var5 >= 1 && var5 <= 8) { // L: 7389 - if (var57.equalsIgnoreCase("null")) { // L: 7390 + if (ServerPacket.field2971 == var1.serverPacket) { + var17 = var3.method7392(); + var5 = var3.method7392(); + var57 = var3.readStringCp1252NullTerminated(); + if (var5 >= 1 && var5 <= 8) { + if (var57.equalsIgnoreCase("null")) { var57 = null; } - playerMenuActions[var5 - 1] = var57; // L: 7391 - playerOptionsPriorities[var5 - 1] = var17 == 0; // L: 7392 + playerMenuActions[var5 - 1] = var57; + playerOptionsPriorities[var5 - 1] = var17 == 0; } - var1.serverPacket = null; // L: 7394 - return true; // L: 7395 + var1.serverPacket = null; + return true; } - if (ServerPacket.field2979 == var1.serverPacket) { // L: 7397 - var68 = var3.readByte(); // L: 7398 - var29 = (long)var3.readUnsignedShort(); // L: 7399 - var31 = (long)var3.readMedium(); // L: 7400 - var33 = (var29 << 32) + var31; // L: 7401 - boolean var28 = false; // L: 7402 - ClanChannel var42 = var68 >= 0 ? currentClanChannels[var68] : UserComparator5.guestClanChannel; // L: 7403 - if (var42 == null) { // L: 7404 + if (ServerPacket.field2979 == var1.serverPacket) { + var68 = var3.readByte(); + var29 = (long)var3.readUnsignedShort(); + var31 = (long)var3.readMedium(); + var33 = (var29 << 32) + var31; + boolean var28 = false; + ClanChannel var42 = var68 >= 0 ? currentClanChannels[var68] : UserComparator5.guestClanChannel; + if (var42 == null) { var28 = true; } else { - for (var13 = 0; var13 < 100; ++var13) { // L: 7406 - if (var33 == crossWorldMessageIds[var13]) { // L: 7407 - var28 = true; // L: 7408 - break; // L: 7409 + for (var13 = 0; var13 < 100; ++var13) { + if (var33 == crossWorldMessageIds[var13]) { + var28 = true; + break; } } } - if (!var28) { // L: 7413 - crossWorldMessageIds[crossWorldMessageIdsIndex] = var33; // L: 7414 - crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 7415 - var41 = SequenceDefinition.method3689(var3); // L: 7416 - int var36 = var68 >= 0 ? 43 : 46; // L: 7417 - DevicePcmPlayerProvider.addChatMessage(var36, "", var41, var42.name); // L: 7418 + if (!var28) { + crossWorldMessageIds[crossWorldMessageIdsIndex] = var33; + crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; + var41 = SequenceDefinition.method3689(var3); + int var36 = var68 >= 0 ? 43 : 46; + DevicePcmPlayerProvider.addChatMessage(var36, "", var41, var42.name); } - var1.serverPacket = null; // L: 7420 - return true; // L: 7421 + var1.serverPacket = null; + return true; } - if (ServerPacket.field3014 == var1.serverPacket) { // L: 7423 - minimapState = var3.readUnsignedByte(); // L: 7424 - var1.serverPacket = null; // L: 7425 - return true; // L: 7426 + if (ServerPacket.field3014 == var1.serverPacket) { + minimapState = var3.readUnsignedByte(); + var1.serverPacket = null; + return true; } - if (ServerPacket.field2997 == var1.serverPacket) { // L: 7428 - GrandExchangeOfferOwnWorldComparator.updateNpcs(true, var3); // L: 7429 - var1.serverPacket = null; // L: 7430 - return true; // L: 7431 + if (ServerPacket.field2997 == var1.serverPacket) { + GrandExchangeOfferOwnWorldComparator.updateNpcs(true, var3); + var1.serverPacket = null; + return true; } - if (ServerPacket.field3022 == var1.serverPacket) { // L: 7433 - field583 = cycleCntr; // L: 7434 - var68 = var3.readByte(); // L: 7435 - if (var1.serverPacketLength == 1) { // L: 7436 - if (var68 >= 0) { // L: 7437 + if (ServerPacket.field3022 == var1.serverPacket) { + field583 = cycleCntr; + var68 = var3.readByte(); + if (var1.serverPacketLength == 1) { + if (var68 >= 0) { currentClanChannels[var68] = null; } else { - UserComparator5.guestClanChannel = null; // L: 7438 + UserComparator5.guestClanChannel = null; } - var1.serverPacket = null; // L: 7439 - return true; // L: 7440 + var1.serverPacket = null; + return true; } - if (var68 >= 0) { // L: 7442 - currentClanChannels[var68] = new ClanChannel(var3); // L: 7443 + if (var68 >= 0) { + currentClanChannels[var68] = new ClanChannel(var3); } else { - UserComparator5.guestClanChannel = new ClanChannel(var3); // L: 7446 + UserComparator5.guestClanChannel = new ClanChannel(var3); } - var1.serverPacket = null; // L: 7448 - return true; // L: 7449 + var1.serverPacket = null; + return true; } - if (ServerPacket.field3013 == var1.serverPacket) { // L: 7451 - var17 = var3.method7411(); // L: 7452 - var5 = var3.method7403(); // L: 7453 - Varps.Varps_temp[var5] = var17; // L: 7454 - if (Varps.Varps_main[var5] != var17) { // L: 7455 - Varps.Varps_main[var5] = var17; // L: 7456 + if (ServerPacket.field3013 == var1.serverPacket) { + var17 = var3.method7411(); + var5 = var3.method7403(); + Varps.Varps_temp[var5] = var17; + if (Varps.Varps_main[var5] != var17) { + Varps.Varps_main[var5] = var17; } - class281.changeGameOptions(var5); // L: 7458 - changedVarps[++changedVarpCount - 1 & 31] = var5; // L: 7459 - var1.serverPacket = null; // L: 7460 - return true; // L: 7461 + class281.changeGameOptions(var5); + changedVarps[++changedVarpCount - 1 & 31] = var5; + var1.serverPacket = null; + return true; } - if (ServerPacket.field2933 == var1.serverPacket) { // L: 7463 - var66 = var3.readUnsignedByte() == 1; // L: 7464 - if (var66) { // L: 7465 - WorldMapSprite.field2727 = Ignored.method6459() - var3.readLong(); // L: 7466 - grandExchangeEvents = new GrandExchangeEvents(var3, true); // L: 7467 + if (ServerPacket.field2933 == var1.serverPacket) { + var66 = var3.readUnsignedByte() == 1; + if (var66) { + WorldMapSprite.field2727 = Ignored.method6459() - var3.readLong(); + grandExchangeEvents = new GrandExchangeEvents(var3, true); } else { - grandExchangeEvents = null; // L: 7469 + grandExchangeEvents = null; } - field669 = cycleCntr; // L: 7470 - var1.serverPacket = null; // L: 7471 - return true; // L: 7472 + field669 = cycleCntr; + var1.serverPacket = null; + return true; } - if (ServerPacket.field2946 == var1.serverPacket) { // L: 7474 - class17.field90 = var3.method7392(); // L: 7475 - class167.field1813 = var3.readUnsignedByte(); // L: 7476 + if (ServerPacket.field2946 == var1.serverPacket) { + class17.field90 = var3.method7392(); + class167.field1813 = var3.readUnsignedByte(); - for (var17 = class17.field90; var17 < class17.field90 + 8; ++var17) { // L: 7477 - for (var5 = class167.field1813; var5 < class167.field1813 + 8; ++var5) { // L: 7478 - if (groundItems[class20.Client_plane][var17][var5] != null) { // L: 7479 - groundItems[class20.Client_plane][var17][var5] = null; // L: 7480 - MouseHandler.updateItemPile(var17, var5); // L: 7481 + for (var17 = class17.field90; var17 < class17.field90 + 8; ++var17) { + for (var5 = class167.field1813; var5 < class167.field1813 + 8; ++var5) { + if (groundItems[class20.Client_plane][var17][var5] != null) { + groundItems[class20.Client_plane][var17][var5] = null; + MouseHandler.updateItemPile(var17, var5); } } } - for (PendingSpawn var47 = (PendingSpawn)pendingSpawns.last(); var47 != null; var47 = (PendingSpawn)pendingSpawns.previous()) { // L: 7485 7486 7488 - if (var47.x >= class17.field90 && var47.x < class17.field90 + 8 && var47.y >= class167.field1813 && var47.y < class167.field1813 + 8 && var47.plane == class20.Client_plane) { // L: 7487 + for (PendingSpawn var47 = (PendingSpawn)pendingSpawns.last(); var47 != null; var47 = (PendingSpawn)pendingSpawns.previous()) { + if (var47.x >= class17.field90 && var47.x < class17.field90 + 8 && var47.y >= class167.field1813 && var47.y < class167.field1813 + 8 && var47.plane == class20.Client_plane) { var47.hitpoints = 0; } } - var1.serverPacket = null; // L: 7490 - return true; // L: 7491 + var1.serverPacket = null; + return true; } - if (ServerPacket.field3019 == var1.serverPacket) { // L: 7493 - DirectByteArrayCopier.method5328(class253.field2911); // L: 7494 - var1.serverPacket = null; // L: 7495 - return true; // L: 7496 + if (ServerPacket.field3019 == var1.serverPacket) { + DirectByteArrayCopier.method5328(class253.field2911); + var1.serverPacket = null; + return true; } - if (ServerPacket.field3006 == var1.serverPacket) { // L: 7498 - var17 = var3.readInt(); // L: 7499 - InterfaceParent var60 = (InterfaceParent)interfaceParents.get((long)var17); // L: 7500 - if (var60 != null) { // L: 7501 + if (ServerPacket.field3006 == var1.serverPacket) { + var17 = var3.readInt(); + InterfaceParent var60 = (InterfaceParent)interfaceParents.get((long)var17); + if (var60 != null) { class10.closeInterface(var60, true); } - if (meslayerContinueWidget != null) { // L: 7502 - SecureRandomCallable.invalidateWidget(meslayerContinueWidget); // L: 7503 - meslayerContinueWidget = null; // L: 7504 + if (meslayerContinueWidget != null) { + SecureRandomCallable.invalidateWidget(meslayerContinueWidget); + meslayerContinueWidget = null; } - var1.serverPacket = null; // L: 7506 - return true; // L: 7507 + var1.serverPacket = null; + return true; } - if (ServerPacket.field2947 == var1.serverPacket) { // L: 7509 - byte[] var46 = new byte[var1.serverPacketLength]; // L: 7510 - var3.method7312(var46, 0, var46.length); // L: 7511 - Buffer var59 = new Buffer(var46); // L: 7512 - var57 = var59.readStringCp1252NullTerminated(); // L: 7513 - WorldMapSprite.openURL(var57, true, false); // L: 7514 - var1.serverPacket = null; // L: 7515 - return true; // L: 7516 + if (ServerPacket.field2947 == var1.serverPacket) { + byte[] var46 = new byte[var1.serverPacketLength]; + var3.method7312(var46, 0, var46.length); + Buffer var59 = new Buffer(var46); + var57 = var59.readStringCp1252NullTerminated(); + WorldMapSprite.openURL(var57, true, false); + var1.serverPacket = null; + return true; } - if (ServerPacket.field2959 == var1.serverPacket) { // L: 7518 - var17 = var3.method7411(); // L: 7519 - var5 = var3.method7499(); // L: 7520 - var18 = ChatChannel.getWidget(var17); // L: 7521 - if (var18.modelType != 2 || var5 != var18.modelId) { // L: 7522 - var18.modelType = 2; // L: 7523 - var18.modelId = var5; // L: 7524 - SecureRandomCallable.invalidateWidget(var18); // L: 7525 + if (ServerPacket.field2959 == var1.serverPacket) { + var17 = var3.method7411(); + var5 = var3.method7499(); + var18 = ChatChannel.getWidget(var17); + if (var18.modelType != 2 || var5 != var18.modelId) { + var18.modelType = 2; + var18.modelId = var5; + SecureRandomCallable.invalidateWidget(var18); } - var1.serverPacket = null; // L: 7527 - return true; // L: 7528 + var1.serverPacket = null; + return true; } - if (ServerPacket.field2936 == var1.serverPacket) { // L: 7530 - for (var17 = 0; var17 < Varps.Varps_main.length; ++var17) { // L: 7531 - if (Varps.Varps_temp[var17] != Varps.Varps_main[var17]) { // L: 7532 - Varps.Varps_main[var17] = Varps.Varps_temp[var17]; // L: 7533 - class281.changeGameOptions(var17); // L: 7534 - changedVarps[++changedVarpCount - 1 & 31] = var17; // L: 7535 + if (ServerPacket.field2936 == var1.serverPacket) { + for (var17 = 0; var17 < Varps.Varps_main.length; ++var17) { + if (Varps.Varps_temp[var17] != Varps.Varps_main[var17]) { + Varps.Varps_main[var17] = Varps.Varps_temp[var17]; + class281.changeGameOptions(var17); + changedVarps[++changedVarpCount - 1 & 31] = var17; } } - var1.serverPacket = null; // L: 7538 - return true; // L: 7539 + var1.serverPacket = null; + return true; } - if (ServerPacket.field2974 == var1.serverPacket) { // L: 7541 - var17 = var3.method7412(); // L: 7542 - var58 = ChatChannel.getWidget(var17); // L: 7543 - var58.modelType = 3; // L: 7544 - var58.modelId = class340.localPlayer.appearance.getChatHeadId(); // L: 7545 - SecureRandomCallable.invalidateWidget(var58); // L: 7546 - var1.serverPacket = null; // L: 7547 - return true; // L: 7548 + if (ServerPacket.field2974 == var1.serverPacket) { + var17 = var3.method7412(); + var58 = ChatChannel.getWidget(var17); + var58.modelType = 3; + var58.modelId = class340.localPlayer.appearance.getChatHeadId(); + SecureRandomCallable.invalidateWidget(var58); + var1.serverPacket = null; + return true; } - if (ServerPacket.field3010 == var1.serverPacket) { // L: 7550 - updatePlayers(var3, var1.serverPacketLength); // L: 7551 - WorldMapLabelSize.method4373(); // L: 7552 - var1.serverPacket = null; // L: 7553 - return true; // L: 7554 + if (ServerPacket.field3010 == var1.serverPacket) { + updatePlayers(var3, var1.serverPacketLength); + WorldMapLabelSize.method4373(); + var1.serverPacket = null; + return true; } - if (ServerPacket.field2966 == var1.serverPacket) { // L: 7556 - ObjectSound.readReflectionCheck(var3, var1.serverPacketLength); // L: 7557 - var1.serverPacket = null; // L: 7558 - return true; // L: 7559 + if (ServerPacket.field2966 == var1.serverPacket) { + ObjectSound.readReflectionCheck(var3, var1.serverPacketLength); + var1.serverPacket = null; + return true; } - if (ServerPacket.field2964 == var1.serverPacket) { // L: 7561 - UserComparator6.method2551(); // L: 7562 - var17 = var3.readUnsignedByte(); // L: 7563 - var5 = var3.method7394(); // L: 7564 - var6 = var3.method7411(); // L: 7565 - experience[var5] = var6; // L: 7566 - currentLevels[var5] = var17; // L: 7567 - levels[var5] = 1; // L: 7568 + if (ServerPacket.field2964 == var1.serverPacket) { + UserComparator6.method2551(); + var17 = var3.readUnsignedByte(); + var5 = var3.method7394(); + var6 = var3.method7411(); + experience[var5] = var6; + currentLevels[var5] = var17; + levels[var5] = 1; - for (var7 = 0; var7 < 98; ++var7) { // L: 7569 + for (var7 = 0; var7 < 98; ++var7) { if (var6 >= Skills.Skills_experienceTable[var7]) { levels[var5] = var7 + 2; } } - changedSkills[++changedSkillsCount - 1 & 31] = var5; // L: 7570 - var1.serverPacket = null; // L: 7571 - return true; // L: 7572 + changedSkills[++changedSkillsCount - 1 & 31] = var5; + var1.serverPacket = null; + return true; } - if (ServerPacket.field2995 == var1.serverPacket) { // L: 7574 - var3.offset += 28; // L: 7575 - if (var3.checkCrc()) { // L: 7576 + if (ServerPacket.field2995 == var1.serverPacket) { + var3.offset += 28; + if (var3.checkCrc()) { ObjectComposition.method3541(var3, var3.offset - 28); } - var1.serverPacket = null; // L: 7577 - return true; // L: 7578 + var1.serverPacket = null; + return true; } - if (ServerPacket.field2975 == var1.serverPacket) { // L: 7580 - var17 = var3.readUnsignedShort(); // L: 7581 - if (var17 == 65535) { // L: 7582 + if (ServerPacket.field2975 == var1.serverPacket) { + var17 = var3.readUnsignedShort(); + if (var17 == 65535) { var17 = -1; } - class18.playSong(var17); // L: 7583 - var1.serverPacket = null; // L: 7584 - return true; // L: 7585 + class18.playSong(var17); + var1.serverPacket = null; + return true; } - if (ServerPacket.field3003 == var1.serverPacket) { // L: 7587 - var17 = var3.method7508(); // L: 7588 - var5 = var3.method7401(); // L: 7589 - if (var5 == 65535) { // L: 7590 + if (ServerPacket.field3003 == var1.serverPacket) { + var17 = var3.method7508(); + var5 = var3.method7401(); + if (var5 == 65535) { var5 = -1; } - class315.method5822(var5, var17); // L: 7591 - var1.serverPacket = null; // L: 7592 - return true; // L: 7593 + class315.method5822(var5, var17); + var1.serverPacket = null; + return true; } - if (ServerPacket.field2987 == var1.serverPacket) { // L: 7595 - var17 = var3.readUnsignedShort(); // L: 7596 - var5 = var3.method7411(); // L: 7597 - var18 = ChatChannel.getWidget(var5); // L: 7598 - if (var18.modelType != 1 || var17 != var18.modelId) { // L: 7599 - var18.modelType = 1; // L: 7600 - var18.modelId = var17; // L: 7601 - SecureRandomCallable.invalidateWidget(var18); // L: 7602 + if (ServerPacket.field2987 == var1.serverPacket) { + var17 = var3.readUnsignedShort(); + var5 = var3.method7411(); + var18 = ChatChannel.getWidget(var5); + if (var18.modelType != 1 || var17 != var18.modelId) { + var18.modelType = 1; + var18.modelId = var17; + SecureRandomCallable.invalidateWidget(var18); } - var1.serverPacket = null; // L: 7604 - return true; // L: 7605 + var1.serverPacket = null; + return true; } - if (ServerPacket.field2941 == var1.serverPacket) { // L: 7607 - var17 = var3.method7401(); // L: 7608 - ReflectionCheck.method662(var17); // L: 7609 - changedItemContainers[++field665 - 1 & 31] = var17 & 32767; // L: 7610 - var1.serverPacket = null; // L: 7611 - return true; // L: 7612 + if (ServerPacket.field2941 == var1.serverPacket) { + var17 = var3.method7401(); + ReflectionCheck.method662(var17); + changedItemContainers[++field665 - 1 & 31] = var17 & 32767; + var1.serverPacket = null; + return true; } - if (ServerPacket.field2950 == var1.serverPacket) { // L: 7614 - var17 = var3.readUnsignedByte(); // L: 7615 - SecureRandomFuture.forceDisconnect(var17); // L: 7616 - var1.serverPacket = null; // L: 7617 - return false; // L: 7618 + if (ServerPacket.field2950 == var1.serverPacket) { + var17 = var3.readUnsignedByte(); + SecureRandomFuture.forceDisconnect(var17); + var1.serverPacket = null; + return false; } - if (ServerPacket.field2992 == var1.serverPacket) { // L: 7620 - var17 = var3.method7412(); // L: 7621 - var5 = var3.method7401(); // L: 7622 - var6 = var5 >> 10 & 31; // L: 7623 - var7 = var5 >> 5 & 31; // L: 7624 - var26 = var5 & 31; // L: 7625 - var9 = (var7 << 11) + (var6 << 19) + (var26 << 3); // L: 7626 - Widget var10 = ChatChannel.getWidget(var17); // L: 7627 - if (var9 != var10.color) { // L: 7628 - var10.color = var9; // L: 7629 - SecureRandomCallable.invalidateWidget(var10); // L: 7630 + if (ServerPacket.field2992 == var1.serverPacket) { + var17 = var3.method7412(); + var5 = var3.method7401(); + var6 = var5 >> 10 & 31; + var7 = var5 >> 5 & 31; + var26 = var5 & 31; + var9 = (var7 << 11) + (var6 << 19) + (var26 << 3); + Widget var10 = ChatChannel.getWidget(var17); + if (var9 != var10.color) { + var10.color = var9; + SecureRandomCallable.invalidateWidget(var10); } - var1.serverPacket = null; // L: 7632 - return true; // L: 7633 + var1.serverPacket = null; + return true; } - if (ServerPacket.field2954 == var1.serverPacket) { // L: 7635 - var45 = var3.readStringCp1252NullTerminated(); // L: 7636 - var19 = AbstractFont.escapeBrackets(class412.method7287(SequenceDefinition.method3689(var3))); // L: 7637 - class194.addGameMessage(6, var45, var19); // L: 7638 - var1.serverPacket = null; // L: 7639 - return true; // L: 7640 + if (ServerPacket.field2954 == var1.serverPacket) { + var45 = var3.readStringCp1252NullTerminated(); + var19 = AbstractFont.escapeBrackets(class412.method7287(SequenceDefinition.method3689(var3))); + class194.addGameMessage(6, var45, var19); + var1.serverPacket = null; + return true; } - if (ServerPacket.field2956 == var1.serverPacket) { // L: 7642 - DirectByteArrayCopier.method5328(class253.field2917); // L: 7643 - var1.serverPacket = null; // L: 7644 - return true; // L: 7645 + if (ServerPacket.field2956 == var1.serverPacket) { + DirectByteArrayCopier.method5328(class253.field2917); + var1.serverPacket = null; + return true; } - AccessFile.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * -836596687 * 884821201 : -1) + "," + (var1.field1290 != null ? var1.field1290.id * -836596687 * 884821201 : -1) + "," + (var1.field1291 != null ? var1.field1291.id * -836596687 * 884821201 : -1) + "," + var1.serverPacketLength, (Throwable)null); // L: 7647 - LoginScreenAnimation.logOut(); // L: 7648 - } catch (IOException var43) { // L: 7650 - Varcs.method2411(); // L: 7651 + AccessFile.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * -836596687 * 884821201 : -1) + "," + (var1.field1290 != null ? var1.field1290.id * -836596687 * 884821201 : -1) + "," + (var1.field1291 != null ? var1.field1291.id * -836596687 * 884821201 : -1) + "," + var1.serverPacketLength, (Throwable)null); + LoginScreenAnimation.logOut(); + } catch (IOException var43) { + Varcs.method2411(); } catch (Exception var44) { - var19 = "" + (var1.serverPacket != null ? var1.serverPacket.id * -836596687 * 884821201 : -1) + "," + (var1.field1290 != null ? var1.field1290.id * -836596687 * 884821201 : -1) + "," + (var1.field1291 != null ? var1.field1291.id * -836596687 * 884821201 : -1) + "," + var1.serverPacketLength + "," + (class340.localPlayer.pathX[0] + class131.baseX) + "," + (class340.localPlayer.pathY[0] + TileItem.baseY) + ","; // L: 7654 + var19 = "" + (var1.serverPacket != null ? var1.serverPacket.id * -836596687 * 884821201 : -1) + "," + (var1.field1290 != null ? var1.field1290.id * -836596687 * 884821201 : -1) + "," + (var1.field1291 != null ? var1.field1291.id * -836596687 * 884821201 : -1) + "," + var1.serverPacketLength + "," + (class340.localPlayer.pathX[0] + class131.baseX) + "," + (class340.localPlayer.pathY[0] + TileItem.baseY) + ","; - for (var6 = 0; var6 < var1.serverPacketLength && var6 < 50; ++var6) { // L: 7655 + for (var6 = 0; var6 < var1.serverPacketLength && var6 < 50; ++var6) { var19 = var19 + var3.array[var6] + ","; } - AccessFile.RunException_sendStackTrace(var19, var44); // L: 7656 - LoginScreenAnimation.logOut(); // L: 7657 + AccessFile.RunException_sendStackTrace(var19, var44); + LoginScreenAnimation.logOut(); } - return true; // L: 7659 + return true; } } @@ -6401,100 +6401,100 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { ) @Export("menu") final void menu() { - Message.method1115(); // L: 8867 - if (class143.dragInventoryWidget == null) { // L: 8868 - if (clickedWidget == null) { // L: 8869 - int var1 = MouseHandler.MouseHandler_lastButton; // L: 8870 + Message.method1115(); + if (class143.dragInventoryWidget == null) { + if (clickedWidget == null) { + int var1 = MouseHandler.MouseHandler_lastButton; int var2; int var3; int var4; int var5; int var7; int var8; - if (isMenuOpen) { // L: 8871 - if (var1 != 1 && (class150.mouseCam || var1 != 4)) { // L: 8872 - var2 = MouseHandler.MouseHandler_x; // L: 8873 - var3 = MouseHandler.MouseHandler_y; // L: 8874 - if (var2 < ModeWhere.menuX - 10 || var2 > GameObject.menuWidth + ModeWhere.menuX + 10 || var3 < BufferedSink.menuY - 10 || var3 > BufferedSink.menuY + UserComparator3.menuHeight + 10) { // L: 8875 - isMenuOpen = false; // L: 8876 - class10.method124(ModeWhere.menuX, BufferedSink.menuY, GameObject.menuWidth, UserComparator3.menuHeight); // L: 8877 + if (isMenuOpen) { + if (var1 != 1 && (class150.mouseCam || var1 != 4)) { + var2 = MouseHandler.MouseHandler_x; + var3 = MouseHandler.MouseHandler_y; + if (var2 < ModeWhere.menuX - 10 || var2 > GameObject.menuWidth + ModeWhere.menuX + 10 || var3 < BufferedSink.menuY - 10 || var3 > BufferedSink.menuY + UserComparator3.menuHeight + 10) { + isMenuOpen = false; + class10.method124(ModeWhere.menuX, BufferedSink.menuY, GameObject.menuWidth, UserComparator3.menuHeight); } } - if (var1 == 1 || !class150.mouseCam && var1 == 4) { // L: 8880 - var2 = ModeWhere.menuX; // L: 8881 - var3 = BufferedSink.menuY; // L: 8882 - var4 = GameObject.menuWidth; // L: 8883 - var5 = MouseHandler.MouseHandler_lastPressedX; // L: 8884 - int var10 = MouseHandler.MouseHandler_lastPressedY; // L: 8885 - var7 = -1; // L: 8886 + if (var1 == 1 || !class150.mouseCam && var1 == 4) { + var2 = ModeWhere.menuX; + var3 = BufferedSink.menuY; + var4 = GameObject.menuWidth; + var5 = MouseHandler.MouseHandler_lastPressedX; + int var10 = MouseHandler.MouseHandler_lastPressedY; + var7 = -1; - for (var8 = 0; var8 < menuOptionsCount; ++var8) { // L: 8887 - int var9 = var3 + (menuOptionsCount - 1 - var8) * 15 + 31; // L: 8888 - if (var5 > var2 && var5 < var4 + var2 && var10 > var9 - 13 && var10 < var9 + 3) { // L: 8889 + for (var8 = 0; var8 < menuOptionsCount; ++var8) { + int var9 = var3 + (menuOptionsCount - 1 - var8) * 15 + 31; + if (var5 > var2 && var5 < var4 + var2 && var10 > var9 - 13 && var10 < var9 + 3) { var7 = var8; } } - if (var7 != -1) { // L: 8891 + if (var7 != -1) { class17.method291(var7); } - isMenuOpen = false; // L: 8892 - class10.method124(ModeWhere.menuX, BufferedSink.menuY, GameObject.menuWidth, UserComparator3.menuHeight); // L: 8893 + isMenuOpen = false; + class10.method124(ModeWhere.menuX, BufferedSink.menuY, GameObject.menuWidth, UserComparator3.menuHeight); } } else { - var2 = UserComparator10.method2543(); // L: 8897 - if ((var1 == 1 || !class150.mouseCam && var1 == 4) && var2 >= 0) { // L: 8898 - var3 = menuOpcodes[var2]; // L: 8899 - 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: 8900 - var4 = menuArguments1[var2]; // L: 8901 - var5 = menuArguments2[var2]; // L: 8902 - Widget var6 = ChatChannel.getWidget(var5); // L: 8903 - if (class257.method5020(class363.getWidgetFlags(var6)) || MouseHandler.method649(class363.getWidgetFlags(var6))) { // L: 8904 - if (class143.dragInventoryWidget != null && !field572 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { // L: 8905 8906 - var7 = draggedWidgetX; // L: 8907 - var8 = draggedWidgetY; // L: 8908 - WorldMapIcon_1.method4385(class87.tempMenuAction, var7, var8); // L: 8910 - class87.tempMenuAction = null; // L: 8911 + var2 = UserComparator10.method2543(); + if ((var1 == 1 || !class150.mouseCam && var1 == 4) && var2 >= 0) { + var3 = menuOpcodes[var2]; + if (var3 == 39 || var3 == 40 || var3 == 41 || var3 == 42 || var3 == 43 || var3 == 33 || var3 == 34 || var3 == 35 || var3 == 36 || var3 == 37 || var3 == 38 || var3 == 1005) { + var4 = menuArguments1[var2]; + var5 = menuArguments2[var2]; + Widget var6 = ChatChannel.getWidget(var5); + if (class257.method5020(class363.getWidgetFlags(var6)) || MouseHandler.method649(class363.getWidgetFlags(var6))) { + if (class143.dragInventoryWidget != null && !field572 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { + var7 = draggedWidgetX; + var8 = draggedWidgetY; + WorldMapIcon_1.method4385(class87.tempMenuAction, var7, var8); + class87.tempMenuAction = null; } - field572 = false; // L: 8915 - itemDragDuration = 0; // L: 8916 - if (class143.dragInventoryWidget != null) { // L: 8917 + field572 = false; + itemDragDuration = 0; + if (class143.dragInventoryWidget != null) { SecureRandomCallable.invalidateWidget(class143.dragInventoryWidget); } - class143.dragInventoryWidget = ChatChannel.getWidget(var5); // L: 8918 - dragItemSlotSource = var4; // L: 8919 - draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; // L: 8920 - draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; // L: 8921 - if (var2 >= 0) { // L: 8922 + class143.dragInventoryWidget = ChatChannel.getWidget(var5); + dragItemSlotSource = var4; + draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; + draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; + if (var2 >= 0) { class16.method239(var2); } - SecureRandomCallable.invalidateWidget(class143.dragInventoryWidget); // L: 8923 - return; // L: 8924 + SecureRandomCallable.invalidateWidget(class143.dragInventoryWidget); + return; } } } - if ((var1 == 1 || !class150.mouseCam && var1 == 4) && this.shouldLeftClickOpenMenu()) { // L: 8928 8929 - var1 = 2; // L: 8930 + if ((var1 == 1 || !class150.mouseCam && var1 == 4) && this.shouldLeftClickOpenMenu()) { + var1 = 2; } - if ((var1 == 1 || !class150.mouseCam && var1 == 4) && menuOptionsCount > 0) { // L: 8933 - class17.method291(var2); // L: 8934 + if ((var1 == 1 || !class150.mouseCam && var1 == 4) && menuOptionsCount > 0) { + class17.method291(var2); } - if (var1 == 2 && menuOptionsCount > 0) { // L: 8936 + if (var1 == 2 && menuOptionsCount > 0) { this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); } } } } - } // L: 8938 + } @ObfuscatedName("ig") @ObfuscatedSignature( @@ -6503,29 +6503,29 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { ) @Export("shouldLeftClickOpenMenu") final boolean shouldLeftClickOpenMenu() { - int var1 = UserComparator10.method2543(); // L: 8941 - boolean var2 = leftClickOpensMenu == 1 && menuOptionsCount > 2; // L: 8942 - if (!var2) { // L: 8943 + int var1 = UserComparator10.method2543(); + boolean var2 = leftClickOpensMenu == 1 && menuOptionsCount > 2; + if (!var2) { boolean var3; - if (var1 < 0) { // L: 8946 - var3 = false; // L: 8947 + if (var1 < 0) { + var3 = false; } else { - int var4 = menuOpcodes[var1]; // L: 8950 - if (var4 >= 2000) { // L: 8951 + int var4 = menuOpcodes[var1]; + if (var4 >= 2000) { var4 -= 2000; } - if (var4 == 1007) { // L: 8952 - var3 = true; // L: 8953 + if (var4 == 1007) { + var3 = true; } else { - var3 = false; // L: 8956 + var3 = false; } } - var2 = var3; // L: 8958 + var2 = var3; } - return var2 && !menuShiftClick[var1]; // L: 8960 + return var2 && !menuShiftClick[var1]; } @ObfuscatedName("im") @@ -6535,10 +6535,10 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { ) @Export("openMenu") final void openMenu(int var1, int var2) { - MouseHandler.method646(var1, var2); // L: 8964 - class7.scene.menuOpen(class20.Client_plane, var1, var2, false); // L: 8965 - isMenuOpen = true; // L: 8966 - } // L: 8967 + MouseHandler.method646(var1, var2); + class7.scene.menuOpen(class20.Client_plane, var1, var2, false); + isMenuOpen = true; + } @ObfuscatedName("jq") @ObfuscatedSignature( @@ -6547,8 +6547,8 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { ) @Export("resizeRoot") final void resizeRoot(boolean var1) { - class18.method297(rootInterface, class186.canvasWidth, BoundaryObject.canvasHeight, var1); // L: 10905 - } // L: 10906 + class18.method297(rootInterface, class186.canvasWidth, BoundaryObject.canvasHeight, var1); + } @ObfuscatedName("jc") @ObfuscatedSignature( @@ -6557,20 +6557,20 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { ) @Export("alignWidget") void alignWidget(Widget var1) { - Widget var2 = var1.parentId == -1 ? null : ChatChannel.getWidget(var1.parentId); // L: 10909 + Widget var2 = var1.parentId == -1 ? null : ChatChannel.getWidget(var1.parentId); int var3; int var4; - if (var2 == null) { // L: 10912 - var3 = class186.canvasWidth; // L: 10913 - var4 = BoundaryObject.canvasHeight; // L: 10914 + if (var2 == null) { + var3 = class186.canvasWidth; + var4 = BoundaryObject.canvasHeight; } else { - var3 = var2.width; // L: 10917 - var4 = var2.height; // L: 10918 + var3 = var2.width; + var4 = var2.height; } - class29.alignWidgetSize(var1, var3, var4, false); // L: 10920 - MouseHandler.alignWidgetPosition(var1, var3, var4); // L: 10921 - } // L: 10922 + class29.alignWidgetSize(var1, var3, var4, false); + MouseHandler.alignWidgetPosition(var1, var3, var4); + } @ObfuscatedName("kd") @ObfuscatedSignature( @@ -6578,89 +6578,89 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { garbageValue = "1117157787" ) final void method1174() { - SecureRandomCallable.invalidateWidget(clickedWidget); // L: 11948 - ++class87.widgetDragDuration; // L: 11949 - if (field657 && field531) { // L: 11950 - int var1 = MouseHandler.MouseHandler_x; // L: 11956 - int var2 = MouseHandler.MouseHandler_y; // L: 11957 - var1 -= widgetClickX; // L: 11958 - var2 -= widgetClickY; // L: 11959 - if (var1 < field681) { // L: 11960 + SecureRandomCallable.invalidateWidget(clickedWidget); + ++class87.widgetDragDuration; + if (field657 && field531) { + int var1 = MouseHandler.MouseHandler_x; + int var2 = MouseHandler.MouseHandler_y; + var1 -= widgetClickX; + var2 -= widgetClickY; + if (var1 < field681) { var1 = field681; } - if (var1 + clickedWidget.width > field681 + clickedWidgetParent.width) { // L: 11961 + if (var1 + clickedWidget.width > field681 + clickedWidgetParent.width) { var1 = field681 + clickedWidgetParent.width - clickedWidget.width; } - if (var2 < field659) { // L: 11962 + if (var2 < field659) { var2 = field659; } - if (var2 + clickedWidget.height > field659 + clickedWidgetParent.height) { // L: 11963 + if (var2 + clickedWidget.height > field659 + clickedWidgetParent.height) { var2 = field659 + clickedWidgetParent.height - clickedWidget.height; } - int var3 = var1 - field658; // L: 11964 - int var4 = var2 - field660; // L: 11965 - int var5 = clickedWidget.dragZoneSize; // L: 11966 - if (class87.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { // L: 11967 11968 - isDraggingWidget = true; // L: 11969 + int var3 = var1 - field658; + int var4 = var2 - field660; + int var5 = clickedWidget.dragZoneSize; + if (class87.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { + isDraggingWidget = true; } - int var6 = var1 - field681 + clickedWidgetParent.scrollX; // L: 11972 - int var7 = var2 - field659 + clickedWidgetParent.scrollY; // L: 11973 + int var6 = var1 - field681 + clickedWidgetParent.scrollX; + int var7 = var2 - field659 + clickedWidgetParent.scrollY; ScriptEvent var8; - if (clickedWidget.onDrag != null && isDraggingWidget) { // L: 11974 - var8 = new ScriptEvent(); // L: 11975 - var8.widget = clickedWidget; // L: 11976 - var8.mouseX = var6; // L: 11977 - var8.mouseY = var7; // L: 11978 - var8.args = clickedWidget.onDrag; // L: 11979 - class285.runScriptEvent(var8); // L: 11980 + if (clickedWidget.onDrag != null && isDraggingWidget) { + var8 = new ScriptEvent(); + var8.widget = clickedWidget; + var8.mouseX = var6; + var8.mouseY = var7; + var8.args = clickedWidget.onDrag; + class285.runScriptEvent(var8); } - if (MouseHandler.MouseHandler_currentButton == 0) { // L: 11982 - if (isDraggingWidget) { // L: 11983 - if (clickedWidget.onDragComplete != null) { // L: 11984 - var8 = new ScriptEvent(); // L: 11985 - var8.widget = clickedWidget; // L: 11986 - var8.mouseX = var6; // L: 11987 - var8.mouseY = var7; // L: 11988 - var8.dragTarget = draggedOnWidget; // L: 11989 - var8.args = clickedWidget.onDragComplete; // L: 11990 - class285.runScriptEvent(var8); // L: 11991 + if (MouseHandler.MouseHandler_currentButton == 0) { + if (isDraggingWidget) { + if (clickedWidget.onDragComplete != null) { + var8 = new ScriptEvent(); + var8.widget = clickedWidget; + var8.mouseX = var6; + var8.mouseY = var7; + var8.dragTarget = draggedOnWidget; + var8.args = clickedWidget.onDragComplete; + class285.runScriptEvent(var8); } - if (draggedOnWidget != null && SpotAnimationDefinition.method3340(clickedWidget) != null) { // L: 11993 - PacketBufferNode var11 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2816, packetWriter.isaacCipher); // L: 11995 - var11.packetBuffer.method7407(draggedOnWidget.id); // L: 11996 - var11.packetBuffer.method7398(clickedWidget.childIndex); // L: 11997 - var11.packetBuffer.method7493(draggedOnWidget.itemId); // L: 11998 - var11.packetBuffer.method7493(draggedOnWidget.childIndex); // L: 11999 - var11.packetBuffer.writeShort(clickedWidget.itemId); // L: 12000 - var11.packetBuffer.writeInt(clickedWidget.id); // L: 12001 - packetWriter.addNode(var11); // L: 12002 + if (draggedOnWidget != null && SpotAnimationDefinition.method3340(clickedWidget) != null) { + PacketBufferNode var11 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2816, packetWriter.isaacCipher); + var11.packetBuffer.method7407(draggedOnWidget.id); + var11.packetBuffer.method7398(clickedWidget.childIndex); + var11.packetBuffer.method7493(draggedOnWidget.itemId); + var11.packetBuffer.method7493(draggedOnWidget.childIndex); + var11.packetBuffer.writeShort(clickedWidget.itemId); + var11.packetBuffer.writeInt(clickedWidget.id); + packetWriter.addNode(var11); } - } else if (this.shouldLeftClickOpenMenu()) { // L: 12006 - this.openMenu(field658 + widgetClickX, widgetClickY + field660); // L: 12007 - } else if (menuOptionsCount > 0) { // L: 12009 - int var10 = widgetClickX + field658; // L: 12010 - int var9 = widgetClickY + field660; // L: 12011 - WorldMapIcon_1.method4385(class87.tempMenuAction, var10, var9); // L: 12013 - class87.tempMenuAction = null; // L: 12014 + } else if (this.shouldLeftClickOpenMenu()) { + this.openMenu(field658 + widgetClickX, widgetClickY + field660); + } else if (menuOptionsCount > 0) { + int var10 = widgetClickX + field658; + int var9 = widgetClickY + field660; + WorldMapIcon_1.method4385(class87.tempMenuAction, var10, var9); + class87.tempMenuAction = null; } - clickedWidget = null; // L: 12018 + clickedWidget = null; } } else { - if (class87.widgetDragDuration > 1) { // L: 11951 - clickedWidget = null; // L: 11952 + if (class87.widgetDragDuration > 1) { + clickedWidget = null; } } - } // L: 11954 12020 + } @ObfuscatedName("lu") @ObfuscatedSignature( @@ -6669,19 +6669,19 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { ) @Export("username") public Username username() { - return class340.localPlayer != null ? class340.localPlayer.username : null; // L: 12670 + return class340.localPlayer != null ? class340.localPlayer.username : null; } public final void init() { try { - if (this.checkHost()) { // L: 666 + if (this.checkHost()) { int var7; - for (int var1 = 0; var1 <= 27; ++var1) { // L: 667 - String var2 = this.getParameter(Integer.toString(var1)); // L: 668 - if (var2 != null) { // L: 669 - switch(var1) { // L: 670 + for (int var1 = 0; var1 <= 27; ++var1) { + String var2 = this.getParameter(Integer.toString(var1)); + if (var2 != null) { + switch(var1) { case 1: - useBufferedSocket = Integer.parseInt(var2) != 0; // L: 704 + useBufferedSocket = Integer.parseInt(var2) != 0; case 2: case 13: case 16: @@ -6691,277 +6691,277 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { default: break; case 3: - if (var2.equalsIgnoreCase("true")) { // L: 757 + if (var2.equalsIgnoreCase("true")) { isMembersWorld = true; } else { - isMembersWorld = false; // L: 758 + isMembersWorld = false; } break; case 4: - if (clientType == -1) { // L: 709 - clientType = Integer.parseInt(var2); // L: 710 + if (clientType == -1) { + clientType = Integer.parseInt(var2); } break; case 5: - worldProperties = Integer.parseInt(var2); // L: 752 - break; // L: 753 + worldProperties = Integer.parseInt(var2); + break; case 6: - ScriptFrame.clientLanguage = Language.method5826(Integer.parseInt(var2)); // L: 693 - break; // L: 694 + ScriptFrame.clientLanguage = Language.method5826(Integer.parseInt(var2)); + break; case 7: - int var4 = Integer.parseInt(var2); // L: 722 - GameBuild[] var5 = new GameBuild[]{GameBuild.BUILDLIVE, GameBuild.RC, GameBuild.LIVE, GameBuild.WIP}; // L: 727 - GameBuild[] var6 = var5; // L: 729 + int var4 = Integer.parseInt(var2); + GameBuild[] var5 = new GameBuild[]{GameBuild.BUILDLIVE, GameBuild.RC, GameBuild.LIVE, GameBuild.WIP}; + GameBuild[] var6 = var5; var7 = 0; GameBuild var3; while (true) { if (var7 >= var6.length) { - var3 = null; // L: 740 + var3 = null; break; } - GameBuild var8 = var6[var7]; // L: 731 - if (var4 == var8.buildId) { // L: 733 - var3 = var8; // L: 734 - break; // L: 735 + GameBuild var8 = var6[var7]; + if (var4 == var8.buildId) { + var3 = var8; + break; } - ++var7; // L: 730 + ++var7; } - StudioGame.field3456 = var3; // L: 742 - break; // L: 743 + StudioGame.field3456 = var3; + break; case 8: - if (var2.equalsIgnoreCase("true")) { // L: 698 + if (var2.equalsIgnoreCase("true")) { } break; case 9: - class1.field3 = var2; // L: 716 - break; // L: 717 + class1.field3 = var2; + break; case 10: - class338.field4054 = (StudioGame)class130.findEnumerated(WorldMapAreaData.method4894(), Integer.parseInt(var2)); // L: 763 - if (class338.field4054 == StudioGame.oldscape) { // L: 764 + class338.field4054 = (StudioGame)class130.findEnumerated(WorldMapAreaData.method4894(), Integer.parseInt(var2)); + if (class338.field4054 == StudioGame.oldscape) { class194.loginType = LoginType.oldscape; } else { - class194.loginType = LoginType.field4405; // L: 765 + class194.loginType = LoginType.field4405; } break; case 11: - class257.field3044 = var2; // L: 775 + class257.field3044 = var2; break; case 12: - worldId = Integer.parseInt(var2); // L: 683 - break; // L: 684 + worldId = Integer.parseInt(var2); + break; case 14: - FriendLoginUpdate.field4096 = Integer.parseInt(var2); // L: 770 - break; // L: 771 + FriendLoginUpdate.field4096 = Integer.parseInt(var2); + break; case 15: - gameBuild = Integer.parseInt(var2); // L: 688 - break; // L: 689 + gameBuild = Integer.parseInt(var2); + break; case 17: - AbstractWorldMapIcon.field2761 = var2; // L: 673 - break; // L: 674 + AbstractWorldMapIcon.field2761 = var2; + break; case 21: - field473 = Integer.parseInt(var2); // L: 678 - break; // L: 679 + field473 = Integer.parseInt(var2); + break; case 22: - field526 = Integer.parseInt(var2) != 0; // L: 747 + field526 = Integer.parseInt(var2) != 0; } } } - Scene.Scene_isLowDetail = false; // L: 782 - isLowDetail = false; // L: 783 - class185.worldHost = this.getCodeBase().getHost(); // L: 785 - String var17 = StudioGame.field3456.name; // L: 786 - byte var18 = 0; // L: 787 + Scene.Scene_isLowDetail = false; + isLowDetail = false; + class185.worldHost = this.getCodeBase().getHost(); + String var17 = StudioGame.field3456.name; + byte var18 = 0; try { - class143.idxCount = 21; // L: 790 - UserComparator3.cacheGamebuild = var18; // L: 791 + class143.idxCount = 21; + UserComparator3.cacheGamebuild = var18; try { - Coord.operatingSystemName = System.getProperty("os.name"); // L: 793 - } catch (Exception var32) { // L: 795 - Coord.operatingSystemName = "Unknown"; // L: 796 + Coord.operatingSystemName = System.getProperty("os.name"); + } catch (Exception var32) { + Coord.operatingSystemName = "Unknown"; } - JagexCache.formattedOperatingSystemName = Coord.operatingSystemName.toLowerCase(); // L: 798 + JagexCache.formattedOperatingSystemName = Coord.operatingSystemName.toLowerCase(); try { - class409.userHomeDirectory = System.getProperty("user.home"); // L: 800 - if (class409.userHomeDirectory != null) { // L: 801 + class409.userHomeDirectory = System.getProperty("user.home"); + if (class409.userHomeDirectory != null) { class409.userHomeDirectory = class409.userHomeDirectory + "/"; } - } catch (Exception var31) { // L: 803 + } catch (Exception var31) { } try { - if (JagexCache.formattedOperatingSystemName.startsWith("win")) { // L: 805 - if (class409.userHomeDirectory == null) { // L: 806 + if (JagexCache.formattedOperatingSystemName.startsWith("win")) { + if (class409.userHomeDirectory == null) { class409.userHomeDirectory = System.getenv("USERPROFILE"); } - } else if (class409.userHomeDirectory == null) { // L: 809 + } else if (class409.userHomeDirectory == null) { class409.userHomeDirectory = System.getenv("HOME"); } - if (class409.userHomeDirectory != null) { // L: 811 + if (class409.userHomeDirectory != null) { class409.userHomeDirectory = class409.userHomeDirectory + "/"; } - } catch (Exception var30) { // L: 813 + } catch (Exception var30) { } - if (class409.userHomeDirectory == null) { // L: 814 + if (class409.userHomeDirectory == null) { class409.userHomeDirectory = "~/"; } - UserComparator3.cacheParentPaths = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", class409.userHomeDirectory, "/tmp/", ""}; // L: 815 - BufferedSource.cacheSubPaths = new String[]{".jagex_cache_" + UserComparator3.cacheGamebuild, ".file_store_" + UserComparator3.cacheGamebuild}; // L: 816 + UserComparator3.cacheParentPaths = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", class409.userHomeDirectory, "/tmp/", ""}; + BufferedSource.cacheSubPaths = new String[]{".jagex_cache_" + UserComparator3.cacheGamebuild, ".file_store_" + UserComparator3.cacheGamebuild}; int var19 = 0; label275: while (var19 < 4) { - String var37 = var19 == 0 ? "" : "" + var19; // L: 820 - Huffman.JagexCache_locationFile = new File(class409.userHomeDirectory, "jagex_cl_oldschool_" + var17 + var37 + ".dat"); // L: 821 - String var39 = null; // L: 822 - String var20 = null; // L: 823 - boolean var21 = false; // L: 824 + String var37 = var19 == 0 ? "" : "" + var19; + Huffman.JagexCache_locationFile = new File(class409.userHomeDirectory, "jagex_cl_oldschool_" + var17 + var37 + ".dat"); + String var39 = null; + String var20 = null; + boolean var21 = false; File var42; - if (Huffman.JagexCache_locationFile.exists()) { // L: 825 + if (Huffman.JagexCache_locationFile.exists()) { try { - AccessFile var9 = new AccessFile(Huffman.JagexCache_locationFile, "rw", 10000L); // L: 828 + AccessFile var9 = new AccessFile(Huffman.JagexCache_locationFile, "rw", 10000L); Buffer var10; int var11; - for (var10 = new Buffer((int)var9.length()); var10.offset < var10.array.length; var10.offset += var11) { // L: 829 830 833 - var11 = var9.read(var10.array, var10.offset, var10.array.length - var10.offset); // L: 831 - if (var11 == -1) { // L: 832 + for (var10 = new Buffer((int)var9.length()); var10.offset < var10.array.length; var10.offset += var11) { + var11 = var9.read(var10.array, var10.offset, var10.array.length - var10.offset); + if (var11 == -1) { throw new IOException(); } } - var10.offset = 0; // L: 835 - var11 = var10.readUnsignedByte(); // L: 836 + var10.offset = 0; + var11 = var10.readUnsignedByte(); if (var11 < 1 || var11 > 3) { - throw new IOException("" + var11); // L: 837 + throw new IOException("" + var11); } - int var12 = 0; // L: 838 - if (var11 > 1) { // L: 839 + int var12 = 0; + if (var11 > 1) { var12 = var10.readUnsignedByte(); } - if (var11 <= 2) { // L: 840 - var39 = var10.readStringCp1252NullCircumfixed(); // L: 841 - if (var12 == 1) { // L: 842 + if (var11 <= 2) { + var39 = var10.readStringCp1252NullCircumfixed(); + if (var12 == 1) { var20 = var10.readStringCp1252NullCircumfixed(); } } else { - var39 = var10.readCESU8(); // L: 845 - if (var12 == 1) { // L: 846 + var39 = var10.readCESU8(); + if (var12 == 1) { var20 = var10.readCESU8(); } } - var9.close(); // L: 848 - } catch (IOException var34) { // L: 850 - var34.printStackTrace(); // L: 851 + var9.close(); + } catch (IOException var34) { + var34.printStackTrace(); } - if (var39 != null) { // L: 853 - var42 = new File(var39); // L: 854 - if (!var42.exists()) { // L: 855 - var39 = null; // L: 856 + if (var39 != null) { + var42 = new File(var39); + if (!var42.exists()) { + var39 = null; } } - if (var39 != null) { // L: 859 - var42 = new File(var39, "test.dat"); // L: 860 - if (!BoundaryObject.method4321(var42, true)) { // L: 861 - var39 = null; // L: 862 + if (var39 != null) { + var42 = new File(var39, "test.dat"); + if (!BoundaryObject.method4321(var42, true)) { + var39 = null; } } } - if (var39 == null && var19 == 0) { // L: 866 + if (var39 == null && var19 == 0) { label250: - for (int var22 = 0; var22 < BufferedSource.cacheSubPaths.length; ++var22) { // L: 867 - for (int var23 = 0; var23 < UserComparator3.cacheParentPaths.length; ++var23) { // L: 868 - File var24 = new File(UserComparator3.cacheParentPaths[var23] + BufferedSource.cacheSubPaths[var22] + File.separatorChar + "oldschool" + File.separatorChar); // L: 869 - if (var24.exists()) { // L: 870 - File var13 = new File(var24, "test.dat"); // L: 872 + for (int var22 = 0; var22 < BufferedSource.cacheSubPaths.length; ++var22) { + for (int var23 = 0; var23 < UserComparator3.cacheParentPaths.length; ++var23) { + File var24 = new File(UserComparator3.cacheParentPaths[var23] + BufferedSource.cacheSubPaths[var22] + File.separatorChar + "oldschool" + File.separatorChar); + if (var24.exists()) { + File var13 = new File(var24, "test.dat"); boolean var44; try { - RandomAccessFile var14 = new RandomAccessFile(var13, "rw"); // L: 875 - int var15 = var14.read(); // L: 876 - var14.seek(0L); // L: 877 - var14.write(var15); // L: 878 - var14.seek(0L); // L: 879 - var14.close(); // L: 880 - var13.delete(); // L: 881 - var44 = true; // L: 882 - } catch (Exception var29) { // L: 884 - var44 = false; // L: 885 + RandomAccessFile var14 = new RandomAccessFile(var13, "rw"); + int var15 = var14.read(); + var14.seek(0L); + var14.write(var15); + var14.seek(0L); + var14.close(); + var13.delete(); + var44 = true; + } catch (Exception var29) { + var44 = false; } - if (var44) { // L: 888 - var39 = var24.toString(); // L: 889 - var21 = true; // L: 890 - break label250; // L: 891 + if (var44) { + var39 = var24.toString(); + var21 = true; + break label250; } } } } } - if (var39 == null) { // L: 897 - var39 = class409.userHomeDirectory + File.separatorChar + "jagexcache" + var37 + File.separatorChar + "oldschool" + File.separatorChar + var17 + File.separatorChar; // L: 898 - var21 = true; // L: 899 + if (var39 == null) { + var39 = class409.userHomeDirectory + File.separatorChar + "jagexcache" + var37 + File.separatorChar + "oldschool" + File.separatorChar + var17 + File.separatorChar; + var21 = true; } - if (var20 != null) { // L: 901 - File var41 = new File(var20); // L: 902 - var42 = new File(var39); // L: 903 + if (var20 != null) { + File var41 = new File(var20); + var42 = new File(var39); try { - File[] var46 = var41.listFiles(); // L: 905 - File[] var25 = var46; // L: 907 + File[] var46 = var41.listFiles(); + File[] var25 = var46; - for (int var26 = 0; var26 < var25.length; ++var26) { // L: 908 - File var45 = var25[var26]; // L: 909 - File var27 = new File(var42, var45.getName()); // L: 911 - boolean var16 = var45.renameTo(var27); // L: 912 - if (!var16) { // L: 913 + for (int var26 = 0; var26 < var25.length; ++var26) { + File var45 = var25[var26]; + File var27 = new File(var42, var45.getName()); + boolean var16 = var45.renameTo(var27); + if (!var16) { throw new IOException(); } } - } catch (Exception var33) { // L: 918 - var33.printStackTrace(); // L: 919 + } catch (Exception var33) { + var33.printStackTrace(); } - var21 = true; // L: 921 + var21 = true; } - if (var21) { // L: 923 + if (var21) { MusicPatchPcmStream.method5272(new File(var39), (File)null); } - File var28 = new File(var39); // L: 924 - class13.cacheDir = var28; // L: 926 - if (!class13.cacheDir.exists()) { // L: 927 + File var28 = new File(var39); + class13.cacheDir = var28; + if (!class13.cacheDir.exists()) { class13.cacheDir.mkdirs(); } - File[] var38 = class13.cacheDir.listFiles(); // L: 928 - if (var38 != null) { // L: 929 - File[] var43 = var38; // L: 931 + File[] var38 = class13.cacheDir.listFiles(); + if (var38 != null) { + File[] var43 = var38; - for (var7 = 0; var7 < var43.length; ++var7) { // L: 932 - File var40 = var43[var7]; // L: 933 - if (!BoundaryObject.method4321(var40, false)) { // L: 935 - ++var19; // L: 817 + for (var7 = 0; var7 < var43.length; ++var7) { + File var40 = var43[var7]; + if (!BoundaryObject.method4321(var40, false)) { + ++var19; continue label275; } } @@ -6969,40 +6969,40 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { break; } - MusicPatchNode2.method5048(class13.cacheDir); // L: 942 - class368.method6744(); // L: 943 - JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(GameEngine.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); // L: 944 - JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(GameEngine.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); // L: 945 - JagexCache.JagexCache_idxFiles = new BufferedFile[class143.idxCount]; // L: 946 + MusicPatchNode2.method5048(class13.cacheDir); + class368.method6744(); + JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(GameEngine.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); + JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(GameEngine.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); + JagexCache.JagexCache_idxFiles = new BufferedFile[class143.idxCount]; - for (var19 = 0; var19 < class143.idxCount; ++var19) { // L: 947 - JagexCache.JagexCache_idxFiles[var19] = new BufferedFile(new AccessFile(GameEngine.getFile("main_file_cache.idx" + var19), "rw", 1048576L), 6000, 0); // L: 948 + for (var19 = 0; var19 < class143.idxCount; ++var19) { + JagexCache.JagexCache_idxFiles[var19] = new BufferedFile(new AccessFile(GameEngine.getFile("main_file_cache.idx" + var19), "rw", 1048576L), 6000, 0); } - } catch (Exception var35) { // L: 952 - AccessFile.RunException_sendStackTrace((String)null, var35); // L: 953 + } catch (Exception var35) { + AccessFile.RunException_sendStackTrace((String)null, var35); } - class295.client = this; // L: 955 - class398.clientType = clientType; // L: 956 - if (field499 == -1) { // L: 957 - field499 = 0; // L: 958 + class295.client = this; + class398.clientType = clientType; + if (field499 == -1) { + field499 = 0; } - WorldMapAreaData.field2772 = System.getenv("JX_ACCESS_TOKEN"); // L: 960 - System.getenv("JX_REFRESH_TOKEN"); // L: 961 - this.startThread(765, 503, 202); // L: 962 + WorldMapAreaData.field2772 = System.getenv("JX_ACCESS_TOKEN"); + System.getenv("JX_REFRESH_TOKEN"); + this.startThread(765, 503, 202); } } catch (RuntimeException var36) { throw class139.newRunException(var36, "client.init(" + ')'); } - } // L: 963 + } public void setOAuthTokens(String var1, String var2) { - if (var1 != null && !var1.trim().isEmpty() && var2 != null && !var2.trim().isEmpty()) { // L: 967 - WorldMapAreaData.field2772 = var1; // L: 970 - PlayerType.method5521(10); // L: 971 + if (var1 != null && !var1.trim().isEmpty() && var2 != null && !var2.trim().isEmpty()) { + WorldMapAreaData.field2772 = var1; + PlayerType.method5521(10); } - } // L: 968 972 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -7010,10 +7010,10 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { garbageValue = "242484540" ) static void method1623(int var0) { - class366.field4192 = var0; // L: 21 - class366.field4191 = new class366[var0]; // L: 22 - class149.field1663 = 0; // L: 23 - } // L: 24 + class366.field4192 = var0; + class366.field4191 = new class366[var0]; + class149.field1663 = 0; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -7022,81 +7022,81 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { ) @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 + int var2 = var0.offset; + Players.Players_pendingUpdateCount = 0; + int var3 = 0; + var0.importIndex(); 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.field1243[var7] & 1) == 0) { // L: 78 - if (var3 > 0) { // L: 79 + for (var4 = 0; var4 < Players.Players_count; ++var4) { + var7 = Players.Players_indices[var4]; + if ((Players.field1243[var7] & 1) == 0) { + if (var3 > 0) { --var3; var10000 = Players.field1243; var10000[var7] = (byte)(var10000[var7] | 2); } else { var6 = var0.readBits(1); - if (var6 == 0) { // L: 85 - var3 = class124.method2747(var0); // L: 86 + if (var6 == 0) { + var3 = class124.method2747(var0); var10000 = Players.field1243; var10000[var7] = (byte)(var10000[var7] | 2); } else { - class231.readPlayerUpdate(var0, var7); // L: 90 + class231.readPlayerUpdate(var0, var7); } } } } - var0.exportIndex(); // L: 93 - if (var3 != 0) { // L: 94 - throw new RuntimeException(); // L: 95 + var0.exportIndex(); + if (var3 != 0) { + throw new RuntimeException(); } else { - var0.importIndex(); // L: 97 + var0.importIndex(); - for (var4 = 0; var4 < Players.Players_count; ++var4) { // L: 98 - var7 = Players.Players_indices[var4]; // L: 99 - if ((Players.field1243[var7] & 1) != 0) { // L: 100 - if (var3 > 0) { // L: 101 - --var3; // L: 102 - var10000 = Players.field1243; // L: 103 + for (var4 = 0; var4 < Players.Players_count; ++var4) { + var7 = Players.Players_indices[var4]; + if ((Players.field1243[var7] & 1) != 0) { + if (var3 > 0) { + --var3; + var10000 = Players.field1243; var10000[var7] = (byte)(var10000[var7] | 2); } else { - var6 = var0.readBits(1); // L: 106 - if (var6 == 0) { // L: 107 - var3 = class124.method2747(var0); // L: 108 - var10000 = Players.field1243; // L: 109 + var6 = var0.readBits(1); + if (var6 == 0) { + var3 = class124.method2747(var0); + var10000 = Players.field1243; var10000[var7] = (byte)(var10000[var7] | 2); } else { - class231.readPlayerUpdate(var0, var7); // L: 112 + class231.readPlayerUpdate(var0, var7); } } } } var0.exportIndex(); - if (var3 != 0) { // L: 116 + if (var3 != 0) { throw new RuntimeException(); } else { var0.importIndex(); - for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { // L: 120 - var7 = Players.Players_emptyIndices[var4]; // L: 121 - if ((Players.field1243[var7] & 1) != 0) { // L: 122 - if (var3 > 0) { // L: 123 - --var3; // L: 124 - var10000 = Players.field1243; // L: 125 + for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { + var7 = Players.Players_emptyIndices[var4]; + if ((Players.field1243[var7] & 1) != 0) { + if (var3 > 0) { + --var3; + var10000 = Players.field1243; var10000[var7] = (byte)(var10000[var7] | 2); } else { - var6 = var0.readBits(1); // L: 128 - if (var6 == 0) { // L: 129 - var3 = class124.method2747(var0); // L: 130 - var10000 = Players.field1243; // L: 131 + var6 = var0.readBits(1); + if (var6 == 0) { + var3 = class124.method2747(var0); + var10000 = Players.field1243; var10000[var7] = (byte)(var10000[var7] | 2); - } else if (Decimator.updateExternalPlayer(var0, var7)) { // L: 134 + } else if (Decimator.updateExternalPlayer(var0, var7)) { var10000 = Players.field1243; var10000[var7] = (byte)(var10000[var7] | 2); } @@ -7104,26 +7104,26 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { } } - var0.exportIndex(); // L: 137 - if (var3 != 0) { // L: 138 - throw new RuntimeException(); // L: 139 + var0.exportIndex(); + if (var3 != 0) { + throw new RuntimeException(); } else { - var0.importIndex(); // L: 141 + var0.importIndex(); - for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { // L: 142 - var7 = Players.Players_emptyIndices[var4]; // L: 143 - if ((Players.field1243[var7] & 1) == 0) { // L: 144 - if (var3 > 0) { // L: 145 - --var3; // L: 146 - var10000 = Players.field1243; // L: 147 + for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { + var7 = Players.Players_emptyIndices[var4]; + if ((Players.field1243[var7] & 1) == 0) { + if (var3 > 0) { + --var3; + var10000 = Players.field1243; var10000[var7] = (byte)(var10000[var7] | 2); } else { - var6 = var0.readBits(1); // L: 150 - if (var6 == 0) { // L: 151 - var3 = class124.method2747(var0); // L: 152 - var10000 = Players.field1243; // L: 153 + var6 = var0.readBits(1); + if (var6 == 0) { + var3 = class124.method2747(var0); + var10000 = Players.field1243; var10000[var7] = (byte)(var10000[var7] | 2); - } else if (Decimator.updateExternalPlayer(var0, var7)) { // L: 156 + } else if (Decimator.updateExternalPlayer(var0, var7)) { var10000 = Players.field1243; var10000[var7] = (byte)(var10000[var7] | 2); } @@ -7131,44 +7131,44 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { } } - var0.exportIndex(); // L: 159 - if (var3 != 0) { // L: 160 - throw new RuntimeException(); // L: 161 + var0.exportIndex(); + if (var3 != 0) { + throw new RuntimeException(); } else { - Players.Players_count = 0; // L: 163 - Players.Players_emptyIdxCount = 0; // L: 164 + Players.Players_count = 0; + Players.Players_emptyIdxCount = 0; Player var5; - for (var4 = 1; var4 < 2048; ++var4) { // L: 165 - var10000 = Players.field1243; // L: 166 + for (var4 = 1; var4 < 2048; ++var4) { + var10000 = Players.field1243; var10000[var4] = (byte)(var10000[var4] >> 1); - var5 = players[var4]; // L: 167 - if (var5 != null) { // L: 168 + var5 = players[var4]; + if (var5 != null) { Players.Players_indices[++Players.Players_count - 1] = var4; } else { - Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var4; // L: 169 + Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var4; } } - for (var3 = 0; var3 < Players.Players_pendingUpdateCount; ++var3) { // L: 173 - var4 = Players.Players_pendingUpdateIndices[var3]; // L: 174 - var5 = players[var4]; // L: 175 - var6 = var0.readUnsignedByte(); // L: 176 - if ((var6 & 16) != 0) { // L: 177 + for (var3 = 0; var3 < Players.Players_pendingUpdateCount; ++var3) { + var4 = Players.Players_pendingUpdateIndices[var3]; + var5 = players[var4]; + var6 = var0.readUnsignedByte(); + if ((var6 & 16) != 0) { var6 += var0.readUnsignedByte() << 8; } - class65.method1957(var0, var4, var5, var6); // L: 178 + class65.method1957(var0, var4, var5, var6); } - if (var0.offset - var2 != var1) { // L: 181 - throw new RuntimeException(var0.offset - var2 + " " + var1); // L: 182 + if (var0.offset - var2 != var1) { + throw new RuntimeException(var0.offset - var2 + " " + var1); } } } } } - } // L: 184 + } @ObfuscatedName("r") @ObfuscatedSignature( @@ -7177,12 +7177,12 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { ) static final void method1662(String var0) { StringBuilder var10000 = new StringBuilder(); - Object var10001 = null; // L: 115 + Object var10001 = null; var10000 = var10000.append("Please remove ").append(var0); var10001 = null; String var1 = var10000.append(" from your ignore list first").toString(); - class194.addGameMessage(30, "", var1); // L: 117 - } // L: 119 + class194.addGameMessage(30, "", var1); + } @ObfuscatedName("r") @ObfuscatedSignature( @@ -7190,14 +7190,14 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { garbageValue = "-2037672270" ) static String method1668() { - String var0 = ""; // L: 80 + String var0 = ""; Message var2; - for (Iterator var1 = Messages.Messages_hashTable.iterator(); var1.hasNext(); var0 = var0 + var2.sender + ':' + var2.text + '\n') { // L: 81 84 - var2 = (Message)var1.next(); // L: 82 + for (Iterator var1 = Messages.Messages_hashTable.iterator(); var1.hasNext(); var0 = var0 + var2.sender + ':' + var2.text + '\n') { + var2 = (Message)var1.next(); } - return var0; // L: 87 + return var0; } @ObfuscatedName("as") @@ -7206,27 +7206,27 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { garbageValue = "-56" ) static int method1667(int var0, Script var1, boolean var2) { - if (var0 == 6800) { // L: 4301 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 4302 - return 1; // L: 4303 - } else if (var0 != 6801 && var0 != 6802) { // L: 4305 - if (var0 == 6850) { // L: 4309 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 4310 - return 1; // L: 4311 - } else if (var0 != 6851 && var0 != 6852) { // L: 4313 - if (var0 == 6853) { // L: 4317 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 4318 - return 1; // L: 4319 + if (var0 == 6800) { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + return 1; + } else if (var0 != 6801 && var0 != 6802) { + if (var0 == 6850) { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + return 1; + } else if (var0 != 6851 && var0 != 6852) { + if (var0 == 6853) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + return 1; } else { - return 2; // L: 4321 + return 2; } } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4314 - return 1; // L: 4315 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; + return 1; } } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4306 - return 1; // L: 4307 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; + return 1; } } @@ -7237,203 +7237,203 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens { ) @Export("Widget_addToMenu") static final void Widget_addToMenu(Widget var0, int var1, int var2) { - if (var0.buttonType == 1) { // L: 11167 - class11.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); // L: 11168 + if (var0.buttonType == 1) { + class11.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); } String var3; - if (var0.buttonType == 2 && !isSpellSelected) { // L: 11171 - var3 = SecureRandomFuture.Widget_getSpellActionName(var0); // L: 11172 - if (var3 != null) { // L: 11173 - class11.insertMenuItemNoShift(var3, UserComparator5.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); // L: 11174 + if (var0.buttonType == 2 && !isSpellSelected) { + var3 = SecureRandomFuture.Widget_getSpellActionName(var0); + if (var3 != null) { + class11.insertMenuItemNoShift(var3, UserComparator5.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); } } - if (var0.buttonType == 3) { // L: 11178 - class11.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); // L: 11179 + if (var0.buttonType == 3) { + class11.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); } - if (var0.buttonType == 4) { // L: 11182 - class11.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); // L: 11183 + if (var0.buttonType == 4) { + class11.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); } - if (var0.buttonType == 5) { // L: 11186 - class11.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); // L: 11187 + if (var0.buttonType == 5) { + class11.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); } - if (var0.buttonType == 6 && meslayerContinueWidget == null) { // L: 11190 - class11.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); // L: 11191 + if (var0.buttonType == 6 && meslayerContinueWidget == null) { + class11.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); } int var4; int var19; - if (var0.type == 2) { // L: 11194 - var19 = 0; // L: 11195 + if (var0.type == 2) { + var19 = 0; - for (var4 = 0; var4 < var0.height; ++var4) { // L: 11196 - for (int var21 = 0; var21 < var0.width; ++var21) { // L: 11197 - int var22 = (var0.paddingX + 32) * var21; // L: 11198 - int var7 = (var0.paddingY + 32) * var4; // L: 11199 - if (var19 < 20) { // L: 11200 - var22 += var0.inventoryXOffsets[var19]; // L: 11201 - var7 += var0.inventoryYOffsets[var19]; // L: 11202 + for (var4 = 0; var4 < var0.height; ++var4) { + for (int var21 = 0; var21 < var0.width; ++var21) { + int var22 = (var0.paddingX + 32) * var21; + int var7 = (var0.paddingY + 32) * var4; + if (var19 < 20) { + var22 += var0.inventoryXOffsets[var19]; + var7 += var0.inventoryYOffsets[var19]; } - if (var1 >= var22 && var2 >= var7 && var1 < var22 + 32 && var2 < var7 + 32) { // L: 11204 - dragItemSlotDestination = var19; // L: 11205 - FloorOverlayDefinition.hoveredItemContainer = var0; // L: 11206 - if (var0.itemIds[var19] > 0) { // L: 11207 + if (var1 >= var22 && var2 >= var7 && var1 < var22 + 32 && var2 < var7 + 32) { + dragItemSlotDestination = var19; + FloorOverlayDefinition.hoveredItemContainer = var0; + if (var0.itemIds[var19] > 0) { label365: { - ItemComposition var8 = UserComparator6.ItemDefinition_get(var0.itemIds[var19] - 1); // L: 11208 + ItemComposition var8 = UserComparator6.ItemDefinition_get(var0.itemIds[var19] - 1); boolean var9; int var10; - if (isItemSelected == 1) { // L: 11210 - var10 = class363.getWidgetFlags(var0); // L: 11212 - var9 = (var10 >> 30 & 1) != 0; // L: 11214 - if (var9) { // L: 11216 - if (var0.id != MidiPcmStream.selectedItemWidget || var19 != Calendar.selectedItemSlot) { // L: 11217 - class11.insertMenuItemNoShift("Use", selectedItemName + " " + "->" + " " + UserComparator5.colorStartTag(16748608) + var8.name, 31, var8.id, var19, var0.id); // L: 11218 + if (isItemSelected == 1) { + var10 = class363.getWidgetFlags(var0); + var9 = (var10 >> 30 & 1) != 0; + if (var9) { + if (var0.id != MidiPcmStream.selectedItemWidget || var19 != Calendar.selectedItemSlot) { + class11.insertMenuItemNoShift("Use", selectedItemName + " " + "->" + " " + UserComparator5.colorStartTag(16748608) + var8.name, 31, var8.id, var19, var0.id); } break label365; } } - if (isSpellSelected) { // L: 11225 - var10 = class363.getWidgetFlags(var0); // L: 11227 - var9 = (var10 >> 30 & 1) != 0; // L: 11229 - if (var9) { // L: 11231 - if ((class91.selectedSpellFlags & 16) == 16) { // L: 11232 - class11.insertMenuItemNoShift(selectedSpellActionName, selectedSpellName + " " + "->" + " " + UserComparator5.colorStartTag(16748608) + var8.name, 32, var8.id, var19, var0.id); // L: 11233 + if (isSpellSelected) { + var10 = class363.getWidgetFlags(var0); + var9 = (var10 >> 30 & 1) != 0; + if (var9) { + if ((class91.selectedSpellFlags & 16) == 16) { + class11.insertMenuItemNoShift(selectedSpellActionName, selectedSpellName + " " + "->" + " " + UserComparator5.colorStartTag(16748608) + var8.name, 32, var8.id, var19, var0.id); } break label365; } } - String[] var23 = var8.inventoryActions; // L: 11239 - var10 = -1; // L: 11240 - if (shiftClickDrop && ArchiveLoader.method2125()) { // L: 11241 - var10 = var8.getShiftClickIndex(); // L: 11242 + String[] var23 = var8.inventoryActions; + var10 = -1; + if (shiftClickDrop && ArchiveLoader.method2125()) { + var10 = var8.getShiftClickIndex(); } - int var12 = class363.getWidgetFlags(var0); // L: 11245 - boolean var11 = (var12 >> 30 & 1) != 0; // L: 11247 - if (var11) { // L: 11249 - for (int var13 = 4; var13 >= 3; --var13) { // L: 11250 - if (var13 != var10) { // L: 11251 - VarbitComposition.addWidgetItemMenuItem(var0, var8, var19, var13, false); // L: 11252 + int var12 = class363.getWidgetFlags(var0); + boolean var11 = (var12 >> 30 & 1) != 0; + if (var11) { + for (int var13 = 4; var13 >= 3; --var13) { + if (var13 != var10) { + VarbitComposition.addWidgetItemMenuItem(var0, var8, var19, var13, false); } } } - int var14 = class363.getWidgetFlags(var0); // L: 11256 - boolean var24 = (var14 >> 31 & 1) != 0; // L: 11258 - if (var24) { // L: 11260 - class11.insertMenuItemNoShift("Use", UserComparator5.colorStartTag(16748608) + var8.name, 38, var8.id, var19, var0.id); // L: 11261 + int var14 = class363.getWidgetFlags(var0); + boolean var24 = (var14 >> 31 & 1) != 0; + if (var24) { + class11.insertMenuItemNoShift("Use", UserComparator5.colorStartTag(16748608) + var8.name, 38, var8.id, var19, var0.id); } - int var16 = class363.getWidgetFlags(var0); // L: 11265 - boolean var15 = (var16 >> 30 & 1) != 0; // L: 11267 + int var16 = class363.getWidgetFlags(var0); + boolean var15 = (var16 >> 30 & 1) != 0; int var17; - if (var15) { // L: 11269 - for (var17 = 2; var17 >= 0; --var17) { // L: 11270 - if (var17 != var10) { // L: 11271 - VarbitComposition.addWidgetItemMenuItem(var0, var8, var19, var17, false); // L: 11272 + if (var15) { + for (var17 = 2; var17 >= 0; --var17) { + if (var17 != var10) { + VarbitComposition.addWidgetItemMenuItem(var0, var8, var19, var17, false); } } - if (var10 >= 0) { // L: 11274 - VarbitComposition.addWidgetItemMenuItem(var0, var8, var19, var10, true); // L: 11275 + if (var10 >= 0) { + VarbitComposition.addWidgetItemMenuItem(var0, var8, var19, var10, true); } } - var23 = var0.itemActions; // L: 11278 - if (var23 != null) { // L: 11279 - for (var17 = 4; var17 >= 0; --var17) { // L: 11280 - if (var23[var17] != null) { // L: 11281 - byte var18 = 0; // L: 11282 - if (var17 == 0) { // L: 11283 + var23 = var0.itemActions; + if (var23 != null) { + for (var17 = 4; var17 >= 0; --var17) { + if (var23[var17] != null) { + byte var18 = 0; + if (var17 == 0) { var18 = 39; } - if (var17 == 1) { // L: 11284 + if (var17 == 1) { var18 = 40; } - if (var17 == 2) { // L: 11285 + if (var17 == 2) { var18 = 41; } - if (var17 == 3) { // L: 11286 + if (var17 == 3) { var18 = 42; } - if (var17 == 4) { // L: 11287 + if (var17 == 4) { var18 = 43; } - class11.insertMenuItemNoShift(var23[var17], UserComparator5.colorStartTag(16748608) + var8.name, var18, var8.id, var19, var0.id); // L: 11288 + class11.insertMenuItemNoShift(var23[var17], UserComparator5.colorStartTag(16748608) + var8.name, var18, var8.id, var19, var0.id); } } } - class11.insertMenuItemNoShift("Examine", UserComparator5.colorStartTag(16748608) + var8.name, 1005, var8.id, var19, var0.id); // L: 11293 + class11.insertMenuItemNoShift("Examine", UserComparator5.colorStartTag(16748608) + var8.name, 1005, var8.id, var19, var0.id); } } } - ++var19; // L: 11299 + ++var19; } } } - if (var0.isIf3) { // L: 11303 - if (isSpellSelected) { // L: 11304 - var4 = class363.getWidgetFlags(var0); // L: 11306 - boolean var25 = (var4 >> 21 & 1) != 0; // L: 11308 - if (var25 && (class91.selectedSpellFlags & 32) == 32) { // L: 11310 - class11.insertMenuItemNoShift(selectedSpellActionName, selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); // L: 11311 + if (var0.isIf3) { + if (isSpellSelected) { + var4 = class363.getWidgetFlags(var0); + boolean var25 = (var4 >> 21 & 1) != 0; + if (var25 && (class91.selectedSpellFlags & 32) == 32) { + class11.insertMenuItemNoShift(selectedSpellActionName, selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); } } else { - for (var19 = 9; var19 >= 5; --var19) { // L: 11316 + for (var19 = 9; var19 >= 5; --var19) { String var20; - if (!WorldMapCacheName.method4864(class363.getWidgetFlags(var0), var19) && var0.onOp == null) { // L: 11319 - var20 = null; // L: 11320 - } else if (var0.actions != null && var0.actions.length > var19 && var0.actions[var19] != null && var0.actions[var19].trim().length() != 0) { // L: 11323 - var20 = var0.actions[var19]; // L: 11327 + if (!WorldMapCacheName.method4864(class363.getWidgetFlags(var0), var19) && var0.onOp == null) { + var20 = null; + } else if (var0.actions != null && var0.actions.length > var19 && var0.actions[var19] != null && var0.actions[var19].trim().length() != 0) { + var20 = var0.actions[var19]; } else { - var20 = null; // L: 11324 + var20 = null; } - if (var20 != null) { // L: 11330 - class11.insertMenuItemNoShift(var20, var0.dataText, 1007, var19 + 1, var0.childIndex, var0.id); // L: 11331 + if (var20 != null) { + class11.insertMenuItemNoShift(var20, var0.dataText, 1007, var19 + 1, var0.childIndex, var0.id); } } - var3 = SecureRandomFuture.Widget_getSpellActionName(var0); // L: 11335 - if (var3 != null) { // L: 11336 - class11.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); // L: 11337 + var3 = SecureRandomFuture.Widget_getSpellActionName(var0); + if (var3 != null) { + class11.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); } - for (var4 = 4; var4 >= 0; --var4) { // L: 11340 + for (var4 = 4; var4 >= 0; --var4) { String var5; - if (!WorldMapCacheName.method4864(class363.getWidgetFlags(var0), var4) && var0.onOp == null) { // L: 11343 - var5 = null; // L: 11344 - } else if (var0.actions != null && var0.actions.length > var4 && var0.actions[var4] != null && var0.actions[var4].trim().length() != 0) { // L: 11347 - var5 = var0.actions[var4]; // L: 11351 + if (!WorldMapCacheName.method4864(class363.getWidgetFlags(var0), var4) && var0.onOp == null) { + var5 = null; + } else if (var0.actions != null && var0.actions.length > var4 && var0.actions[var4] != null && var0.actions[var4].trim().length() != 0) { + var5 = var0.actions[var4]; } else { - var5 = null; // L: 11348 + var5 = null; } - if (var5 != null) { // L: 11354 - class21.insertMenuItem(var5, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.prioritizeMenuEntry); // L: 11355 + if (var5 != null) { + class21.insertMenuItem(var5, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.prioritizeMenuEntry); } } - if (class20.method332(class363.getWidgetFlags(var0))) { // L: 11359 - class11.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); // L: 11360 + if (class20.method332(class363.getWidgetFlags(var0))) { + class11.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); } } } - } // L: 11365 + } } diff --git a/runescape-client/src/main/java/ClientPacket.java b/runescape-client/src/main/java/ClientPacket.java index d86283005b..70c284e3d2 100644 --- a/runescape-client/src/main/java/ClientPacket.java +++ b/runescape-client/src/main/java/ClientPacket.java @@ -552,118 +552,118 @@ public class ClientPacket implements class251 { final int length; static { - field2855 = new ClientPacket(0, 3); // L: 5 - field2803 = new ClientPacket(1, 8); // L: 6 - field2804 = new ClientPacket(2, 16); // L: 7 - field2805 = new ClientPacket(3, -1); // L: 8 - field2806 = new ClientPacket(4, -1); // L: 9 - field2847 = new ClientPacket(5, 8); // L: 10 - field2808 = new ClientPacket(6, 2); // L: 11 - field2861 = new ClientPacket(7, 1); // L: 12 - field2853 = new ClientPacket(8, 8); // L: 13 - field2837 = new ClientPacket(9, 0); // L: 14 - field2830 = new ClientPacket(10, 8); // L: 15 - field2880 = new ClientPacket(11, 8); // L: 16 - field2814 = new ClientPacket(12, 0); // L: 17 - field2815 = new ClientPacket(13, 2); // L: 18 - field2816 = new ClientPacket(14, 16); // L: 19 - field2809 = new ClientPacket(15, 16); // L: 20 - field2891 = new ClientPacket(16, 8); // L: 21 - field2819 = new ClientPacket(17, 9); // L: 22 - field2820 = new ClientPacket(18, 11); // L: 23 - field2821 = new ClientPacket(19, 8); // L: 24 - field2822 = new ClientPacket(20, 8); // L: 25 - field2823 = new ClientPacket(21, 7); // L: 26 - field2829 = new ClientPacket(22, 2); // L: 27 - field2825 = new ClientPacket(23, 4); // L: 28 - field2836 = new ClientPacket(24, 7); // L: 29 - field2862 = new ClientPacket(25, 4); // L: 30 - field2828 = new ClientPacket(26, -1); // L: 31 - field2838 = new ClientPacket(27, 7); // L: 32 - field2831 = new ClientPacket(28, 15); // L: 33 - field2834 = new ClientPacket(29, 8); // L: 34 - field2832 = new ClientPacket(30, -1); // L: 35 - field2833 = new ClientPacket(31, 8); // L: 36 - field2811 = new ClientPacket(32, 9); // L: 37 - field2868 = new ClientPacket(33, 7); // L: 38 - field2835 = new ClientPacket(34, 15); // L: 39 - field2894 = new ClientPacket(35, 6); // L: 40 - field2857 = new ClientPacket(36, -1); // L: 41 - field2839 = new ClientPacket(37, 3); // L: 42 - field2840 = new ClientPacket(38, 11); // L: 43 - field2882 = new ClientPacket(39, 15); // L: 44 - field2842 = new ClientPacket(40, 4); // L: 45 - field2843 = new ClientPacket(41, 8); // L: 46 - field2844 = new ClientPacket(42, 8); // L: 47 - field2802 = new ClientPacket(43, 8); // L: 48 - field2846 = new ClientPacket(44, -1); // L: 49 - field2841 = new ClientPacket(45, -2); // L: 50 - field2827 = new ClientPacket(46, 3); // L: 51 - field2807 = new ClientPacket(47, 3); // L: 52 - field2824 = new ClientPacket(48, 5); // L: 53 - field2851 = new ClientPacket(49, -1); // L: 54 - field2852 = new ClientPacket(50, -1); // L: 55 - field2845 = new ClientPacket(51, -1); // L: 56 - field2854 = new ClientPacket(52, -1); // L: 57 - field2826 = new ClientPacket(53, 7); // L: 58 - field2856 = new ClientPacket(54, 7); // L: 59 - field2848 = new ClientPacket(55, 0); // L: 60 - field2858 = new ClientPacket(56, 7); // L: 61 - field2859 = new ClientPacket(57, -1); // L: 62 - field2860 = new ClientPacket(58, -1); // L: 63 - field2812 = new ClientPacket(59, 3); // L: 64 - field2849 = new ClientPacket(60, -2); // L: 65 - field2863 = new ClientPacket(61, 3); // L: 66 - field2810 = new ClientPacket(62, 8); // L: 67 - field2865 = new ClientPacket(63, 3); // L: 68 - field2866 = new ClientPacket(64, 8); // L: 69 - field2867 = new ClientPacket(65, 0); // L: 70 - field2817 = new ClientPacket(66, 8); // L: 71 - field2869 = new ClientPacket(67, 4); // L: 72 - field2870 = new ClientPacket(68, 7); // L: 73 - field2901 = new ClientPacket(69, 11); // L: 74 - field2872 = new ClientPacket(70, 3); // L: 75 - field2873 = new ClientPacket(71, 6); // L: 76 - field2874 = new ClientPacket(72, 8); // L: 77 - field2864 = new ClientPacket(73, 11); // L: 78 - field2876 = new ClientPacket(74, 3); // L: 79 - field2877 = new ClientPacket(75, 8); // L: 80 - field2818 = new ClientPacket(76, 7); // L: 81 - field2879 = new ClientPacket(77, 4); // L: 82 - field2893 = new ClientPacket(78, -1); // L: 83 - field2881 = new ClientPacket(79, 2); // L: 84 - field2850 = new ClientPacket(80, 15); // L: 85 - field2883 = new ClientPacket(81, 7); // L: 86 - field2884 = new ClientPacket(82, 8); // L: 87 - field2885 = new ClientPacket(83, 3); // L: 88 - field2886 = new ClientPacket(84, 14); // L: 89 - field2887 = new ClientPacket(85, 3); // L: 90 - field2888 = new ClientPacket(86, -1); // L: 91 - field2890 = new ClientPacket(87, 10); // L: 92 - field2871 = new ClientPacket(88, 8); // L: 93 - field2904 = new ClientPacket(89, 13); // L: 94 - field2892 = new ClientPacket(90, 3); // L: 95 - field2889 = new ClientPacket(91, -1); // L: 96 - field2813 = new ClientPacket(92, 3); // L: 97 - field2895 = new ClientPacket(93, -1); // L: 98 - field2896 = new ClientPacket(94, 7); // L: 99 - field2897 = new ClientPacket(95, -1); // L: 100 - field2898 = new ClientPacket(96, 0); // L: 101 - field2899 = new ClientPacket(97, -2); // L: 102 - field2900 = new ClientPacket(98, -1); // L: 103 - field2878 = new ClientPacket(99, -1); // L: 104 - field2902 = new ClientPacket(100, 2); // L: 105 - field2903 = new ClientPacket(101, -1); // L: 106 - field2875 = new ClientPacket(102, -1); // L: 107 - field2905 = new ClientPacket(103, -1); // L: 108 - field2906 = new ClientPacket(104, 3); // L: 109 - field2907 = new ClientPacket(105, -1); // L: 110 + field2855 = new ClientPacket(0, 3); + field2803 = new ClientPacket(1, 8); + field2804 = new ClientPacket(2, 16); + field2805 = new ClientPacket(3, -1); + field2806 = new ClientPacket(4, -1); + field2847 = new ClientPacket(5, 8); + field2808 = new ClientPacket(6, 2); + field2861 = new ClientPacket(7, 1); + field2853 = new ClientPacket(8, 8); + field2837 = new ClientPacket(9, 0); + field2830 = new ClientPacket(10, 8); + field2880 = new ClientPacket(11, 8); + field2814 = new ClientPacket(12, 0); + field2815 = new ClientPacket(13, 2); + field2816 = new ClientPacket(14, 16); + field2809 = new ClientPacket(15, 16); + field2891 = new ClientPacket(16, 8); + field2819 = new ClientPacket(17, 9); + field2820 = new ClientPacket(18, 11); + field2821 = new ClientPacket(19, 8); + field2822 = new ClientPacket(20, 8); + field2823 = new ClientPacket(21, 7); + field2829 = new ClientPacket(22, 2); + field2825 = new ClientPacket(23, 4); + field2836 = new ClientPacket(24, 7); + field2862 = new ClientPacket(25, 4); + field2828 = new ClientPacket(26, -1); + field2838 = new ClientPacket(27, 7); + field2831 = new ClientPacket(28, 15); + field2834 = new ClientPacket(29, 8); + field2832 = new ClientPacket(30, -1); + field2833 = new ClientPacket(31, 8); + field2811 = new ClientPacket(32, 9); + field2868 = new ClientPacket(33, 7); + field2835 = new ClientPacket(34, 15); + field2894 = new ClientPacket(35, 6); + field2857 = new ClientPacket(36, -1); + field2839 = new ClientPacket(37, 3); + field2840 = new ClientPacket(38, 11); + field2882 = new ClientPacket(39, 15); + field2842 = new ClientPacket(40, 4); + field2843 = new ClientPacket(41, 8); + field2844 = new ClientPacket(42, 8); + field2802 = new ClientPacket(43, 8); + field2846 = new ClientPacket(44, -1); + field2841 = new ClientPacket(45, -2); + field2827 = new ClientPacket(46, 3); + field2807 = new ClientPacket(47, 3); + field2824 = new ClientPacket(48, 5); + field2851 = new ClientPacket(49, -1); + field2852 = new ClientPacket(50, -1); + field2845 = new ClientPacket(51, -1); + field2854 = new ClientPacket(52, -1); + field2826 = new ClientPacket(53, 7); + field2856 = new ClientPacket(54, 7); + field2848 = new ClientPacket(55, 0); + field2858 = new ClientPacket(56, 7); + field2859 = new ClientPacket(57, -1); + field2860 = new ClientPacket(58, -1); + field2812 = new ClientPacket(59, 3); + field2849 = new ClientPacket(60, -2); + field2863 = new ClientPacket(61, 3); + field2810 = new ClientPacket(62, 8); + field2865 = new ClientPacket(63, 3); + field2866 = new ClientPacket(64, 8); + field2867 = new ClientPacket(65, 0); + field2817 = new ClientPacket(66, 8); + field2869 = new ClientPacket(67, 4); + field2870 = new ClientPacket(68, 7); + field2901 = new ClientPacket(69, 11); + field2872 = new ClientPacket(70, 3); + field2873 = new ClientPacket(71, 6); + field2874 = new ClientPacket(72, 8); + field2864 = new ClientPacket(73, 11); + field2876 = new ClientPacket(74, 3); + field2877 = new ClientPacket(75, 8); + field2818 = new ClientPacket(76, 7); + field2879 = new ClientPacket(77, 4); + field2893 = new ClientPacket(78, -1); + field2881 = new ClientPacket(79, 2); + field2850 = new ClientPacket(80, 15); + field2883 = new ClientPacket(81, 7); + field2884 = new ClientPacket(82, 8); + field2885 = new ClientPacket(83, 3); + field2886 = new ClientPacket(84, 14); + field2887 = new ClientPacket(85, 3); + field2888 = new ClientPacket(86, -1); + field2890 = new ClientPacket(87, 10); + field2871 = new ClientPacket(88, 8); + field2904 = new ClientPacket(89, 13); + field2892 = new ClientPacket(90, 3); + field2889 = new ClientPacket(91, -1); + field2813 = new ClientPacket(92, 3); + field2895 = new ClientPacket(93, -1); + field2896 = new ClientPacket(94, 7); + field2897 = new ClientPacket(95, -1); + field2898 = new ClientPacket(96, 0); + field2899 = new ClientPacket(97, -2); + field2900 = new ClientPacket(98, -1); + field2878 = new ClientPacket(99, -1); + field2902 = new ClientPacket(100, 2); + field2903 = new ClientPacket(101, -1); + field2875 = new ClientPacket(102, -1); + field2905 = new ClientPacket(103, -1); + field2906 = new ClientPacket(104, 3); + field2907 = new ClientPacket(105, -1); } ClientPacket(int var1, int var2) { - this.id = var1; // L: 115 - this.length = var2; // L: 116 - } // L: 117 + this.id = var1; + this.length = var2; + } @ObfuscatedName("hy") @ObfuscatedSignature( @@ -671,21 +671,21 @@ public class ClientPacket implements class251 { garbageValue = "1131418917" ) static final void method5001(boolean var0) { - class148.playPcmPlayers(); // L: 6323 - ++Client.packetWriter.pendingWrites; // L: 6324 - if (Client.packetWriter.pendingWrites >= 50 || var0) { // L: 6325 - Client.packetWriter.pendingWrites = 0; // L: 6326 - if (!Client.hadNetworkError && Client.packetWriter.getSocket() != null) { // L: 6327 - PacketBufferNode var1 = HitSplatDefinition.getPacketBufferNode(field2814, Client.packetWriter.isaacCipher); // L: 6329 - Client.packetWriter.addNode(var1); // L: 6330 + class148.playPcmPlayers(); + ++Client.packetWriter.pendingWrites; + if (Client.packetWriter.pendingWrites >= 50 || var0) { + Client.packetWriter.pendingWrites = 0; + if (!Client.hadNetworkError && Client.packetWriter.getSocket() != null) { + PacketBufferNode var1 = HitSplatDefinition.getPacketBufferNode(field2814, Client.packetWriter.isaacCipher); + Client.packetWriter.addNode(var1); try { - Client.packetWriter.flush(); // L: 6332 - } catch (IOException var3) { // L: 6334 - Client.hadNetworkError = true; // L: 6335 + Client.packetWriter.flush(); + } catch (IOException var3) { + Client.hadNetworkError = true; } } } - } // L: 6338 + } } diff --git a/runescape-client/src/main/java/ClientPreferences.java b/runescape-client/src/main/java/ClientPreferences.java index e923f78dca..27ba6ec30a 100644 --- a/runescape-client/src/main/java/ClientPreferences.java +++ b/runescape-client/src/main/java/ClientPreferences.java @@ -66,7 +66,7 @@ public class ClientPreferences { LinkedHashMap parameters; static { - ClientPreferences_optionCount = 8; // L: 11 + ClientPreferences_optionCount = 8; } ClientPreferences() { @@ -79,73 +79,73 @@ public class ClientPreferences { this.areaSoundEffectsVolume = 127; this.field1197 = -1; this.parameters = new LinkedHashMap(); - this.method2282(true); // L: 26 - } // L: 27 + this.method2282(true); + } @ObfuscatedSignature( descriptor = "(Lpi;)V" ) ClientPreferences(Buffer var1) { - this.windowMode = 1; // L: 15 - this.rememberedUsername = null; // L: 16 - this.hideUsername = false; // L: 17 - this.brightness = 0.8D; // L: 18 - this.musicVolume = 127; // L: 19 - this.soundEffectsVolume = 127; // L: 20 - this.areaSoundEffectsVolume = 127; // L: 21 - this.field1197 = -1; // L: 22 - this.parameters = new LinkedHashMap(); // L: 23 - if (var1 != null && var1.array != null) { // L: 30 - int var2 = var1.readUnsignedByte(); // L: 34 - if (var2 >= 0 && var2 <= ClientPreferences_optionCount) { // L: 35 - if (var1.readUnsignedByte() == 1) { // L: 39 + this.windowMode = 1; + this.rememberedUsername = null; + this.hideUsername = false; + this.brightness = 0.8D; + this.musicVolume = 127; + this.soundEffectsVolume = 127; + this.areaSoundEffectsVolume = 127; + this.field1197 = -1; + this.parameters = new LinkedHashMap(); + if (var1 != null && var1.array != null) { + int var2 = var1.readUnsignedByte(); + if (var2 >= 0 && var2 <= ClientPreferences_optionCount) { + if (var1.readUnsignedByte() == 1) { this.roofsHidden = true; } - if (var2 > 1) { // L: 40 - this.titleMusicDisabled = var1.readUnsignedByte() == 1; // L: 41 + if (var2 > 1) { + this.titleMusicDisabled = var1.readUnsignedByte() == 1; } - if (var2 > 3) { // L: 43 - this.windowMode = var1.readUnsignedByte(); // L: 44 + if (var2 > 3) { + this.windowMode = var1.readUnsignedByte(); } - if (var2 > 2) { // L: 46 + if (var2 > 2) { int var3 = var1.readUnsignedByte(); for (int var4 = 0; var4 < var3; ++var4) { int var5 = var1.readInt(); - int var6 = var1.readInt(); // L: 50 - this.parameters.put(var5, var6); // L: 51 + int var6 = var1.readInt(); + this.parameters.put(var5, var6); } } - if (var2 > 4) { // L: 54 - this.rememberedUsername = var1.readStringCp1252NullTerminatedOrNull(); // L: 55 + if (var2 > 4) { + this.rememberedUsername = var1.readStringCp1252NullTerminatedOrNull(); } - if (var2 > 5) { // L: 57 - this.hideUsername = var1.readBoolean(); // L: 58 + if (var2 > 5) { + this.hideUsername = var1.readBoolean(); } - if (var2 > 6) { // L: 60 - this.brightness = (double)var1.readUnsignedByte() / 100.0D; // L: 61 - this.musicVolume = var1.readUnsignedByte(); // L: 62 - this.soundEffectsVolume = var1.readUnsignedByte(); // L: 63 - this.areaSoundEffectsVolume = var1.readUnsignedByte(); // L: 64 + if (var2 > 6) { + this.brightness = (double)var1.readUnsignedByte() / 100.0D; + this.musicVolume = var1.readUnsignedByte(); + this.soundEffectsVolume = var1.readUnsignedByte(); + this.areaSoundEffectsVolume = var1.readUnsignedByte(); } - if (var2 > 7) { // L: 66 - this.field1197 = var1.readUnsignedByte(); // L: 67 + if (var2 > 7) { + this.field1197 = var1.readUnsignedByte(); } } else { - this.method2282(true); // L: 36 + this.method2282(true); } } else { - this.method2282(true); // L: 31 + this.method2282(true); } - } // L: 71 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -153,7 +153,7 @@ public class ClientPreferences { garbageValue = "-1565386300" ) void method2282(boolean var1) { - } // L: 73 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -162,28 +162,28 @@ public class ClientPreferences { ) @Export("toBuffer") Buffer toBuffer() { - Buffer var1 = new Buffer(100); // L: 76 - var1.writeByte(ClientPreferences_optionCount); // L: 77 - var1.writeByte(this.roofsHidden ? 1 : 0); // L: 78 - var1.writeByte(this.titleMusicDisabled ? 1 : 0); // L: 79 - var1.writeByte(this.windowMode); // L: 80 - var1.writeByte(this.parameters.size()); // L: 81 - Iterator var2 = this.parameters.entrySet().iterator(); // L: 82 + Buffer var1 = new Buffer(100); + var1.writeByte(ClientPreferences_optionCount); + var1.writeByte(this.roofsHidden ? 1 : 0); + var1.writeByte(this.titleMusicDisabled ? 1 : 0); + var1.writeByte(this.windowMode); + var1.writeByte(this.parameters.size()); + Iterator var2 = this.parameters.entrySet().iterator(); while (var2.hasNext()) { - Entry var3 = (Entry)var2.next(); // L: 83 - var1.writeInt((Integer)var3.getKey()); // L: 85 - var1.writeInt((Integer)var3.getValue()); // L: 86 + Entry var3 = (Entry)var2.next(); + var1.writeInt((Integer)var3.getKey()); + var1.writeInt((Integer)var3.getValue()); } - var1.writeStringCp1252NullTerminated(this.rememberedUsername != null ? this.rememberedUsername : ""); // L: 89 - var1.writeBoolean(this.hideUsername); // L: 90 - var1.writeByte((int)(100.0D * this.brightness)); // L: 91 - var1.writeByte(this.musicVolume); // L: 92 - var1.writeByte(this.soundEffectsVolume); // L: 93 - var1.writeByte(this.areaSoundEffectsVolume); // L: 94 - var1.writeByte(this.field1197); // L: 95 - return var1; // L: 96 + var1.writeStringCp1252NullTerminated(this.rememberedUsername != null ? this.rememberedUsername : ""); + var1.writeBoolean(this.hideUsername); + var1.writeByte((int)(100.0D * this.brightness)); + var1.writeByte(this.musicVolume); + var1.writeByte(this.soundEffectsVolume); + var1.writeByte(this.areaSoundEffectsVolume); + var1.writeByte(this.field1197); + return var1; } @ObfuscatedName("b") @@ -192,24 +192,24 @@ public class ClientPreferences { garbageValue = "-1263017108" ) public static void method2297(boolean var0) { - if (NetCache.NetCache_socket != null) { // L: 193 + if (NetCache.NetCache_socket != null) { try { - Buffer var1 = new Buffer(4); // L: 195 - var1.writeByte(var0 ? 2 : 3); // L: 196 - var1.writeMedium(0); // L: 197 - NetCache.NetCache_socket.write(var1.array, 0, 4); // L: 198 + Buffer var1 = new Buffer(4); + var1.writeByte(var0 ? 2 : 3); + var1.writeMedium(0); + NetCache.NetCache_socket.write(var1.array, 0, 4); } catch (IOException var4) { try { - NetCache.NetCache_socket.close(); // L: 202 - } catch (Exception var3) { // L: 204 + NetCache.NetCache_socket.close(); + } catch (Exception var3) { } - ++NetCache.NetCache_ioExceptions; // L: 205 - NetCache.NetCache_socket = null; // L: 206 + ++NetCache.NetCache_ioExceptions; + NetCache.NetCache_socket = null; } } - } // L: 208 + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -218,9 +218,9 @@ public class ClientPreferences { ) @Export("SpriteBuffer_getIndexedSpriteByName") public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { - int var3 = var0.getGroupId(var1); // L: 47 - int var4 = var0.getFileId(var3, var2); // L: 48 - return class4.method22(var0, var3, var4); // L: 49 + int var3 = var0.getGroupId(var1); + int var4 = var0.getFileId(var3, var2); + return class4.method22(var0, var3, var4); } @ObfuscatedName("jj") @@ -229,42 +229,42 @@ public class ClientPreferences { garbageValue = "523505155" ) static final void method2293(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (Client.field543) { // L: 10990 + if (Client.field543) { Client.alternativeScrollbarWidth = 32; } else { - Client.alternativeScrollbarWidth = 0; // L: 10991 + Client.alternativeScrollbarWidth = 0; } - Client.field543 = false; // L: 10992 + Client.field543 = false; int var7; - if (MouseHandler.MouseHandler_currentButton == 1 || !class150.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { // L: 10993 - if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { // L: 10994 - var0.scrollY -= 4; // L: 10995 - SecureRandomCallable.invalidateWidget(var0); // L: 10996 - } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { // L: 10998 - var0.scrollY += 4; // L: 10999 - SecureRandomCallable.invalidateWidget(var0); // L: 11000 - } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { // L: 11002 - var7 = var3 * (var3 - 32) / var4; // L: 11003 - if (var7 < 8) { // L: 11004 + if (MouseHandler.MouseHandler_currentButton == 1 || !class150.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { + if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { + var0.scrollY -= 4; + SecureRandomCallable.invalidateWidget(var0); + } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { + var0.scrollY += 4; + SecureRandomCallable.invalidateWidget(var0); + } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { + var7 = var3 * (var3 - 32) / var4; + if (var7 < 8) { var7 = 8; } - int var8 = var6 - var2 - 16 - var7 / 2; // L: 11005 - int var9 = var3 - 32 - var7; // L: 11006 - var0.scrollY = var8 * (var4 - var3) / var9; // L: 11007 - SecureRandomCallable.invalidateWidget(var0); // L: 11008 - Client.field543 = true; // L: 11009 + int var8 = var6 - var2 - 16 - var7 / 2; + int var9 = var3 - 32 - var7; + var0.scrollY = var8 * (var4 - var3) / var9; + SecureRandomCallable.invalidateWidget(var0); + Client.field543 = true; } } - if (Client.mouseWheelRotation != 0) { // L: 11012 - var7 = var0.width; // L: 11013 - if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { // L: 11014 - var0.scrollY += Client.mouseWheelRotation * 45; // L: 11015 - SecureRandomCallable.invalidateWidget(var0); // L: 11016 + if (Client.mouseWheelRotation != 0) { + var7 = var0.width; + if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { + var0.scrollY += Client.mouseWheelRotation * 45; + SecureRandomCallable.invalidateWidget(var0); } } - } // L: 11019 + } } diff --git a/runescape-client/src/main/java/Clock.java b/runescape-client/src/main/java/Clock.java index cd9b9629aa..a4b4505134 100644 --- a/runescape-client/src/main/java/Clock.java +++ b/runescape-client/src/main/java/Clock.java @@ -7,7 +7,7 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Clock") public abstract class Clock { Clock() { - } // L: 4 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -31,105 +31,105 @@ public abstract class Clock { garbageValue = "-1365814358" ) public static final boolean method3132(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 - class186.directions[var6][var7] = 99; // L: 25 - class186.distances[var6][var7] = 0; // L: 26 - byte var10 = 0; // L: 27 - int var11 = 0; // L: 28 - class186.bufferX[var10] = var0; // L: 29 + int var4 = var0; + int var5 = var1; + byte var6 = 64; + byte var7 = 64; + int var8 = var0 - var6; + int var9 = var1 - var7; + class186.directions[var6][var7] = 99; + class186.distances[var6][var7] = 0; + byte var10 = 0; + int var11 = 0; + class186.bufferX[var10] = var0; byte var10001 = var10; int var18 = var10 + 1; - class186.bufferY[var10001] = var1; // L: 30 - int[][] var12 = var3.flags; // L: 31 + class186.bufferY[var10001] = var1; + int[][] var12 = var3.flags; - while (var18 != var11) { // L: 32 - var4 = class186.bufferX[var11]; // L: 33 - var5 = class186.bufferY[var11]; // L: 34 - var11 = var11 + 1 & 4095; // L: 35 - int var16 = var4 - var8; // L: 36 - int var17 = var5 - var9; // L: 37 - int var13 = var4 - var3.xInset; // L: 38 - int var14 = var5 - var3.yInset; // L: 39 - if (var2.hasArrived(2, var4, var5, var3)) { // L: 40 - class186.field2129 = var4; // L: 41 - class186.field2130 = var5; // L: 42 - return true; // L: 43 + while (var18 != var11) { + var4 = class186.bufferX[var11]; + var5 = class186.bufferY[var11]; + var11 = var11 + 1 & 4095; + int var16 = var4 - var8; + int var17 = var5 - var9; + int var13 = var4 - var3.xInset; + int var14 = var5 - var3.yInset; + if (var2.hasArrived(2, var4, var5, var3)) { + class186.field2129 = var4; + class186.field2130 = var5; + return true; } - int var15 = class186.distances[var16][var17] + 1; // L: 45 - if (var16 > 0 && class186.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) { // L: 46 47 48 49 - class186.bufferX[var18] = var4 - 1; // L: 50 - class186.bufferY[var18] = var5; // L: 51 - var18 = var18 + 1 & 4095; // L: 52 - class186.directions[var16 - 1][var17] = 2; // L: 53 - class186.distances[var16 - 1][var17] = var15; // L: 54 + int var15 = class186.distances[var16][var17] + 1; + if (var16 > 0 && class186.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) { + class186.bufferX[var18] = var4 - 1; + class186.bufferY[var18] = var5; + var18 = var18 + 1 & 4095; + class186.directions[var16 - 1][var17] = 2; + class186.distances[var16 - 1][var17] = var15; } - if (var16 < 126 && class186.directions[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) { // L: 56 57 58 59 - class186.bufferX[var18] = var4 + 1; // L: 60 - class186.bufferY[var18] = var5; // L: 61 - var18 = var18 + 1 & 4095; // L: 62 - class186.directions[var16 + 1][var17] = 8; // L: 63 - class186.distances[var16 + 1][var17] = var15; // L: 64 + if (var16 < 126 && class186.directions[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) { + class186.bufferX[var18] = var4 + 1; + class186.bufferY[var18] = var5; + var18 = var18 + 1 & 4095; + class186.directions[var16 + 1][var17] = 8; + class186.distances[var16 + 1][var17] = var15; } - if (var17 > 0 && class186.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) { // L: 66 67 68 69 - class186.bufferX[var18] = var4; // L: 70 - class186.bufferY[var18] = var5 - 1; // L: 71 - var18 = var18 + 1 & 4095; // L: 72 - class186.directions[var16][var17 - 1] = 1; // L: 73 - class186.distances[var16][var17 - 1] = var15; // L: 74 + if (var17 > 0 && class186.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) { + class186.bufferX[var18] = var4; + class186.bufferY[var18] = var5 - 1; + var18 = var18 + 1 & 4095; + class186.directions[var16][var17 - 1] = 1; + class186.distances[var16][var17 - 1] = var15; } - if (var17 < 126 && class186.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) { // L: 76 77 78 79 - class186.bufferX[var18] = var4; // L: 80 - class186.bufferY[var18] = var5 + 1; // L: 81 - var18 = var18 + 1 & 4095; // L: 82 - class186.directions[var16][var17 + 1] = 4; // L: 83 - class186.distances[var16][var17 + 1] = var15; // L: 84 + if (var17 < 126 && class186.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) { + class186.bufferX[var18] = var4; + class186.bufferY[var18] = var5 + 1; + var18 = var18 + 1 & 4095; + class186.directions[var16][var17 + 1] = 4; + class186.distances[var16][var17 + 1] = var15; } - if (var16 > 0 && var17 > 0 && class186.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: 86 87 88 89 90 - class186.bufferX[var18] = var4 - 1; // L: 91 - class186.bufferY[var18] = var5 - 1; // L: 92 - var18 = var18 + 1 & 4095; // L: 93 - class186.directions[var16 - 1][var17 - 1] = 3; // L: 94 - class186.distances[var16 - 1][var17 - 1] = var15; // L: 95 + if (var16 > 0 && var17 > 0 && class186.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) { + class186.bufferX[var18] = var4 - 1; + class186.bufferY[var18] = var5 - 1; + var18 = var18 + 1 & 4095; + class186.directions[var16 - 1][var17 - 1] = 3; + class186.distances[var16 - 1][var17 - 1] = var15; } - if (var16 < 126 && var17 > 0 && class186.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: 97 98 99 100 101 - class186.bufferX[var18] = var4 + 1; // L: 102 - class186.bufferY[var18] = var5 - 1; // L: 103 - var18 = var18 + 1 & 4095; // L: 104 - class186.directions[var16 + 1][var17 - 1] = 9; // L: 105 - class186.distances[var16 + 1][var17 - 1] = var15; // L: 106 + if (var16 < 126 && var17 > 0 && class186.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) { + class186.bufferX[var18] = var4 + 1; + class186.bufferY[var18] = var5 - 1; + var18 = var18 + 1 & 4095; + class186.directions[var16 + 1][var17 - 1] = 9; + class186.distances[var16 + 1][var17 - 1] = var15; } - if (var16 > 0 && var17 < 126 && class186.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: 108 109 110 111 112 - class186.bufferX[var18] = var4 - 1; // L: 113 - class186.bufferY[var18] = var5 + 1; // L: 114 - var18 = var18 + 1 & 4095; // L: 115 - class186.directions[var16 - 1][var17 + 1] = 6; // L: 116 - class186.distances[var16 - 1][var17 + 1] = var15; // L: 117 + if (var16 > 0 && var17 < 126 && class186.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) { + class186.bufferX[var18] = var4 - 1; + class186.bufferY[var18] = var5 + 1; + var18 = var18 + 1 & 4095; + class186.directions[var16 - 1][var17 + 1] = 6; + class186.distances[var16 - 1][var17 + 1] = var15; } - if (var16 < 126 && var17 < 126 && class186.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: 119 120 121 122 123 - class186.bufferX[var18] = var4 + 1; // L: 124 - class186.bufferY[var18] = var5 + 1; // L: 125 - var18 = var18 + 1 & 4095; // L: 126 - class186.directions[var16 + 1][var17 + 1] = 12; // L: 127 - class186.distances[var16 + 1][var17 + 1] = var15; // L: 128 + if (var16 < 126 && var17 < 126 && class186.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) { + class186.bufferX[var18] = var4 + 1; + class186.bufferY[var18] = var5 + 1; + var18 = var18 + 1 & 4095; + class186.directions[var16 + 1][var17 + 1] = 12; + class186.distances[var16 + 1][var17 + 1] = var15; } } - class186.field2129 = var4; // L: 131 - class186.field2130 = var5; // L: 132 - return false; // L: 133 + class186.field2129 = var4; + class186.field2130 = var5; + return false; } @ObfuscatedName("ib") @@ -138,6 +138,6 @@ public abstract class Clock { garbageValue = "-1758808964" ) static void method3144() { - MouseHandler.method646(GameObject.menuWidth / 2 + ModeWhere.menuX, BufferedSink.menuY); // L: 8970 - } // L: 8971 + MouseHandler.method646(GameObject.menuWidth / 2 + ModeWhere.menuX, BufferedSink.menuY); + } } diff --git a/runescape-client/src/main/java/CollisionMap.java b/runescape-client/src/main/java/CollisionMap.java index d971f67cee..9cc7a9e123 100644 --- a/runescape-client/src/main/java/CollisionMap.java +++ b/runescape-client/src/main/java/CollisionMap.java @@ -42,13 +42,13 @@ public class CollisionMap { public int[][] flags; public CollisionMap(int var1, int var2) { - this.xInset = 0; // L: 44 - this.yInset = 0; // L: 45 - this.xSize = var1; // L: 46 - this.ySize = var2; // L: 47 - this.flags = new int[this.xSize][this.ySize]; // L: 48 - this.clear(); // L: 49 - } // L: 50 + this.xInset = 0; + this.yInset = 0; + this.xSize = var1; + this.ySize = var2; + this.flags = new int[this.xSize][this.ySize]; + this.clear(); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -57,17 +57,17 @@ public class CollisionMap { ) @Export("clear") public void clear() { - for (int var1 = 0; var1 < this.xSize; ++var1) { // L: 53 - for (int var2 = 0; var2 < this.ySize; ++var2) { // L: 54 - if (var1 != 0 && var2 != 0 && var1 < this.xSize - 5 && var2 < this.ySize - 5) { // L: 55 - this.flags[var1][var2] = 16777216; // L: 56 + for (int var1 = 0; var1 < this.xSize; ++var1) { + for (int var2 = 0; var2 < this.ySize; ++var2) { + if (var1 != 0 && var2 != 0 && var1 < this.xSize - 5 && var2 < this.ySize - 5) { + this.flags[var1][var2] = 16777216; } else { this.flags[var1][var2] = 16777215; } } } - } // L: 59 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -75,151 +75,151 @@ public class CollisionMap { garbageValue = "-785660455" ) public void method3721(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 - if (var4 == 0) { // L: 65 - this.setFlag(var1, var2, 128); // L: 66 - this.setFlag(var1 - 1, var2, 8); // L: 67 + var1 -= this.xInset; + var2 -= this.yInset; + if (var3 == 0) { + if (var4 == 0) { + this.setFlag(var1, var2, 128); + this.setFlag(var1 - 1, var2, 8); } - if (var4 == 1) { // L: 69 - this.setFlag(var1, var2, 2); // L: 70 - this.setFlag(var1, var2 + 1, 32); // L: 71 + if (var4 == 1) { + this.setFlag(var1, var2, 2); + this.setFlag(var1, var2 + 1, 32); } - if (var4 == 2) { // L: 73 - this.setFlag(var1, var2, 8); // L: 74 - this.setFlag(var1 + 1, var2, 128); // L: 75 + if (var4 == 2) { + this.setFlag(var1, var2, 8); + this.setFlag(var1 + 1, var2, 128); } - if (var4 == 3) { // L: 77 - this.setFlag(var1, var2, 32); // L: 78 - this.setFlag(var1, var2 - 1, 2); // L: 79 + if (var4 == 3) { + this.setFlag(var1, var2, 32); + this.setFlag(var1, var2 - 1, 2); } } - if (var3 == 1 || var3 == 3) { // L: 82 - if (var4 == 0) { // L: 83 - this.setFlag(var1, var2, 1); // L: 84 - this.setFlag(var1 - 1, var2 + 1, 16); // L: 85 + if (var3 == 1 || var3 == 3) { + if (var4 == 0) { + this.setFlag(var1, var2, 1); + this.setFlag(var1 - 1, var2 + 1, 16); } - if (var4 == 1) { // L: 87 - this.setFlag(var1, var2, 4); // L: 88 - this.setFlag(var1 + 1, var2 + 1, 64); // L: 89 + if (var4 == 1) { + this.setFlag(var1, var2, 4); + this.setFlag(var1 + 1, var2 + 1, 64); } - if (var4 == 2) { // L: 91 - this.setFlag(var1, var2, 16); // L: 92 - this.setFlag(var1 + 1, var2 - 1, 1); // L: 93 + if (var4 == 2) { + this.setFlag(var1, var2, 16); + this.setFlag(var1 + 1, var2 - 1, 1); } - if (var4 == 3) { // L: 95 - this.setFlag(var1, var2, 64); // L: 96 - this.setFlag(var1 - 1, var2 - 1, 4); // L: 97 + if (var4 == 3) { + this.setFlag(var1, var2, 64); + this.setFlag(var1 - 1, var2 - 1, 4); } } - if (var3 == 2) { // L: 100 - if (var4 == 0) { // L: 101 - this.setFlag(var1, var2, 130); // L: 102 - this.setFlag(var1 - 1, var2, 8); // L: 103 - this.setFlag(var1, var2 + 1, 32); // L: 104 + if (var3 == 2) { + if (var4 == 0) { + this.setFlag(var1, var2, 130); + this.setFlag(var1 - 1, var2, 8); + this.setFlag(var1, var2 + 1, 32); } - if (var4 == 1) { // L: 106 - this.setFlag(var1, var2, 10); // L: 107 - this.setFlag(var1, var2 + 1, 32); // L: 108 - this.setFlag(var1 + 1, var2, 128); // L: 109 + if (var4 == 1) { + this.setFlag(var1, var2, 10); + this.setFlag(var1, var2 + 1, 32); + this.setFlag(var1 + 1, var2, 128); } - if (var4 == 2) { // L: 111 - this.setFlag(var1, var2, 40); // L: 112 - this.setFlag(var1 + 1, var2, 128); // L: 113 - this.setFlag(var1, var2 - 1, 2); // L: 114 + if (var4 == 2) { + this.setFlag(var1, var2, 40); + this.setFlag(var1 + 1, var2, 128); + this.setFlag(var1, var2 - 1, 2); } - if (var4 == 3) { // L: 116 - this.setFlag(var1, var2, 160); // L: 117 - this.setFlag(var1, var2 - 1, 2); // L: 118 - this.setFlag(var1 - 1, var2, 8); // L: 119 + if (var4 == 3) { + this.setFlag(var1, var2, 160); + this.setFlag(var1, var2 - 1, 2); + this.setFlag(var1 - 1, var2, 8); } } - if (var5) { // L: 122 - if (var3 == 0) { // L: 123 - if (var4 == 0) { // L: 124 - this.setFlag(var1, var2, 65536); // L: 125 - this.setFlag(var1 - 1, var2, 4096); // L: 126 + if (var5) { + if (var3 == 0) { + if (var4 == 0) { + this.setFlag(var1, var2, 65536); + this.setFlag(var1 - 1, var2, 4096); } - if (var4 == 1) { // L: 128 - this.setFlag(var1, var2, 1024); // L: 129 - this.setFlag(var1, var2 + 1, 16384); // L: 130 + if (var4 == 1) { + this.setFlag(var1, var2, 1024); + this.setFlag(var1, var2 + 1, 16384); } - if (var4 == 2) { // L: 132 - this.setFlag(var1, var2, 4096); // L: 133 - this.setFlag(var1 + 1, var2, 65536); // L: 134 + if (var4 == 2) { + this.setFlag(var1, var2, 4096); + this.setFlag(var1 + 1, var2, 65536); } - if (var4 == 3) { // L: 136 - this.setFlag(var1, var2, 16384); // L: 137 - this.setFlag(var1, var2 - 1, 1024); // L: 138 + if (var4 == 3) { + this.setFlag(var1, var2, 16384); + this.setFlag(var1, var2 - 1, 1024); } } - if (var3 == 1 || var3 == 3) { // L: 141 - if (var4 == 0) { // L: 142 - this.setFlag(var1, var2, 512); // L: 143 - this.setFlag(var1 - 1, var2 + 1, 8192); // L: 144 + if (var3 == 1 || var3 == 3) { + if (var4 == 0) { + this.setFlag(var1, var2, 512); + this.setFlag(var1 - 1, var2 + 1, 8192); } - if (var4 == 1) { // L: 146 - this.setFlag(var1, var2, 2048); // L: 147 - this.setFlag(var1 + 1, var2 + 1, 32768); // L: 148 + if (var4 == 1) { + this.setFlag(var1, var2, 2048); + this.setFlag(var1 + 1, var2 + 1, 32768); } - if (var4 == 2) { // L: 150 - this.setFlag(var1, var2, 8192); // L: 151 - this.setFlag(var1 + 1, var2 - 1, 512); // L: 152 + if (var4 == 2) { + this.setFlag(var1, var2, 8192); + this.setFlag(var1 + 1, var2 - 1, 512); } - if (var4 == 3) { // L: 154 - this.setFlag(var1, var2, 32768); // L: 155 - this.setFlag(var1 - 1, var2 - 1, 2048); // L: 156 + if (var4 == 3) { + this.setFlag(var1, var2, 32768); + this.setFlag(var1 - 1, var2 - 1, 2048); } } - if (var3 == 2) { // L: 159 - if (var4 == 0) { // L: 160 - this.setFlag(var1, var2, 66560); // L: 161 - this.setFlag(var1 - 1, var2, 4096); // L: 162 - this.setFlag(var1, var2 + 1, 16384); // L: 163 + if (var3 == 2) { + if (var4 == 0) { + this.setFlag(var1, var2, 66560); + this.setFlag(var1 - 1, var2, 4096); + this.setFlag(var1, var2 + 1, 16384); } - if (var4 == 1) { // L: 165 - this.setFlag(var1, var2, 5120); // L: 166 - this.setFlag(var1, var2 + 1, 16384); // L: 167 - this.setFlag(var1 + 1, var2, 65536); // L: 168 + if (var4 == 1) { + this.setFlag(var1, var2, 5120); + this.setFlag(var1, var2 + 1, 16384); + this.setFlag(var1 + 1, var2, 65536); } - if (var4 == 2) { // L: 170 - this.setFlag(var1, var2, 20480); // L: 171 - this.setFlag(var1 + 1, var2, 65536); // L: 172 - this.setFlag(var1, var2 - 1, 1024); // L: 173 + if (var4 == 2) { + this.setFlag(var1, var2, 20480); + this.setFlag(var1 + 1, var2, 65536); + this.setFlag(var1, var2 - 1, 1024); } - if (var4 == 3) { // L: 175 - this.setFlag(var1, var2, 81920); // L: 176 - this.setFlag(var1, var2 - 1, 1024); // L: 177 - this.setFlag(var1 - 1, var2, 4096); // L: 178 + if (var4 == 3) { + this.setFlag(var1, var2, 81920); + this.setFlag(var1, var2 - 1, 1024); + this.setFlag(var1 - 1, var2, 4096); } } } - } // L: 182 + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -228,25 +228,25 @@ public class CollisionMap { ) @Export("addGameObject") public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) { - int var6 = 256; // L: 185 - if (var5) { // L: 186 + int var6 = 256; + if (var5) { var6 += 131072; } - var1 -= this.xInset; // L: 187 - var2 -= this.yInset; // L: 188 + var1 -= this.xInset; + var2 -= this.yInset; - for (int var7 = var1; var7 < var3 + var1; ++var7) { // L: 189 - if (var7 >= 0 && var7 < this.xSize) { // L: 190 - for (int var8 = var2; var8 < var2 + var4; ++var8) { // L: 191 - if (var8 >= 0 && var8 < this.ySize) { // L: 192 + for (int var7 = var1; var7 < var3 + var1; ++var7) { + if (var7 >= 0 && var7 < this.xSize) { + for (int var8 = var2; var8 < var2 + var4; ++var8) { + if (var8 >= 0 && var8 < this.ySize) { this.setFlag(var7, var8, var6); } } } } - } // L: 196 + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -255,11 +255,11 @@ public class CollisionMap { ) @Export("setBlockedByFloor") public void setBlockedByFloor(int var1, int var2) { - var1 -= this.xInset; // L: 199 - var2 -= this.yInset; // L: 200 - int[] var10000 = this.flags[var1]; // L: 201 + var1 -= this.xInset; + var2 -= this.yInset; + int[] var10000 = this.flags[var1]; var10000[var2] |= 2097152; - } // L: 202 + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -268,11 +268,11 @@ public class CollisionMap { ) @Export("setBlockedByFloorDec") public void setBlockedByFloorDec(int var1, int var2) { - var1 -= this.xInset; // L: 205 - var2 -= this.yInset; // L: 206 - int[] var10000 = this.flags[var1]; // L: 207 + var1 -= this.xInset; + var2 -= this.yInset; + int[] var10000 = this.flags[var1]; var10000[var2] |= 262144; - } // L: 208 + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -281,9 +281,9 @@ public class CollisionMap { ) @Export("setFlag") void setFlag(int var1, int var2, int var3) { - int[] var10000 = this.flags[var1]; // L: 211 + int[] var10000 = this.flags[var1]; var10000[var2] |= var3; - } // L: 212 + } @ObfuscatedName("j") @ObfuscatedSignature( @@ -291,151 +291,151 @@ public class CollisionMap { garbageValue = "508874863" ) public void method3693(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 - if (var4 == 0) { // L: 218 - this.setFlagOff(var1, var2, 128); // L: 219 - this.setFlagOff(var1 - 1, var2, 8); // L: 220 + var1 -= this.xInset; + var2 -= this.yInset; + if (var3 == 0) { + if (var4 == 0) { + this.setFlagOff(var1, var2, 128); + this.setFlagOff(var1 - 1, var2, 8); } - if (var4 == 1) { // L: 222 - this.setFlagOff(var1, var2, 2); // L: 223 - this.setFlagOff(var1, var2 + 1, 32); // L: 224 + if (var4 == 1) { + this.setFlagOff(var1, var2, 2); + this.setFlagOff(var1, var2 + 1, 32); } - if (var4 == 2) { // L: 226 - this.setFlagOff(var1, var2, 8); // L: 227 - this.setFlagOff(var1 + 1, var2, 128); // L: 228 + if (var4 == 2) { + this.setFlagOff(var1, var2, 8); + this.setFlagOff(var1 + 1, var2, 128); } - if (var4 == 3) { // L: 230 - this.setFlagOff(var1, var2, 32); // L: 231 - this.setFlagOff(var1, var2 - 1, 2); // L: 232 + if (var4 == 3) { + this.setFlagOff(var1, var2, 32); + this.setFlagOff(var1, var2 - 1, 2); } } - if (var3 == 1 || var3 == 3) { // L: 235 - if (var4 == 0) { // L: 236 - this.setFlagOff(var1, var2, 1); // L: 237 - this.setFlagOff(var1 - 1, var2 + 1, 16); // L: 238 + if (var3 == 1 || var3 == 3) { + if (var4 == 0) { + this.setFlagOff(var1, var2, 1); + this.setFlagOff(var1 - 1, var2 + 1, 16); } - if (var4 == 1) { // L: 240 - this.setFlagOff(var1, var2, 4); // L: 241 - this.setFlagOff(var1 + 1, var2 + 1, 64); // L: 242 + if (var4 == 1) { + this.setFlagOff(var1, var2, 4); + this.setFlagOff(var1 + 1, var2 + 1, 64); } - if (var4 == 2) { // L: 244 - this.setFlagOff(var1, var2, 16); // L: 245 - this.setFlagOff(var1 + 1, var2 - 1, 1); // L: 246 + if (var4 == 2) { + this.setFlagOff(var1, var2, 16); + this.setFlagOff(var1 + 1, var2 - 1, 1); } - if (var4 == 3) { // L: 248 - this.setFlagOff(var1, var2, 64); // L: 249 - this.setFlagOff(var1 - 1, var2 - 1, 4); // L: 250 + if (var4 == 3) { + this.setFlagOff(var1, var2, 64); + this.setFlagOff(var1 - 1, var2 - 1, 4); } } - if (var3 == 2) { // L: 253 - if (var4 == 0) { // L: 254 - this.setFlagOff(var1, var2, 130); // L: 255 - this.setFlagOff(var1 - 1, var2, 8); // L: 256 - this.setFlagOff(var1, var2 + 1, 32); // L: 257 + if (var3 == 2) { + if (var4 == 0) { + this.setFlagOff(var1, var2, 130); + this.setFlagOff(var1 - 1, var2, 8); + this.setFlagOff(var1, var2 + 1, 32); } - if (var4 == 1) { // L: 259 - this.setFlagOff(var1, var2, 10); // L: 260 - this.setFlagOff(var1, var2 + 1, 32); // L: 261 - this.setFlagOff(var1 + 1, var2, 128); // L: 262 + if (var4 == 1) { + this.setFlagOff(var1, var2, 10); + this.setFlagOff(var1, var2 + 1, 32); + this.setFlagOff(var1 + 1, var2, 128); } - if (var4 == 2) { // L: 264 - this.setFlagOff(var1, var2, 40); // L: 265 - this.setFlagOff(var1 + 1, var2, 128); // L: 266 - this.setFlagOff(var1, var2 - 1, 2); // L: 267 + if (var4 == 2) { + this.setFlagOff(var1, var2, 40); + this.setFlagOff(var1 + 1, var2, 128); + this.setFlagOff(var1, var2 - 1, 2); } - if (var4 == 3) { // L: 269 - this.setFlagOff(var1, var2, 160); // L: 270 - this.setFlagOff(var1, var2 - 1, 2); // L: 271 - this.setFlagOff(var1 - 1, var2, 8); // L: 272 + if (var4 == 3) { + this.setFlagOff(var1, var2, 160); + this.setFlagOff(var1, var2 - 1, 2); + this.setFlagOff(var1 - 1, var2, 8); } } - if (var5) { // L: 275 - if (var3 == 0) { // L: 276 - if (var4 == 0) { // L: 277 - this.setFlagOff(var1, var2, 65536); // L: 278 - this.setFlagOff(var1 - 1, var2, 4096); // L: 279 + if (var5) { + if (var3 == 0) { + if (var4 == 0) { + this.setFlagOff(var1, var2, 65536); + this.setFlagOff(var1 - 1, var2, 4096); } - if (var4 == 1) { // L: 281 - this.setFlagOff(var1, var2, 1024); // L: 282 - this.setFlagOff(var1, var2 + 1, 16384); // L: 283 + if (var4 == 1) { + this.setFlagOff(var1, var2, 1024); + this.setFlagOff(var1, var2 + 1, 16384); } - if (var4 == 2) { // L: 285 - this.setFlagOff(var1, var2, 4096); // L: 286 - this.setFlagOff(var1 + 1, var2, 65536); // L: 287 + if (var4 == 2) { + this.setFlagOff(var1, var2, 4096); + this.setFlagOff(var1 + 1, var2, 65536); } - if (var4 == 3) { // L: 289 - this.setFlagOff(var1, var2, 16384); // L: 290 - this.setFlagOff(var1, var2 - 1, 1024); // L: 291 + if (var4 == 3) { + this.setFlagOff(var1, var2, 16384); + this.setFlagOff(var1, var2 - 1, 1024); } } - if (var3 == 1 || var3 == 3) { // L: 294 - if (var4 == 0) { // L: 295 - this.setFlagOff(var1, var2, 512); // L: 296 - this.setFlagOff(var1 - 1, var2 + 1, 8192); // L: 297 + if (var3 == 1 || var3 == 3) { + if (var4 == 0) { + this.setFlagOff(var1, var2, 512); + this.setFlagOff(var1 - 1, var2 + 1, 8192); } - if (var4 == 1) { // L: 299 - this.setFlagOff(var1, var2, 2048); // L: 300 - this.setFlagOff(var1 + 1, var2 + 1, 32768); // L: 301 + if (var4 == 1) { + this.setFlagOff(var1, var2, 2048); + this.setFlagOff(var1 + 1, var2 + 1, 32768); } - if (var4 == 2) { // L: 303 - this.setFlagOff(var1, var2, 8192); // L: 304 - this.setFlagOff(var1 + 1, var2 - 1, 512); // L: 305 + if (var4 == 2) { + this.setFlagOff(var1, var2, 8192); + this.setFlagOff(var1 + 1, var2 - 1, 512); } - if (var4 == 3) { // L: 307 - this.setFlagOff(var1, var2, 32768); // L: 308 - this.setFlagOff(var1 - 1, var2 - 1, 2048); // L: 309 + if (var4 == 3) { + this.setFlagOff(var1, var2, 32768); + this.setFlagOff(var1 - 1, var2 - 1, 2048); } } - if (var3 == 2) { // L: 312 - if (var4 == 0) { // L: 313 - this.setFlagOff(var1, var2, 66560); // L: 314 - this.setFlagOff(var1 - 1, var2, 4096); // L: 315 - this.setFlagOff(var1, var2 + 1, 16384); // L: 316 + if (var3 == 2) { + if (var4 == 0) { + this.setFlagOff(var1, var2, 66560); + this.setFlagOff(var1 - 1, var2, 4096); + this.setFlagOff(var1, var2 + 1, 16384); } - if (var4 == 1) { // L: 318 - this.setFlagOff(var1, var2, 5120); // L: 319 - this.setFlagOff(var1, var2 + 1, 16384); // L: 320 - this.setFlagOff(var1 + 1, var2, 65536); // L: 321 + if (var4 == 1) { + this.setFlagOff(var1, var2, 5120); + this.setFlagOff(var1, var2 + 1, 16384); + this.setFlagOff(var1 + 1, var2, 65536); } - if (var4 == 2) { // L: 323 - this.setFlagOff(var1, var2, 20480); // L: 324 - this.setFlagOff(var1 + 1, var2, 65536); // L: 325 - this.setFlagOff(var1, var2 - 1, 1024); // L: 326 + if (var4 == 2) { + this.setFlagOff(var1, var2, 20480); + this.setFlagOff(var1 + 1, var2, 65536); + this.setFlagOff(var1, var2 - 1, 1024); } - if (var4 == 3) { // L: 328 - this.setFlagOff(var1, var2, 81920); // L: 329 - this.setFlagOff(var1, var2 - 1, 1024); // L: 330 - this.setFlagOff(var1 - 1, var2, 4096); // L: 331 + if (var4 == 3) { + this.setFlagOff(var1, var2, 81920); + this.setFlagOff(var1, var2 - 1, 1024); + this.setFlagOff(var1 - 1, var2, 4096); } } } - } // L: 335 + } @ObfuscatedName("w") @ObfuscatedSignature( @@ -444,31 +444,31 @@ public class CollisionMap { ) @Export("setFlagOffNonSquare") public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5, boolean var6) { - int var7 = 256; // L: 338 - if (var6) { // L: 339 + int var7 = 256; + if (var6) { var7 += 131072; } - var1 -= this.xInset; // L: 340 - var2 -= this.yInset; // L: 341 + var1 -= this.xInset; + var2 -= this.yInset; int var8; - if (var5 == 1 || var5 == 3) { // L: 342 - var8 = var3; // L: 343 - var3 = var4; // L: 344 - var4 = var8; // L: 345 + if (var5 == 1 || var5 == 3) { + var8 = var3; + var3 = var4; + var4 = var8; } - for (var8 = var1; var8 < var3 + var1; ++var8) { // L: 347 - if (var8 >= 0 && var8 < this.xSize) { // L: 348 - for (int var9 = var2; var9 < var2 + var4; ++var9) { // L: 349 + for (var8 = var1; var8 < var3 + var1; ++var8) { + if (var8 >= 0 && var8 < this.xSize) { + for (int var9 = var2; var9 < var2 + var4; ++var9) { if (var9 >= 0 && var9 < this.ySize) { - this.setFlagOff(var8, var9, var7); // L: 350 + this.setFlagOff(var8, var9, var7); } } } } - } // L: 354 + } @ObfuscatedName("n") @ObfuscatedSignature( @@ -477,9 +477,9 @@ public class CollisionMap { ) @Export("setFlagOff") void setFlagOff(int var1, int var2, int var3) { - int[] var10000 = this.flags[var1]; // L: 357 + int[] var10000 = this.flags[var1]; var10000[var2] &= ~var3; - } // L: 358 + } @ObfuscatedName("r") @ObfuscatedSignature( @@ -487,9 +487,9 @@ public class CollisionMap { garbageValue = "-1207646321" ) public void method3701(int var1, int var2) { - var1 -= this.xInset; // L: 361 - var2 -= this.yInset; // L: 362 - int[] var10000 = this.flags[var1]; // L: 363 + var1 -= this.xInset; + var2 -= this.yInset; + int[] var10000 = this.flags[var1]; var10000[var2] &= -262145; - } // L: 364 + } } diff --git a/runescape-client/src/main/java/Coord.java b/runescape-client/src/main/java/Coord.java index 83e256839c..dca21d084b 100644 --- a/runescape-client/src/main/java/Coord.java +++ b/runescape-client/src/main/java/Coord.java @@ -38,27 +38,27 @@ public class Coord { descriptor = "(Lju;)V" ) public Coord(Coord var1) { - this.plane = var1.plane; // L: 15 - this.x = var1.x; // L: 16 - this.y = var1.y; // L: 17 - } // L: 18 + this.plane = var1.plane; + this.x = var1.x; + this.y = var1.y; + } public Coord(int var1, int var2, int var3) { - this.plane = var1; // L: 9 - this.x = var2; // L: 10 - this.y = var3; // L: 11 - } // L: 12 + this.plane = var1; + this.x = var2; + this.y = var3; + } public Coord(int var1) { - if (var1 == -1) { // L: 21 + if (var1 == -1) { this.plane = -1; } else { - this.plane = var1 >> 28 & 3; // L: 23 - this.x = var1 >> 14 & 16383; // L: 24 - this.y = var1 & 16383; // L: 25 + this.plane = var1 >> 28 & 3; + this.x = var1 >> 14 & 16383; + this.y = var1 & 16383; } - } // L: 27 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -67,11 +67,11 @@ public class Coord { ) @Export("packed") public int packed() { - 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 + int var2 = this.plane; + int var3 = this.x; + int var4 = this.y; + int var1 = var2 << 28 | var3 << 14 | var4; + return var1; } @ObfuscatedName("b") @@ -81,12 +81,12 @@ public class Coord { ) @Export("equalsCoord") boolean equalsCoord(Coord var1) { - if (this.plane != var1.plane) { // L: 48 + if (this.plane != var1.plane) { return false; - } else if (this.x != var1.x) { // L: 49 + } else if (this.x != var1.x) { return false; } else { - return this.y == var1.y; // L: 50 + return this.y == var1.y; } } @@ -97,22 +97,22 @@ public class Coord { ) @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: 64 + return this.plane + var1 + (this.x >> 6) + var1 + (this.y >> 6) + var1 + (this.x & 63) + var1 + (this.y & 63); } public String toString() { - return this.toString(","); // L: 60 + return this.toString(","); } public boolean equals(Object var1) { - if (this == var1) { // L: 42 + if (this == var1) { return true; } else { - return !(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1); // L: 43 44 + return !(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1); } } public int hashCode() { - return this.packed(); // L: 56 + return this.packed(); } } diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java index 9e84767bad..30cfcdfba7 100644 --- a/runescape-client/src/main/java/Decimator.java +++ b/runescape-client/src/main/java/Decimator.java @@ -24,41 +24,41 @@ public class Decimator { int[][] table; public Decimator(int var1, int var2) { - if (var2 != var1) { // L: 14 - int var3 = WorldMapCacheName.method4865(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 + if (var2 != var1) { + int var3 = WorldMapCacheName.method4865(var1, var2); + var1 /= var3; + var2 /= var3; + this.inputRate = var1; + this.outputRate = var2; + this.table = new int[var1][14]; - for (int var4 = 0; var4 < var1; ++var4) { // L: 21 - int[] var5 = this.table[var4]; // L: 22 - double var6 = (double)var4 / (double)var1 + 6.0D; // L: 23 - int var8 = (int)Math.floor(1.0D + (var6 - 7.0D)); // L: 24 - if (var8 < 0) { // L: 25 + for (int var4 = 0; var4 < var1; ++var4) { + int[] var5 = this.table[var4]; + double var6 = (double)var4 / (double)var1 + 6.0D; + int var8 = (int)Math.floor(1.0D + (var6 - 7.0D)); + if (var8 < 0) { var8 = 0; } - int var9 = (int)Math.ceil(7.0D + var6); // L: 26 - if (var9 > 14) { // L: 27 + int var9 = (int)Math.ceil(7.0D + var6); + if (var9 > 14) { var9 = 14; } - for (double var10 = (double)var2 / (double)var1; var8 < var9; ++var8) { // L: 28 29 - double var12 = ((double)var8 - var6) * 3.141592653589793D; // L: 30 - double var14 = var10; // L: 31 + for (double var10 = (double)var2 / (double)var1; var8 < var9; ++var8) { + double var12 = ((double)var8 - var6) * 3.141592653589793D; + double var14 = var10; if (var12 < -1.0E-4D || var12 > 1.0E-4D) { var14 = var10 * (Math.sin(var12) / var12); } - var14 *= 0.54D + 0.46D * Math.cos(0.2243994752564138D * ((double)var8 - var6)); // L: 33 - var5[var8] = (int)Math.floor(65536.0D * var14 + 0.5D); // L: 34 + var14 *= 0.54D + 0.46D * Math.cos(0.2243994752564138D * ((double)var8 - var6)); + var5[var8] = (int)Math.floor(65536.0D * var14 + 0.5D); } } } - } // L: 37 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -67,43 +67,43 @@ public class Decimator { ) @Export("resample") byte[] resample(byte[] var1) { - 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 + if (this.table != null) { + int var2 = (int)((long)var1.length * (long)this.outputRate / (long)this.inputRate) + 14; + int[] var3 = new int[var2]; + int var4 = 0; + int var5 = 0; int var6; - for (var6 = 0; var6 < var1.length; ++var6) { // L: 45 - byte var7 = var1[var6]; // L: 46 - int[] var8 = this.table[var5]; // L: 47 + for (var6 = 0; var6 < var1.length; ++var6) { + byte var7 = var1[var6]; + int[] var8 = this.table[var5]; int var9; - for (var9 = 0; var9 < 14; ++var9) { // L: 48 + for (var9 = 0; var9 < 14; ++var9) { var3[var4 + var9] += var7 * var8[var9]; } - var5 += this.outputRate; // L: 49 - var9 = var5 / this.inputRate; // L: 50 - var4 += var9; // L: 51 - var5 -= var9 * this.inputRate; // L: 52 + var5 += this.outputRate; + var9 = var5 / this.inputRate; + var4 += var9; + var5 -= var9 * this.inputRate; } - var1 = new byte[var2]; // L: 54 + var1 = new byte[var2]; - for (var6 = 0; var6 < var2; ++var6) { // L: 55 - int var10 = var3[var6] + 32768 >> 16; // L: 56 - if (var10 < -128) { // L: 57 + for (var6 = 0; var6 < var2; ++var6) { + int var10 = var3[var6] + 32768 >> 16; + if (var10 < -128) { var1[var6] = -128; - } else if (var10 > 127) { // L: 58 + } else if (var10 > 127) { var1[var6] = 127; } else { - var1[var6] = (byte)var10; // L: 59 + var1[var6] = (byte)var10; } } } - return var1; // L: 62 + return var1; } @ObfuscatedName("b") @@ -113,11 +113,11 @@ public class Decimator { ) @Export("scaleRate") int scaleRate(int var1) { - if (this.table != null) { // L: 66 + if (this.table != null) { var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate); } - return var1; // L: 67 + return var1; } @ObfuscatedName("p") @@ -127,11 +127,11 @@ public class Decimator { ) @Export("scalePosition") int scalePosition(int var1) { - if (this.table != null) { // L: 71 + if (this.table != null) { var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate) + 6; } - return var1; // L: 72 + return var1; } @ObfuscatedName("c") @@ -140,7 +140,7 @@ public class Decimator { garbageValue = "1433736231" ) static void method1073(int var0) { - } // L: 32 + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -149,111 +149,111 @@ public class Decimator { ) @Export("updateExternalPlayer") static boolean updateExternalPlayer(PacketBuffer var0, int var1) { - int var2 = var0.readBits(2); // L: 376 + int var2 = var0.readBits(2); int var3; int var4; int var7; int var8; int var9; int var10; - if (var2 == 0) { // L: 377 - if (var0.readBits(1) != 0) { // L: 378 + if (var2 == 0) { + if (var0.readBits(1) != 0) { 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 + var3 = var0.readBits(13); + var4 = var0.readBits(13); + boolean var12 = var0.readBits(1) == 1; + if (var12) { Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; } - if (Client.players[var1] != null) { // L: 383 - throw new RuntimeException(); // L: 384 + if (Client.players[var1] != null) { + throw new RuntimeException(); } else { - Player var11 = Client.players[var1] = new Player(); // L: 386 - var11.index = var1; // L: 387 - if (Players.field1248[var1] != null) { // L: 388 + Player var11 = Client.players[var1] = new Player(); + var11.index = var1; + if (Players.field1248[var1] != null) { var11.read(Players.field1248[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.field1153[0] = Players.field1246[var1]; // L: 395 - var11.plane = (byte)var8; // L: 396 - var11.resetPath((var9 << 13) + var3 - class131.baseX, (var10 << 13) + var4 - TileItem.baseY); // L: 397 - var11.field1055 = false; // L: 398 - return true; // L: 399 + var11.orientation = Players.Players_orientations[var1]; + var11.targetIndex = Players.Players_targetIndices[var1]; + var7 = Players.Players_regions[var1]; + var8 = var7 >> 28; + var9 = var7 >> 14 & 255; + var10 = var7 & 255; + var11.field1153[0] = Players.field1246[var1]; + var11.plane = (byte)var8; + var11.resetPath((var9 << 13) + var3 - class131.baseX, (var10 << 13) + var4 - TileItem.baseY); + var11.field1055 = false; + return true; } - } else if (var2 == 1) { // L: 401 - var3 = var0.readBits(2); // L: 402 - var4 = Players.Players_regions[var1]; // L: 403 - Players.Players_regions[var1] = (var4 & 268435455) + (((var4 >> 28) + var3 & 3) << 28); // L: 404 - return false; // L: 405 + } else if (var2 == 1) { + var3 = var0.readBits(2); + var4 = Players.Players_regions[var1]; + Players.Players_regions[var1] = (var4 & 268435455) + (((var4 >> 28) + var3 & 3) << 28); + return false; } else { int var5; int 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 + if (var2 == 2) { + var3 = var0.readBits(5); + var4 = var3 >> 3; + var5 = var3 & 7; + var6 = Players.Players_regions[var1]; + var7 = (var6 >> 28) + var4 & 3; + var8 = var6 >> 14 & 255; + var9 = var6 & 255; + if (var5 == 0) { + --var8; --var9; } - if (var5 == 2) { // L: 420 - ++var8; // L: 421 - --var9; // L: 422 + if (var5 == 1) { + --var9; } - if (var5 == 3) { // L: 424 + if (var5 == 2) { + ++var8; + --var9; + } + + if (var5 == 3) { --var8; } - if (var5 == 4) { // L: 425 + if (var5 == 4) { ++var8; } - if (var5 == 5) { // L: 426 - --var8; // L: 427 - ++var9; // L: 428 - } - - if (var5 == 6) { // L: 430 + if (var5 == 5) { + --var8; ++var9; } - if (var5 == 7) { // L: 431 - ++var8; // L: 432 - ++var9; // L: 433 + if (var5 == 6) { + ++var9; } - Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); // L: 435 - return false; // L: 436 + if (var5 == 7) { + ++var8; + ++var9; + } + + Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); + return false; } 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 + var3 = var0.readBits(18); + var4 = var3 >> 16; + var5 = var3 >> 8 & 255; + var6 = var3 & 255; + var7 = Players.Players_regions[var1]; + var8 = (var7 >> 28) + var4 & 3; + var9 = var5 + (var7 >> 14) & 255; + var10 = var6 + var7 & 255; + Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); + return false; } } } @@ -265,733 +265,733 @@ public class Decimator { ) @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: 9020 + if (var2 >= 2000) { var2 -= 2000; } PacketBufferNode var8; - if (var2 == 1) { // L: 9021 - Client.mouseCrossX = var6; // L: 9450 - Client.mouseCrossY = var7; // L: 9451 - Client.mouseCrossColor = 2; // L: 9452 - Client.mouseCrossState = 0; // L: 9453 - Client.destinationX = var0; // L: 9454 - Client.destinationY = var1; // L: 9455 - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2831, Client.packetWriter.isaacCipher); // L: 9457 - var8.packetBuffer.method7390(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9458 - var8.packetBuffer.writeShort(var3); // L: 9459 - var8.packetBuffer.writeShort(class139.selectedItemId); // L: 9460 - var8.packetBuffer.method7398(TileItem.baseY + var1); // L: 9461 - var8.packetBuffer.method7407(MidiPcmStream.selectedItemWidget); // L: 9462 - var8.packetBuffer.method7349(Calendar.selectedItemSlot); // L: 9463 - var8.packetBuffer.method7349(var0 + class131.baseX); // L: 9464 - Client.packetWriter.addNode(var8); // L: 9465 + if (var2 == 1) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2831, Client.packetWriter.isaacCipher); + var8.packetBuffer.method7390(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeShort(var3); + var8.packetBuffer.writeShort(class139.selectedItemId); + var8.packetBuffer.method7398(TileItem.baseY + var1); + var8.packetBuffer.method7407(MidiPcmStream.selectedItemWidget); + var8.packetBuffer.method7349(Calendar.selectedItemSlot); + var8.packetBuffer.method7349(var0 + class131.baseX); + Client.packetWriter.addNode(var8); } else if (var2 == 2) { - Client.mouseCrossX = var6; // L: 9206 - Client.mouseCrossY = var7; // L: 9207 - Client.mouseCrossColor = 2; // L: 9208 - Client.mouseCrossState = 0; // L: 9209 - Client.destinationX = var0; // L: 9210 - Client.destinationY = var1; // L: 9211 - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2850, Client.packetWriter.isaacCipher); // L: 9212 - var8.packetBuffer.method7493(Client.selectedSpellChildIndex); // L: 9213 - var8.packetBuffer.method7390(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9214 - var8.packetBuffer.method7527(class20.selectedSpellWidget); // L: 9215 - var8.packetBuffer.method7398(Client.field633); // L: 9216 - var8.packetBuffer.method7493(var0 + class131.baseX); // L: 9217 - var8.packetBuffer.method7493(var3); // L: 9218 - var8.packetBuffer.method7493(TileItem.baseY + var1); // L: 9219 - Client.packetWriter.addNode(var8); // L: 9220 + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2850, Client.packetWriter.isaacCipher); + var8.packetBuffer.method7493(Client.selectedSpellChildIndex); + var8.packetBuffer.method7390(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method7527(class20.selectedSpellWidget); + var8.packetBuffer.method7398(Client.field633); + var8.packetBuffer.method7493(var0 + class131.baseX); + var8.packetBuffer.method7493(var3); + var8.packetBuffer.method7493(TileItem.baseY + var1); + Client.packetWriter.addNode(var8); } else if (var2 == 3) { - Client.mouseCrossX = var6; // L: 9389 - Client.mouseCrossY = var7; // L: 9390 - Client.mouseCrossColor = 2; // L: 9391 - Client.mouseCrossState = 0; // L: 9392 - Client.destinationX = var0; // L: 9393 - Client.destinationY = var1; // L: 9394 - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2883, Client.packetWriter.isaacCipher); // L: 9396 - var8.packetBuffer.method7398(var0 + class131.baseX); // L: 9397 - var8.packetBuffer.writeShort(var3); // L: 9398 - var8.packetBuffer.method7493(TileItem.baseY + var1); // L: 9399 - var8.packetBuffer.method7390(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9400 - Client.packetWriter.addNode(var8); // L: 9401 + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2883, Client.packetWriter.isaacCipher); + var8.packetBuffer.method7398(var0 + class131.baseX); + var8.packetBuffer.writeShort(var3); + var8.packetBuffer.method7493(TileItem.baseY + var1); + var8.packetBuffer.method7390(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var8); } else if (var2 == 4) { - Client.mouseCrossX = var6; // L: 9329 - Client.mouseCrossY = var7; // L: 9330 - Client.mouseCrossColor = 2; // L: 9331 - Client.mouseCrossState = 0; // L: 9332 - Client.destinationX = var0; // L: 9333 - Client.destinationY = var1; // L: 9334 - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2896, Client.packetWriter.isaacCipher); // L: 9336 - var8.packetBuffer.method7398(TileItem.baseY + var1); // L: 9337 - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9338 - var8.packetBuffer.method7349(var0 + class131.baseX); // L: 9339 - var8.packetBuffer.method7398(var3); // L: 9340 - Client.packetWriter.addNode(var8); // L: 9341 + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2896, Client.packetWriter.isaacCipher); + var8.packetBuffer.method7398(TileItem.baseY + var1); + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method7349(var0 + class131.baseX); + var8.packetBuffer.method7398(var3); + Client.packetWriter.addNode(var8); } else if (var2 == 5) { - Client.mouseCrossX = var6; // L: 9664 - Client.mouseCrossY = var7; // L: 9665 - Client.mouseCrossColor = 2; // L: 9666 - Client.mouseCrossState = 0; // L: 9667 - Client.destinationX = var0; // L: 9668 - Client.destinationY = var1; // L: 9669 - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2856, Client.packetWriter.isaacCipher); // L: 9671 - var8.packetBuffer.method7493(var3); // L: 9672 - var8.packetBuffer.method7493(TileItem.baseY + var1); // L: 9673 - var8.packetBuffer.writeShort(var0 + class131.baseX); // L: 9674 - var8.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9675 - Client.packetWriter.addNode(var8); // L: 9676 + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2856, Client.packetWriter.isaacCipher); + var8.packetBuffer.method7493(var3); + var8.packetBuffer.method7493(TileItem.baseY + var1); + var8.packetBuffer.writeShort(var0 + class131.baseX); + var8.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var8); } else if (var2 == 6) { - Client.mouseCrossX = var6; // L: 9627 - Client.mouseCrossY = var7; // L: 9628 - Client.mouseCrossColor = 2; // L: 9629 - Client.mouseCrossState = 0; // L: 9630 - Client.destinationX = var0; // L: 9631 - Client.destinationY = var1; // L: 9632 - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2870, Client.packetWriter.isaacCipher); // L: 9634 - var8.packetBuffer.method7493(var3); // L: 9635 - var8.packetBuffer.method7390(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9636 - var8.packetBuffer.method7493(TileItem.baseY + var1); // L: 9637 - var8.packetBuffer.method7493(var0 + class131.baseX); // L: 9638 - Client.packetWriter.addNode(var8); // L: 9639 + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2870, Client.packetWriter.isaacCipher); + var8.packetBuffer.method7493(var3); + var8.packetBuffer.method7390(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method7493(TileItem.baseY + var1); + var8.packetBuffer.method7493(var0 + class131.baseX); + Client.packetWriter.addNode(var8); } else { PacketBufferNode var9; NPC var13; if (var2 == 7) { - var13 = Client.npcs[var3]; // L: 9088 - if (var13 != null) { // L: 9089 - Client.mouseCrossX = var6; // L: 9090 - Client.mouseCrossY = var7; // L: 9091 - Client.mouseCrossColor = 2; // L: 9092 - Client.mouseCrossState = 0; // L: 9093 - Client.destinationX = var0; // L: 9094 - Client.destinationY = var1; // L: 9095 - var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2840, Client.packetWriter.isaacCipher); // L: 9097 - var9.packetBuffer.method7398(class139.selectedItemId); // L: 9098 - var9.packetBuffer.method7362(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9099 - var9.packetBuffer.method7398(var3); // L: 9100 - var9.packetBuffer.method7527(MidiPcmStream.selectedItemWidget); // L: 9101 - var9.packetBuffer.method7398(Calendar.selectedItemSlot); // L: 9102 - Client.packetWriter.addNode(var9); // L: 9103 + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2840, Client.packetWriter.isaacCipher); + var9.packetBuffer.method7398(class139.selectedItemId); + var9.packetBuffer.method7362(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method7398(var3); + var9.packetBuffer.method7527(MidiPcmStream.selectedItemWidget); + var9.packetBuffer.method7398(Calendar.selectedItemSlot); + Client.packetWriter.addNode(var9); } } else if (var2 == 8) { - var13 = Client.npcs[var3]; // L: 9692 - if (var13 != null) { // L: 9693 - Client.mouseCrossX = var6; // L: 9694 - Client.mouseCrossY = var7; // L: 9695 - Client.mouseCrossColor = 2; // L: 9696 - Client.mouseCrossState = 0; // L: 9697 - Client.destinationX = var0; // L: 9698 - Client.destinationY = var1; // L: 9699 - var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2901, Client.packetWriter.isaacCipher); // L: 9700 - var9.packetBuffer.method7407(class20.selectedSpellWidget); // L: 9701 - var9.packetBuffer.method7398(Client.field633); // L: 9702 - var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 9703 - var9.packetBuffer.method7390(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9704 - var9.packetBuffer.writeShort(var3); // L: 9705 - Client.packetWriter.addNode(var9); // L: 9706 + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2901, Client.packetWriter.isaacCipher); + var9.packetBuffer.method7407(class20.selectedSpellWidget); + var9.packetBuffer.method7398(Client.field633); + var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); + var9.packetBuffer.method7390(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var9); } } else if (var2 == 9) { - var13 = Client.npcs[var3]; // L: 9611 - if (var13 != null) { // L: 9612 - Client.mouseCrossX = var6; // L: 9613 - Client.mouseCrossY = var7; // L: 9614 - Client.mouseCrossColor = 2; // L: 9615 - Client.mouseCrossState = 0; // L: 9616 - Client.destinationX = var0; // L: 9617 - Client.destinationY = var1; // L: 9618 - var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2839, Client.packetWriter.isaacCipher); // L: 9620 - var9.packetBuffer.method7349(var3); // L: 9621 - var9.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9622 - Client.packetWriter.addNode(var9); // L: 9623 + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2839, Client.packetWriter.isaacCipher); + var9.packetBuffer.method7349(var3); + var9.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); } } else if (var2 == 10) { - var13 = Client.npcs[var3]; // L: 9239 - if (var13 != null) { // L: 9240 - Client.mouseCrossX = var6; // L: 9241 - Client.mouseCrossY = var7; // L: 9242 - Client.mouseCrossColor = 2; // L: 9243 - Client.mouseCrossState = 0; // L: 9244 - Client.destinationX = var0; // L: 9245 - Client.destinationY = var1; // L: 9246 - var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2865, Client.packetWriter.isaacCipher); // L: 9248 - var9.packetBuffer.method7362(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9249 - var9.packetBuffer.method7398(var3); // L: 9250 - Client.packetWriter.addNode(var9); // L: 9251 + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2865, Client.packetWriter.isaacCipher); + var9.packetBuffer.method7362(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method7398(var3); + Client.packetWriter.addNode(var9); } } else if (var2 == 11) { - var13 = Client.npcs[var3]; // L: 9768 - if (var13 != null) { // L: 9769 - Client.mouseCrossX = var6; // L: 9770 - Client.mouseCrossY = var7; // L: 9771 - Client.mouseCrossColor = 2; // L: 9772 - Client.mouseCrossState = 0; // L: 9773 - Client.destinationX = var0; // L: 9774 - Client.destinationY = var1; // L: 9775 - var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2812, Client.packetWriter.isaacCipher); // L: 9777 - var9.packetBuffer.method7493(var3); // L: 9778 - var9.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9779 - Client.packetWriter.addNode(var9); // L: 9780 + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2812, Client.packetWriter.isaacCipher); + var9.packetBuffer.method7493(var3); + var9.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); } } else if (var2 == 12) { - var13 = Client.npcs[var3]; // L: 9265 - if (var13 != null) { // L: 9266 - Client.mouseCrossX = var6; // L: 9267 - Client.mouseCrossY = var7; // L: 9268 - Client.mouseCrossColor = 2; // L: 9269 - Client.mouseCrossState = 0; // L: 9270 - Client.destinationX = var0; // L: 9271 - Client.destinationY = var1; // L: 9272 - var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2872, Client.packetWriter.isaacCipher); // L: 9274 - var9.packetBuffer.writeShort(var3); // L: 9275 - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9276 - Client.packetWriter.addNode(var9); // L: 9277 + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2872, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShort(var3); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); } } else if (var2 == 13) { - var13 = Client.npcs[var3]; // L: 9509 - if (var13 != null) { // L: 9510 - Client.mouseCrossX = var6; // L: 9511 - Client.mouseCrossY = var7; // L: 9512 - Client.mouseCrossColor = 2; // L: 9513 - Client.mouseCrossState = 0; // L: 9514 - Client.destinationX = var0; // L: 9515 - Client.destinationY = var1; // L: 9516 - var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2876, Client.packetWriter.isaacCipher); // L: 9518 - var9.packetBuffer.method7398(var3); // L: 9519 - var9.packetBuffer.method7362(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9520 - Client.packetWriter.addNode(var9); // L: 9521 + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2876, Client.packetWriter.isaacCipher); + var9.packetBuffer.method7398(var3); + var9.packetBuffer.method7362(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); } } else { Player var15; if (var2 == 14) { - var15 = Client.players[var3]; // L: 9536 - if (var15 != null) { // L: 9537 - Client.mouseCrossX = var6; // L: 9538 - Client.mouseCrossY = var7; // L: 9539 - Client.mouseCrossColor = 2; // L: 9540 - Client.mouseCrossState = 0; // L: 9541 - Client.destinationX = var0; // L: 9542 - Client.destinationY = var1; // L: 9543 - var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2864, Client.packetWriter.isaacCipher); // L: 9545 - var9.packetBuffer.method7398(class139.selectedItemId); // L: 9546 - var9.packetBuffer.method7527(MidiPcmStream.selectedItemWidget); // L: 9547 - var9.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9548 - var9.packetBuffer.method7493(Calendar.selectedItemSlot); // L: 9549 - var9.packetBuffer.method7398(var3); // L: 9550 - Client.packetWriter.addNode(var9); // L: 9551 + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2864, Client.packetWriter.isaacCipher); + var9.packetBuffer.method7398(class139.selectedItemId); + var9.packetBuffer.method7527(MidiPcmStream.selectedItemWidget); + var9.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method7493(Calendar.selectedItemSlot); + var9.packetBuffer.method7398(var3); + Client.packetWriter.addNode(var9); } } else if (var2 == 15) { - var15 = Client.players[var3]; // L: 9355 - if (var15 != null) { // L: 9356 - Client.mouseCrossX = var6; // L: 9357 - Client.mouseCrossY = var7; // L: 9358 - Client.mouseCrossColor = 2; // L: 9359 - Client.mouseCrossState = 0; // L: 9360 - Client.destinationX = var0; // L: 9361 - Client.destinationY = var1; // L: 9362 - var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2820, Client.packetWriter.isaacCipher); // L: 9363 - var9.packetBuffer.method7407(class20.selectedSpellWidget); // L: 9364 - var9.packetBuffer.writeShort(Client.field633); // L: 9365 - var9.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9366 - var9.packetBuffer.method7349(var3); // L: 9367 - var9.packetBuffer.method7398(Client.selectedSpellChildIndex); // L: 9368 - Client.packetWriter.addNode(var9); // L: 9369 + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2820, Client.packetWriter.isaacCipher); + var9.packetBuffer.method7407(class20.selectedSpellWidget); + var9.packetBuffer.writeShort(Client.field633); + var9.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method7349(var3); + var9.packetBuffer.method7398(Client.selectedSpellChildIndex); + Client.packetWriter.addNode(var9); } } else if (var2 == 16) { - Client.mouseCrossX = var6; // L: 9038 - Client.mouseCrossY = var7; // L: 9039 - Client.mouseCrossColor = 2; // L: 9040 - Client.mouseCrossState = 0; // L: 9041 - Client.destinationX = var0; // L: 9042 - Client.destinationY = var1; // L: 9043 - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2882, Client.packetWriter.isaacCipher); // L: 9045 - var8.packetBuffer.writeShort(class139.selectedItemId); // L: 9046 - var8.packetBuffer.writeShort(Calendar.selectedItemSlot); // L: 9047 - var8.packetBuffer.writeShort(TileItem.baseY + var1); // L: 9048 - var8.packetBuffer.method7493(var3); // L: 9049 - var8.packetBuffer.method7527(MidiPcmStream.selectedItemWidget); // L: 9050 - var8.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9051 - var8.packetBuffer.method7493(var0 + class131.baseX); // L: 9052 - Client.packetWriter.addNode(var8); // L: 9053 + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2882, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShort(class139.selectedItemId); + var8.packetBuffer.writeShort(Calendar.selectedItemSlot); + var8.packetBuffer.writeShort(TileItem.baseY + var1); + var8.packetBuffer.method7493(var3); + var8.packetBuffer.method7527(MidiPcmStream.selectedItemWidget); + var8.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method7493(var0 + class131.baseX); + Client.packetWriter.addNode(var8); } else if (var2 == 17) { - 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 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2835, Client.packetWriter.isaacCipher); // L: 9195 - var8.packetBuffer.method7398(TileItem.baseY + var1); // L: 9196 - var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 9197 - var8.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9198 - var8.packetBuffer.writeInt(class20.selectedSpellWidget); // L: 9199 - var8.packetBuffer.writeShort(var0 + class131.baseX); // L: 9200 - var8.packetBuffer.method7493(var3); // L: 9201 - var8.packetBuffer.writeShort(Client.field633); // L: 9202 - Client.packetWriter.addNode(var8); // L: 9203 + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2835, Client.packetWriter.isaacCipher); + var8.packetBuffer.method7398(TileItem.baseY + var1); + var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); + var8.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeInt(class20.selectedSpellWidget); + var8.packetBuffer.writeShort(var0 + class131.baseX); + var8.packetBuffer.method7493(var3); + var8.packetBuffer.writeShort(Client.field633); + Client.packetWriter.addNode(var8); } else if (var2 == 18) { - Client.mouseCrossX = var6; // L: 9555 - Client.mouseCrossY = var7; // L: 9556 - Client.mouseCrossColor = 2; // L: 9557 - Client.mouseCrossState = 0; // L: 9558 - Client.destinationX = var0; // L: 9559 - Client.destinationY = var1; // L: 9560 - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2836, Client.packetWriter.isaacCipher); // L: 9562 - var8.packetBuffer.method7398(var0 + class131.baseX); // L: 9563 - var8.packetBuffer.method7349(var3); // L: 9564 - var8.packetBuffer.method7349(TileItem.baseY + var1); // L: 9565 - var8.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9566 - Client.packetWriter.addNode(var8); // L: 9567 + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2836, Client.packetWriter.isaacCipher); + var8.packetBuffer.method7398(var0 + class131.baseX); + var8.packetBuffer.method7349(var3); + var8.packetBuffer.method7349(TileItem.baseY + var1); + var8.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var8); } else if (var2 == 19) { - Client.mouseCrossX = var6; // L: 9716 - Client.mouseCrossY = var7; // L: 9717 - Client.mouseCrossColor = 2; // L: 9718 - Client.mouseCrossState = 0; // L: 9719 - Client.destinationX = var0; // L: 9720 - Client.destinationY = var1; // L: 9721 - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2838, Client.packetWriter.isaacCipher); // L: 9723 - var8.packetBuffer.method7362(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9724 - var8.packetBuffer.method7493(TileItem.baseY + var1); // L: 9725 - var8.packetBuffer.method7493(var3); // L: 9726 - var8.packetBuffer.method7349(var0 + class131.baseX); // L: 9727 - Client.packetWriter.addNode(var8); // L: 9728 + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2838, Client.packetWriter.isaacCipher); + var8.packetBuffer.method7362(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method7493(TileItem.baseY + var1); + var8.packetBuffer.method7493(var3); + var8.packetBuffer.method7349(var0 + class131.baseX); + Client.packetWriter.addNode(var8); } else if (var2 == 20) { - Client.mouseCrossX = var6; // L: 9118 - Client.mouseCrossY = var7; // L: 9119 - Client.mouseCrossColor = 2; // L: 9120 - Client.mouseCrossState = 0; // L: 9121 - Client.destinationX = var0; // L: 9122 - Client.destinationY = var1; // L: 9123 - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2818, Client.packetWriter.isaacCipher); // L: 9125 - var8.packetBuffer.method7493(var0 + class131.baseX); // L: 9126 - var8.packetBuffer.writeShort(var3); // L: 9127 - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9128 - var8.packetBuffer.method7349(TileItem.baseY + var1); // L: 9129 - Client.packetWriter.addNode(var8); // L: 9130 + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2818, Client.packetWriter.isaacCipher); + var8.packetBuffer.method7493(var0 + class131.baseX); + var8.packetBuffer.writeShort(var3); + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method7349(TileItem.baseY + var1); + Client.packetWriter.addNode(var8); } else if (var2 == 21) { - Client.mouseCrossX = var6; // L: 9411 - Client.mouseCrossY = var7; // L: 9412 - Client.mouseCrossColor = 2; // L: 9413 - Client.mouseCrossState = 0; // L: 9414 - Client.destinationX = var0; // L: 9415 - Client.destinationY = var1; // L: 9416 - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2823, Client.packetWriter.isaacCipher); // L: 9418 - var8.packetBuffer.method7349(TileItem.baseY + var1); // L: 9419 - var8.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9420 - var8.packetBuffer.writeShort(var3); // L: 9421 - var8.packetBuffer.method7398(var0 + class131.baseX); // L: 9422 - Client.packetWriter.addNode(var8); // L: 9423 + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2823, Client.packetWriter.isaacCipher); + var8.packetBuffer.method7349(TileItem.baseY + var1); + var8.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeShort(var3); + var8.packetBuffer.method7398(var0 + class131.baseX); + Client.packetWriter.addNode(var8); } else if (var2 == 22) { - Client.mouseCrossX = var6; // L: 9742 - Client.mouseCrossY = var7; // L: 9743 - Client.mouseCrossColor = 2; // L: 9744 - Client.mouseCrossState = 0; // L: 9745 - Client.destinationX = var0; // L: 9746 - Client.destinationY = var1; // L: 9747 - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2868, Client.packetWriter.isaacCipher); // L: 9749 - var8.packetBuffer.method7398(var0 + class131.baseX); // L: 9750 - var8.packetBuffer.method7349(TileItem.baseY + var1); // L: 9751 - var8.packetBuffer.method7398(var3); // L: 9752 - var8.packetBuffer.method7362(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9753 - Client.packetWriter.addNode(var8); // L: 9754 + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2868, Client.packetWriter.isaacCipher); + var8.packetBuffer.method7398(var0 + class131.baseX); + var8.packetBuffer.method7349(TileItem.baseY + var1); + var8.packetBuffer.method7398(var3); + var8.packetBuffer.method7362(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var8); } else if (var2 == 23) { - if (Client.isMenuOpen) { // L: 9642 - class7.scene.setViewportWalking(); // L: 9643 + if (Client.isMenuOpen) { + class7.scene.setViewportWalking(); } else { - class7.scene.menuOpen(class20.Client_plane, var0, var1, true); // L: 9646 + class7.scene.menuOpen(class20.Client_plane, var0, var1, true); } } else { PacketBufferNode var12; Widget var16; if (var2 == 24) { - var16 = ChatChannel.getWidget(var1); // L: 9318 - boolean var11 = true; // L: 9319 - if (var16.contentType > 0) { // L: 9320 + var16 = ChatChannel.getWidget(var1); + boolean var11 = true; + if (var16.contentType > 0) { var11 = class19.method329(var16); } - if (var11) { // L: 9321 - var12 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2842, Client.packetWriter.isaacCipher); // L: 9323 - var12.packetBuffer.writeInt(var1); // L: 9324 - Client.packetWriter.addNode(var12); // L: 9325 + if (var11) { + var12 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2842, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var12); } } else { if (var2 == 25) { - var16 = class126.getWidgetChild(var1, var0); // L: 9801 - if (var16 != null) { // L: 9802 - HealthBar.Widget_runOnTargetLeave(); // L: 9803 - UrlRequest.selectSpell(var1, var0, class404.Widget_unpackTargetMask(class363.getWidgetFlags(var16)), var16.itemId); // L: 9804 - Client.isItemSelected = 0; // L: 9805 - Client.selectedSpellActionName = SecureRandomFuture.Widget_getSpellActionName(var16); // L: 9806 - if (Client.selectedSpellActionName == null) { // L: 9807 + var16 = class126.getWidgetChild(var1, var0); + if (var16 != null) { + HealthBar.Widget_runOnTargetLeave(); + UrlRequest.selectSpell(var1, var0, class404.Widget_unpackTargetMask(class363.getWidgetFlags(var16)), var16.itemId); + Client.isItemSelected = 0; + Client.selectedSpellActionName = SecureRandomFuture.Widget_getSpellActionName(var16); + if (Client.selectedSpellActionName == null) { Client.selectedSpellActionName = "null"; } - if (var16.isIf3) { // L: 9808 + if (var16.isIf3) { Client.selectedSpellName = var16.dataText + UserComparator5.colorStartTag(16777215); } else { - Client.selectedSpellName = UserComparator5.colorStartTag(65280) + var16.spellName + UserComparator5.colorStartTag(16777215); // L: 9809 + Client.selectedSpellName = UserComparator5.colorStartTag(65280) + var16.spellName + UserComparator5.colorStartTag(16777215); } } - return; // L: 9811 + return; } if (var2 == 26) { - class4.method28(); // L: 9133 + class4.method28(); } else { int var10; Widget var14; if (var2 == 28) { - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2842, Client.packetWriter.isaacCipher); // L: 9282 - var8.packetBuffer.writeInt(var1); // L: 9283 - Client.packetWriter.addNode(var8); // L: 9284 - var14 = ChatChannel.getWidget(var1); // L: 9285 - if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 9286 - var10 = var14.cs1Instructions[0][1]; // L: 9287 - Varps.Varps_main[var10] = 1 - Varps.Varps_main[var10]; // L: 9288 - class281.changeGameOptions(var10); // L: 9289 + var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2842, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var8); + var14 = ChatChannel.getWidget(var1); + if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { + var10 = var14.cs1Instructions[0][1]; + Varps.Varps_main[var10] = 1 - Varps.Varps_main[var10]; + class281.changeGameOptions(var10); } } else if (var2 == 29) { - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2842, Client.packetWriter.isaacCipher); // L: 9496 - var8.packetBuffer.writeInt(var1); // L: 9497 - Client.packetWriter.addNode(var8); // L: 9498 - var14 = ChatChannel.getWidget(var1); // L: 9499 - if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 9500 - var10 = var14.cs1Instructions[0][1]; // L: 9501 - if (Varps.Varps_main[var10] != var14.cs1ComparisonValues[0]) { // L: 9502 - Varps.Varps_main[var10] = var14.cs1ComparisonValues[0]; // L: 9503 - class281.changeGameOptions(var10); // L: 9504 + var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2842, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var8); + var14 = ChatChannel.getWidget(var1); + if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { + var10 = var14.cs1Instructions[0][1]; + if (Varps.Varps_main[var10] != var14.cs1ComparisonValues[0]) { + Varps.Varps_main[var10] = var14.cs1ComparisonValues[0]; + class281.changeGameOptions(var10); } } } else if (var2 == 30) { - if (Client.meslayerContinueWidget == null) { // L: 9404 - class288.resumePauseWidget(var1, var0); // L: 9405 - Client.meslayerContinueWidget = class126.getWidgetChild(var1, var0); // L: 9406 - SecureRandomCallable.invalidateWidget(Client.meslayerContinueWidget); // L: 9407 + if (Client.meslayerContinueWidget == null) { + class288.resumePauseWidget(var1, var0); + Client.meslayerContinueWidget = class126.getWidgetChild(var1, var0); + SecureRandomCallable.invalidateWidget(Client.meslayerContinueWidget); } } else if (var2 == 31) { - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2804, Client.packetWriter.isaacCipher); // L: 9294 - var8.packetBuffer.method7349(var0); // L: 9295 - var8.packetBuffer.writeShort(class139.selectedItemId); // L: 9296 - var8.packetBuffer.method7349(var3); // L: 9297 - var8.packetBuffer.writeInt(MidiPcmStream.selectedItemWidget); // L: 9298 - var8.packetBuffer.writeIntME(var1); // L: 9299 - var8.packetBuffer.method7398(Calendar.selectedItemSlot); // L: 9300 - Client.packetWriter.addNode(var8); // L: 9301 - Client.field582 = 0; // L: 9302 - WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); // L: 9303 - Client.field599 = var0; // L: 9304 + var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2804, Client.packetWriter.isaacCipher); + var8.packetBuffer.method7349(var0); + var8.packetBuffer.writeShort(class139.selectedItemId); + var8.packetBuffer.method7349(var3); + var8.packetBuffer.writeInt(MidiPcmStream.selectedItemWidget); + var8.packetBuffer.writeIntME(var1); + var8.packetBuffer.method7398(Calendar.selectedItemSlot); + Client.packetWriter.addNode(var8); + Client.field582 = 0; + WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); + Client.field599 = var0; } else if (var2 == 32) { - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2886, Client.packetWriter.isaacCipher); // L: 9571 - var8.packetBuffer.writeShort(var0); // L: 9572 - var8.packetBuffer.writeIntME(var1); // L: 9573 - var8.packetBuffer.method7493(Client.selectedSpellChildIndex); // L: 9574 - var8.packetBuffer.writeShort(var3); // L: 9575 - var8.packetBuffer.writeInt(class20.selectedSpellWidget); // L: 9576 - Client.packetWriter.addNode(var8); // L: 9577 - Client.field582 = 0; // L: 9578 - WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); // L: 9579 - Client.field599 = var0; // L: 9580 + var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2886, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShort(var0); + var8.packetBuffer.writeIntME(var1); + var8.packetBuffer.method7493(Client.selectedSpellChildIndex); + var8.packetBuffer.writeShort(var3); + var8.packetBuffer.writeInt(class20.selectedSpellWidget); + Client.packetWriter.addNode(var8); + Client.field582 = 0; + WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); + Client.field599 = var0; } else if (var2 == 33) { - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2874, Client.packetWriter.isaacCipher); // L: 9308 - var8.packetBuffer.writeInt(var1); // L: 9309 - var8.packetBuffer.method7349(var0); // L: 9310 - var8.packetBuffer.method7349(var3); // L: 9311 - Client.packetWriter.addNode(var8); // L: 9312 - Client.field582 = 0; // L: 9313 - WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); // L: 9314 - Client.field599 = var0; // L: 9315 + var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2874, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeInt(var1); + var8.packetBuffer.method7349(var0); + var8.packetBuffer.method7349(var3); + Client.packetWriter.addNode(var8); + Client.field582 = 0; + WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); + Client.field599 = var0; } else if (var2 == 34) { - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2833, Client.packetWriter.isaacCipher); // L: 9427 - var8.packetBuffer.method7398(var3); // L: 9428 - var8.packetBuffer.method7398(var0); // L: 9429 - var8.packetBuffer.method7407(var1); // L: 9430 - Client.packetWriter.addNode(var8); // L: 9431 - Client.field582 = 0; // L: 9432 - WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); // L: 9433 - Client.field599 = var0; // L: 9434 + var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2833, Client.packetWriter.isaacCipher); + var8.packetBuffer.method7398(var3); + var8.packetBuffer.method7398(var0); + var8.packetBuffer.method7407(var1); + Client.packetWriter.addNode(var8); + Client.field582 = 0; + WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); + Client.field599 = var0; } else if (var2 == 35) { - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2817, Client.packetWriter.isaacCipher); // L: 9485 - var8.packetBuffer.method7349(var0); // L: 9486 - var8.packetBuffer.method7349(var3); // L: 9487 - var8.packetBuffer.writeInt(var1); // L: 9488 - Client.packetWriter.addNode(var8); // L: 9489 - Client.field582 = 0; // L: 9490 - WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); // L: 9491 - Client.field599 = var0; // L: 9492 + var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2817, Client.packetWriter.isaacCipher); + var8.packetBuffer.method7349(var0); + var8.packetBuffer.method7349(var3); + var8.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var8); + Client.field582 = 0; + WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); + Client.field599 = var0; } else if (var2 == 36) { - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2847, Client.packetWriter.isaacCipher); // L: 9164 - var8.packetBuffer.method7527(var1); // L: 9165 - var8.packetBuffer.method7349(var0); // L: 9166 - var8.packetBuffer.method7398(var3); // L: 9167 - Client.packetWriter.addNode(var8); // L: 9168 - Client.field582 = 0; // L: 9169 - WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); // L: 9170 - Client.field599 = var0; // L: 9171 + var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2847, Client.packetWriter.isaacCipher); + var8.packetBuffer.method7527(var1); + var8.packetBuffer.method7349(var0); + var8.packetBuffer.method7398(var3); + Client.packetWriter.addNode(var8); + Client.field582 = 0; + WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); + Client.field599 = var0; } else if (var2 == 37) { - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2802, Client.packetWriter.isaacCipher); // L: 9345 - var8.packetBuffer.writeIntME(var1); // L: 9346 - var8.packetBuffer.method7493(var0); // L: 9347 - var8.packetBuffer.writeShort(var3); // L: 9348 - Client.packetWriter.addNode(var8); // L: 9349 - Client.field582 = 0; // L: 9350 - WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); // L: 9351 - Client.field599 = var0; // L: 9352 + var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2802, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(var1); + var8.packetBuffer.method7493(var0); + var8.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var8); + Client.field582 = 0; + WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); + Client.field599 = var0; } else { if (var2 == 38) { - HealthBar.Widget_runOnTargetLeave(); // L: 9599 - var16 = ChatChannel.getWidget(var1); // L: 9600 - Client.isItemSelected = 1; // L: 9601 - Calendar.selectedItemSlot = var0; // L: 9602 - MidiPcmStream.selectedItemWidget = var1; // L: 9603 - class139.selectedItemId = var3; // L: 9604 - SecureRandomCallable.invalidateWidget(var16); // L: 9605 - Client.selectedItemName = UserComparator5.colorStartTag(16748608) + UserComparator6.ItemDefinition_get(var3).name + UserComparator5.colorStartTag(16777215); // L: 9606 - if (Client.selectedItemName == null) { // L: 9607 + HealthBar.Widget_runOnTargetLeave(); + var16 = ChatChannel.getWidget(var1); + Client.isItemSelected = 1; + Calendar.selectedItemSlot = var0; + MidiPcmStream.selectedItemWidget = var1; + class139.selectedItemId = var3; + SecureRandomCallable.invalidateWidget(var16); + Client.selectedItemName = UserComparator5.colorStartTag(16748608) + UserComparator6.ItemDefinition_get(var3).name + UserComparator5.colorStartTag(16777215); + if (Client.selectedItemName == null) { Client.selectedItemName = "null"; } - return; // L: 9608 + return; } if (var2 == 39) { - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2844, Client.packetWriter.isaacCipher); // L: 9526 - var8.packetBuffer.writeIntME(var1); // L: 9527 - var8.packetBuffer.method7493(var0); // L: 9528 - var8.packetBuffer.writeShort(var3); // L: 9529 - Client.packetWriter.addNode(var8); // L: 9530 - Client.field582 = 0; // L: 9531 - WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); // L: 9532 - Client.field599 = var0; // L: 9533 + var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2844, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(var1); + var8.packetBuffer.method7493(var0); + var8.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var8); + Client.field582 = 0; + WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); + Client.field599 = var0; } else if (var2 == 40) { - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2871, Client.packetWriter.isaacCipher); // L: 9732 - var8.packetBuffer.writeInt(var1); // L: 9733 - var8.packetBuffer.method7493(var3); // L: 9734 - var8.packetBuffer.method7493(var0); // L: 9735 - Client.packetWriter.addNode(var8); // L: 9736 - Client.field582 = 0; // L: 9737 - WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); // L: 9738 - Client.field599 = var0; // L: 9739 + var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2871, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeInt(var1); + var8.packetBuffer.method7493(var3); + var8.packetBuffer.method7493(var0); + Client.packetWriter.addNode(var8); + Client.field582 = 0; + WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); + Client.field599 = var0; } else if (var2 == 41) { - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2810, Client.packetWriter.isaacCipher); // L: 9758 - var8.packetBuffer.method7398(var3); // L: 9759 - var8.packetBuffer.writeInt(var1); // L: 9760 - var8.packetBuffer.method7398(var0); // L: 9761 - Client.packetWriter.addNode(var8); // L: 9762 - Client.field582 = 0; // L: 9763 - WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); // L: 9764 - Client.field599 = var0; // L: 9765 + var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2810, Client.packetWriter.isaacCipher); + var8.packetBuffer.method7398(var3); + var8.packetBuffer.writeInt(var1); + var8.packetBuffer.method7398(var0); + Client.packetWriter.addNode(var8); + Client.field582 = 0; + WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); + Client.field599 = var0; } else if (var2 == 42) { - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2803, Client.packetWriter.isaacCipher); // L: 9137 - var8.packetBuffer.method7493(var0); // L: 9138 - var8.packetBuffer.writeIntME(var1); // L: 9139 - var8.packetBuffer.method7398(var3); // L: 9140 - Client.packetWriter.addNode(var8); // L: 9141 - Client.field582 = 0; // L: 9142 - WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); // L: 9143 - Client.field599 = var0; // L: 9144 + var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2803, Client.packetWriter.isaacCipher); + var8.packetBuffer.method7493(var0); + var8.packetBuffer.writeIntME(var1); + var8.packetBuffer.method7398(var3); + Client.packetWriter.addNode(var8); + Client.field582 = 0; + WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); + Client.field599 = var0; } else if (var2 == 43) { - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2843, Client.packetWriter.isaacCipher); // L: 9108 - var8.packetBuffer.writeInt(var1); // L: 9109 - var8.packetBuffer.writeShort(var0); // L: 9110 - var8.packetBuffer.writeShort(var3); // L: 9111 - Client.packetWriter.addNode(var8); // L: 9112 - Client.field582 = 0; // L: 9113 - WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); // L: 9114 - Client.field599 = var0; // L: 9115 + var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2843, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeInt(var1); + var8.packetBuffer.writeShort(var0); + var8.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var8); + Client.field582 = 0; + WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); + Client.field599 = var0; } else if (var2 == 44) { - var15 = Client.players[var3]; // L: 9072 - if (var15 != null) { // L: 9073 - Client.mouseCrossX = var6; // L: 9074 - Client.mouseCrossY = var7; // L: 9075 - Client.mouseCrossColor = 2; // L: 9076 - Client.mouseCrossState = 0; // L: 9077 - Client.destinationX = var0; // L: 9078 - Client.destinationY = var1; // L: 9079 - var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2887, Client.packetWriter.isaacCipher); // L: 9081 - var9.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9082 - var9.packetBuffer.method7398(var3); // L: 9083 - Client.packetWriter.addNode(var9); // L: 9084 + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2887, Client.packetWriter.isaacCipher); + var9.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method7398(var3); + Client.packetWriter.addNode(var9); } } else if (var2 == 45) { - var15 = Client.players[var3]; // L: 9373 - if (var15 != null) { // L: 9374 - Client.mouseCrossX = var6; // L: 9375 - Client.mouseCrossY = var7; // L: 9376 - Client.mouseCrossColor = 2; // L: 9377 - Client.mouseCrossState = 0; // L: 9378 - Client.destinationX = var0; // L: 9379 - Client.destinationY = var1; // L: 9380 - var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2813, Client.packetWriter.isaacCipher); // L: 9382 - var9.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9383 - var9.packetBuffer.method7493(var3); // L: 9384 - Client.packetWriter.addNode(var9); // L: 9385 + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2813, Client.packetWriter.isaacCipher); + var9.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method7493(var3); + Client.packetWriter.addNode(var9); } } else if (var2 == 46) { - var15 = Client.players[var3]; // L: 9583 - if (var15 != null) { // L: 9584 - Client.mouseCrossX = var6; // L: 9585 - Client.mouseCrossY = var7; // L: 9586 - Client.mouseCrossColor = 2; // L: 9587 - Client.mouseCrossState = 0; // L: 9588 - Client.destinationX = var0; // L: 9589 - Client.destinationY = var1; // L: 9590 - var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2827, Client.packetWriter.isaacCipher); // L: 9592 - var9.packetBuffer.method7398(var3); // L: 9593 - var9.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9594 - Client.packetWriter.addNode(var9); // L: 9595 + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2827, Client.packetWriter.isaacCipher); + var9.packetBuffer.method7398(var3); + var9.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); } } else if (var2 == 47) { - var15 = Client.players[var3]; // L: 9468 - if (var15 != null) { // L: 9469 - Client.mouseCrossX = var6; // L: 9470 - Client.mouseCrossY = var7; // L: 9471 - Client.mouseCrossColor = 2; // L: 9472 - Client.mouseCrossState = 0; // L: 9473 - Client.destinationX = var0; // L: 9474 - Client.destinationY = var1; // L: 9475 - var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2807, Client.packetWriter.isaacCipher); // L: 9477 - var9.packetBuffer.method7349(var3); // L: 9478 - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9479 - Client.packetWriter.addNode(var9); // L: 9480 + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2807, Client.packetWriter.isaacCipher); + var9.packetBuffer.method7349(var3); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); } } else if (var2 == 48) { - var15 = Client.players[var3]; // L: 9147 - if (var15 != null) { // L: 9148 - Client.mouseCrossX = var6; // L: 9149 - Client.mouseCrossY = var7; // L: 9150 - Client.mouseCrossColor = 2; // L: 9151 - Client.mouseCrossState = 0; // L: 9152 - Client.destinationX = var0; // L: 9153 - Client.destinationY = var1; // L: 9154 - var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2892, Client.packetWriter.isaacCipher); // L: 9156 - var9.packetBuffer.writeShort(var3); // L: 9157 - var9.packetBuffer.method7362(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9158 - Client.packetWriter.addNode(var9); // L: 9159 + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2892, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShort(var3); + var9.packetBuffer.method7362(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); } } else if (var2 == 49) { - var15 = Client.players[var3]; // L: 9056 - if (var15 != null) { // L: 9057 - Client.mouseCrossX = var6; // L: 9058 - Client.mouseCrossY = var7; // L: 9059 - Client.mouseCrossColor = 2; // L: 9060 - Client.mouseCrossState = 0; // L: 9061 - Client.destinationX = var0; // L: 9062 - Client.destinationY = var1; // L: 9063 - var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2863, Client.packetWriter.isaacCipher); // L: 9065 - var9.packetBuffer.method7390(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9066 - var9.packetBuffer.method7398(var3); // L: 9067 - Client.packetWriter.addNode(var9); // L: 9068 + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2863, Client.packetWriter.isaacCipher); + var9.packetBuffer.method7390(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method7398(var3); + Client.packetWriter.addNode(var9); } } else if (var2 == 50) { - var15 = Client.players[var3]; // L: 9223 - if (var15 != null) { // L: 9224 - Client.mouseCrossX = var6; // L: 9225 - Client.mouseCrossY = var7; // L: 9226 - Client.mouseCrossColor = 2; // L: 9227 - Client.mouseCrossState = 0; // L: 9228 - Client.destinationX = var0; // L: 9229 - Client.destinationY = var1; // L: 9230 - var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2906, Client.packetWriter.isaacCipher); // L: 9232 - var9.packetBuffer.method7362(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9233 - var9.packetBuffer.method7493(var3); // L: 9234 - Client.packetWriter.addNode(var9); // L: 9235 + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2906, Client.packetWriter.isaacCipher); + var9.packetBuffer.method7362(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method7493(var3); + Client.packetWriter.addNode(var9); } } else if (var2 == 51) { - var15 = Client.players[var3]; // L: 9022 - if (var15 != null) { // L: 9023 - Client.mouseCrossX = var6; // L: 9024 - Client.mouseCrossY = var7; // L: 9025 - Client.mouseCrossColor = 2; // L: 9026 - Client.mouseCrossState = 0; // L: 9027 - Client.destinationX = var0; // L: 9028 - Client.destinationY = var1; // L: 9029 - var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2885, Client.packetWriter.isaacCipher); // L: 9031 - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9032 - var9.packetBuffer.method7398(var3); // L: 9033 - Client.packetWriter.addNode(var9); // L: 9034 + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2885, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method7398(var3); + Client.packetWriter.addNode(var9); } - } else if (var2 != 57 && var2 != 1007) { + } else if (var2 != 1007 && var2 != 57) { if (var2 == 58) { - var16 = class126.getWidgetChild(var1, var0); // L: 9650 - if (var16 != null) { // L: 9651 - var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2809, Client.packetWriter.isaacCipher); // L: 9653 - var9.packetBuffer.writeShort(var16.itemId); // L: 9654 - var9.packetBuffer.method7527(var1); // L: 9655 - var9.packetBuffer.method7493(Client.selectedSpellChildIndex); // L: 9656 - var9.packetBuffer.method7398(var0); // L: 9657 - var9.packetBuffer.writeIntME(class20.selectedSpellWidget); // L: 9658 - var9.packetBuffer.writeShort(Client.field633); // L: 9659 - Client.packetWriter.addNode(var9); // L: 9660 + var16 = class126.getWidgetChild(var1, var0); + if (var16 != null) { + var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2809, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShort(var16.itemId); + var9.packetBuffer.method7527(var1); + var9.packetBuffer.method7493(Client.selectedSpellChildIndex); + var9.packetBuffer.method7398(var0); + var9.packetBuffer.writeIntME(class20.selectedSpellWidget); + var9.packetBuffer.writeShort(Client.field633); + Client.packetWriter.addNode(var9); } } else if (var2 == 1001) { - Client.mouseCrossX = var6; // L: 9174 - Client.mouseCrossY = var7; // L: 9175 - Client.mouseCrossColor = 2; // L: 9176 - Client.mouseCrossState = 0; // L: 9177 - Client.destinationX = var0; // L: 9178 - Client.destinationY = var1; // L: 9179 - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2826, Client.packetWriter.isaacCipher); // L: 9181 - var8.packetBuffer.method7398(TileItem.baseY + var1); // L: 9182 - var8.packetBuffer.method7390(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9183 - var8.packetBuffer.method7493(var0 + class131.baseX); // L: 9184 - var8.packetBuffer.method7349(var3); // L: 9185 - Client.packetWriter.addNode(var8); // L: 9186 + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2826, Client.packetWriter.isaacCipher); + var8.packetBuffer.method7398(TileItem.baseY + var1); + var8.packetBuffer.method7390(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method7493(var0 + class131.baseX); + var8.packetBuffer.method7349(var3); + Client.packetWriter.addNode(var8); } else if (var2 == 1002) { - Client.mouseCrossX = var6; // L: 9255 - Client.mouseCrossY = var7; // L: 9256 - Client.mouseCrossColor = 2; // L: 9257 - Client.mouseCrossState = 0; // L: 9258 - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2815, Client.packetWriter.isaacCipher); // L: 9260 - var8.packetBuffer.method7349(var3); // L: 9261 - Client.packetWriter.addNode(var8); // L: 9262 + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2815, Client.packetWriter.isaacCipher); + var8.packetBuffer.method7349(var3); + Client.packetWriter.addNode(var8); } else if (var2 == 1003) { - Client.mouseCrossX = var6; // L: 9784 - Client.mouseCrossY = var7; // L: 9785 - Client.mouseCrossColor = 2; // L: 9786 - Client.mouseCrossState = 0; // L: 9787 - var13 = Client.npcs[var3]; // L: 9788 - if (var13 != null) { // L: 9789 - NPCComposition var17 = var13.definition; // L: 9790 - if (var17.transforms != null) { // L: 9791 + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + var13 = Client.npcs[var3]; + if (var13 != null) { + NPCComposition var17 = var13.definition; + if (var17.transforms != null) { var17 = var17.transform(); } - if (var17 != null) { // L: 9792 - var12 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2829, Client.packetWriter.isaacCipher); // L: 9794 - var12.packetBuffer.method7398(var17.id); // L: 9795 - Client.packetWriter.addNode(var12); // L: 9796 + if (var17 != null) { + var12 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2829, Client.packetWriter.isaacCipher); + var12.packetBuffer.method7398(var17.id); + Client.packetWriter.addNode(var12); } } } else if (var2 == 1004) { - Client.mouseCrossX = var6; // L: 9440 - Client.mouseCrossY = var7; // L: 9441 - Client.mouseCrossColor = 2; // L: 9442 - Client.mouseCrossState = 0; // L: 9443 - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2902, Client.packetWriter.isaacCipher); // L: 9445 - var8.packetBuffer.method7398(var3); // L: 9446 - Client.packetWriter.addNode(var8); // L: 9447 + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2902, Client.packetWriter.isaacCipher); + var8.packetBuffer.method7398(var3); + Client.packetWriter.addNode(var8); } else if (var2 == 1005) { - var16 = ChatChannel.getWidget(var1); // L: 9679 - if (var16 != null && var16.itemQuantities[var0] >= 100000) { // L: 9680 + var16 = ChatChannel.getWidget(var1); + if (var16 != null && var16.itemQuantities[var0] >= 100000) { class194.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + UserComparator6.ItemDefinition_get(var3).name); } else { - var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2902, Client.packetWriter.isaacCipher); // L: 9683 - var9.packetBuffer.method7398(var3); // L: 9684 - Client.packetWriter.addNode(var9); // L: 9685 + var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2902, Client.packetWriter.isaacCipher); + var9.packetBuffer.method7398(var3); + Client.packetWriter.addNode(var9); } - Client.field582 = 0; // L: 9687 - WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); // L: 9688 - Client.field599 = var0; // L: 9689 - } else if (var2 == 1010 || var2 == 1011 || var2 == 1009 || var2 == 1012 || var2 == 1008) { - Varcs.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); // L: 9437 + Client.field582 = 0; + WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); + Client.field599 = var0; + } else if (var2 == 1009 || var2 == 1008 || var2 == 1011 || var2 == 1010 || var2 == 1012) { + Varcs.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); } } else { - var16 = class126.getWidgetChild(var1, var0); // L: 9710 - if (var16 != null) { // L: 9711 - SoundCache.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); // L: 9712 + var16 = class126.getWidgetChild(var1, var0); + if (var16 != null) { + SoundCache.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); } } } @@ -1001,20 +1001,20 @@ public class Decimator { } } - if (Client.isItemSelected != 0) { // L: 9813 - Client.isItemSelected = 0; // L: 9814 - SecureRandomCallable.invalidateWidget(ChatChannel.getWidget(MidiPcmStream.selectedItemWidget)); // L: 9815 + if (Client.isItemSelected != 0) { + Client.isItemSelected = 0; + SecureRandomCallable.invalidateWidget(ChatChannel.getWidget(MidiPcmStream.selectedItemWidget)); } - if (Client.isSpellSelected) { // L: 9817 + if (Client.isSpellSelected) { HealthBar.Widget_runOnTargetLeave(); } - if (WorldMapDecoration.field2722 != null && Client.field582 == 0) { // L: 9818 + if (WorldMapDecoration.field2722 != null && Client.field582 == 0) { SecureRandomCallable.invalidateWidget(WorldMapDecoration.field2722); } - } // L: 9819 + } @ObfuscatedName("ly") @ObfuscatedSignature( @@ -1022,11 +1022,11 @@ public class Decimator { garbageValue = "-66" ) static void method1082(Buffer var0) { - if (Client.randomDatData != null) { // L: 12661 - var0.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); // L: 12662 + if (Client.randomDatData != null) { + var0.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); } else { - byte[] var1 = class118.method2684(); // L: 12665 - var0.writeBytes(var1, 0, var1.length); // L: 12666 + byte[] var1 = class118.method2684(); + var0.writeBytes(var1, 0, var1.length); } - } // L: 12663 12667 + } } diff --git a/runescape-client/src/main/java/DefaultsGroup.java b/runescape-client/src/main/java/DefaultsGroup.java index 4d6089c95d..e7875000c9 100644 --- a/runescape-client/src/main/java/DefaultsGroup.java +++ b/runescape-client/src/main/java/DefaultsGroup.java @@ -20,12 +20,12 @@ public class DefaultsGroup { final int group; static { - field4160 = new DefaultsGroup(3); // L: 4 + field4160 = new DefaultsGroup(3); } DefaultsGroup(int var1) { - this.group = var1; // L: 8 - } // L: 9 + this.group = var1; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -33,122 +33,122 @@ public class DefaultsGroup { garbageValue = "9766" ) static void method6568(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { - if (DirectByteArrayCopier.clearLoginScreen) { // L: 167 - if (var3 == 4) { // L: 168 - PlayerType.method5521(4); // L: 169 + if (DirectByteArrayCopier.clearLoginScreen) { + if (var3 == 4) { + PlayerType.method5521(4); } } else { - if (var3 == 0) { // L: 173 - class185.method3731(var2); // L: 174 + if (var3 == 0) { + class185.method3731(var2); } else { - PlayerType.method5521(var3); // L: 177 + PlayerType.method5521(var3); } - Rasterizer2D.Rasterizer2D_clear(); // L: 179 - byte[] var4 = var0.takeFileByNames("title.jpg", ""); // L: 180 - WorldMapCacheName.leftTitleSprite = MouseRecorder.method2161(var4); // L: 181 - NPC.rightTitleSprite = WorldMapCacheName.leftTitleSprite.mirrorHorizontally(); // L: 182 - int var5 = Client.worldProperties; // L: 183 - if ((var5 & 536870912) != 0) { // L: 185 - Login.logoSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); // L: 186 - } else if ((var5 & 1073741824) != 0) { // L: 188 - Login.logoSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); // L: 189 + Rasterizer2D.Rasterizer2D_clear(); + byte[] var4 = var0.takeFileByNames("title.jpg", ""); + WorldMapCacheName.leftTitleSprite = MouseRecorder.method2161(var4); + NPC.rightTitleSprite = WorldMapCacheName.leftTitleSprite.mirrorHorizontally(); + int var5 = Client.worldProperties; + if ((var5 & 536870912) != 0) { + Login.logoSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); + } else if ((var5 & 1073741824) != 0) { + Login.logoSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); } else { - Login.logoSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); // L: 192 + Login.logoSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); } - AbstractByteArrayCopier.titleboxSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); // L: 195 - class19.titlebuttonSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); // L: 196 - Login.field894 = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_large", ""); // L: 197 - Login.field864 = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "play_now_text", ""); // L: 198 - ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_wide42,1", ""); // L: 199 - int var7 = var1.getGroupId("runes"); // L: 202 - int var8 = var1.getFileId(var7, ""); // L: 203 + AbstractByteArrayCopier.titleboxSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); + class19.titlebuttonSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); + Login.field894 = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_large", ""); + Login.field864 = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "play_now_text", ""); + ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_wide42,1", ""); + int var7 = var1.getGroupId("runes"); + int var8 = var1.getFileId(var7, ""); IndexedSprite[] var9; - if (!class147.method3009(var1, var7, var8)) { // L: 206 - var9 = null; // L: 207 + if (!class147.method3009(var1, var7, var8)) { + var9 = null; } else { - IndexedSprite[] var11 = new IndexedSprite[class440.SpriteBuffer_spriteCount]; // L: 212 + IndexedSprite[] var11 = new IndexedSprite[class440.SpriteBuffer_spriteCount]; - for (int var12 = 0; var12 < class440.SpriteBuffer_spriteCount; ++var12) { // L: 213 - IndexedSprite var13 = var11[var12] = new IndexedSprite(); // L: 214 - var13.width = class432.SpriteBuffer_spriteWidth; // L: 215 - var13.height = class432.SpriteBuffer_spriteHeight; // L: 216 - var13.xOffset = class141.SpriteBuffer_xOffsets[var12]; // L: 217 - var13.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var12]; // L: 218 - var13.subWidth = class432.SpriteBuffer_spriteWidths[var12]; // L: 219 - var13.subHeight = class330.SpriteBuffer_spriteHeights[var12]; // L: 220 - var13.palette = class432.SpriteBuffer_spritePalette; // L: 221 - var13.pixels = class369.SpriteBuffer_pixels[var12]; // L: 222 + for (int var12 = 0; var12 < class440.SpriteBuffer_spriteCount; ++var12) { + IndexedSprite var13 = var11[var12] = new IndexedSprite(); + var13.width = class432.SpriteBuffer_spriteWidth; + var13.height = class432.SpriteBuffer_spriteHeight; + var13.xOffset = class141.SpriteBuffer_xOffsets[var12]; + var13.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var12]; + var13.subWidth = class432.SpriteBuffer_spriteWidths[var12]; + var13.subHeight = class330.SpriteBuffer_spriteHeights[var12]; + var13.palette = class432.SpriteBuffer_spritePalette; + var13.pixels = class369.SpriteBuffer_pixels[var12]; } - UserComparator3.method2529(); // L: 224 - var9 = var11; // L: 227 + UserComparator3.method2529(); + var9 = var11; } - Login.runesSprite = var9; // L: 231 - var8 = var1.getGroupId("title_mute"); // L: 234 - int var15 = var1.getFileId(var8, ""); // L: 235 + Login.runesSprite = var9; + var8 = var1.getGroupId("title_mute"); + int var15 = var1.getFileId(var8, ""); IndexedSprite[] var10; - if (!class147.method3009(var1, var8, var15)) { // L: 238 - var10 = null; // L: 239 + if (!class147.method3009(var1, var8, var15)) { + var10 = null; } else { - IndexedSprite[] var16 = new IndexedSprite[class440.SpriteBuffer_spriteCount]; // L: 244 + IndexedSprite[] var16 = new IndexedSprite[class440.SpriteBuffer_spriteCount]; - for (int var17 = 0; var17 < class440.SpriteBuffer_spriteCount; ++var17) { // L: 245 - IndexedSprite var14 = var16[var17] = new IndexedSprite(); // L: 246 - var14.width = class432.SpriteBuffer_spriteWidth; // L: 247 - var14.height = class432.SpriteBuffer_spriteHeight; // L: 248 - var14.xOffset = class141.SpriteBuffer_xOffsets[var17]; // L: 249 - var14.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var17]; // L: 250 - var14.subWidth = class432.SpriteBuffer_spriteWidths[var17]; // L: 251 - var14.subHeight = class330.SpriteBuffer_spriteHeights[var17]; // L: 252 - var14.palette = class432.SpriteBuffer_spritePalette; // L: 253 - var14.pixels = class369.SpriteBuffer_pixels[var17]; // L: 254 + for (int var17 = 0; var17 < class440.SpriteBuffer_spriteCount; ++var17) { + IndexedSprite var14 = var16[var17] = new IndexedSprite(); + var14.width = class432.SpriteBuffer_spriteWidth; + var14.height = class432.SpriteBuffer_spriteHeight; + var14.xOffset = class141.SpriteBuffer_xOffsets[var17]; + var14.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var17]; + var14.subWidth = class432.SpriteBuffer_spriteWidths[var17]; + var14.subHeight = class330.SpriteBuffer_spriteHeights[var17]; + var14.palette = class432.SpriteBuffer_spritePalette; + var14.pixels = class369.SpriteBuffer_pixels[var17]; } - UserComparator3.method2529(); // L: 256 - var10 = var16; // L: 259 + UserComparator3.method2529(); + var10 = var16; } - Login.title_muteSprite = var10; // L: 263 - KeyHandler.options_buttons_0Sprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); // L: 264 - UserComparator9.field1336 = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); // L: 265 - LoginType.options_buttons_2Sprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); // L: 266 - Login.field888 = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); // L: 267 - class315.field3918 = KeyHandler.options_buttons_0Sprite.subWidth; // L: 268 - Huffman.field3152 = KeyHandler.options_buttons_0Sprite.subHeight; // L: 269 - Client.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite); // L: 270 - if (var2) { // L: 271 - Login.Login_username = ""; // L: 272 - Login.Login_password = ""; // L: 273 + Login.title_muteSprite = var10; + KeyHandler.options_buttons_0Sprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); + UserComparator9.field1336 = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); + LoginType.options_buttons_2Sprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); + Login.field888 = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); + class315.field3918 = KeyHandler.options_buttons_0Sprite.subWidth; + Huffman.field3152 = KeyHandler.options_buttons_0Sprite.subHeight; + Client.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite); + if (var2) { + Login.Login_username = ""; + Login.Login_password = ""; } - class148.field1651 = 0; // L: 275 - BufferedSource.otp = ""; // L: 276 - Login.field882 = true; // L: 277 - Login.worldSelectOpen = false; // L: 278 - if (!SecureRandomFuture.clientPreferences.titleMusicDisabled) { // L: 279 + class148.field1651 = 0; + BufferedSource.otp = ""; + Login.field882 = true; + Login.worldSelectOpen = false; + if (!SecureRandomFuture.clientPreferences.titleMusicDisabled) { Script.method2040(2, WorldMapScaleHandler.archive6, "scape main", "", 255, false); } else { - class260.musicPlayerStatus = 1; // L: 281 - class124.musicTrackArchive = null; // L: 282 - VarcInt.musicTrackGroupId = -1; // L: 283 - class260.musicTrackFileId = -1; // L: 284 - ChatChannel.musicTrackVolume = 0; // L: 285 - DynamicObject.musicTrackBoolean = false; // L: 286 - class260.pcmSampleLength = 2; // L: 287 + class260.musicPlayerStatus = 1; + class124.musicTrackArchive = null; + VarcInt.musicTrackGroupId = -1; + class260.musicTrackFileId = -1; + ChatChannel.musicTrackVolume = 0; + DynamicObject.musicTrackBoolean = false; + class260.pcmSampleLength = 2; } - ClientPreferences.method2297(false); // L: 289 - DirectByteArrayCopier.clearLoginScreen = true; // L: 290 - Login.xPadding = (class186.canvasWidth - 765) / 2; // L: 291 - Login.loginBoxX = Login.xPadding + 202; // L: 292 - class138.loginBoxCenter = Login.loginBoxX + 180; // L: 293 - WorldMapCacheName.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 294 - NPC.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 295 - Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); // L: 296 + ClientPreferences.method2297(false); + DirectByteArrayCopier.clearLoginScreen = true; + Login.xPadding = (class186.canvasWidth - 765) / 2; + Login.loginBoxX = Login.xPadding + 202; + class138.loginBoxCenter = Login.loginBoxX + 180; + WorldMapCacheName.leftTitleSprite.drawAt(Login.xPadding, 0); + NPC.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); } - } // L: 171 297 + } } diff --git a/runescape-client/src/main/java/DemotingHashTable.java b/runescape-client/src/main/java/DemotingHashTable.java index 57b7d9f4a5..8a7729bea0 100644 --- a/runescape-client/src/main/java/DemotingHashTable.java +++ b/runescape-client/src/main/java/DemotingHashTable.java @@ -31,48 +31,48 @@ public final class DemotingHashTable { class245 field2793; public DemotingHashTable(int var1, int var2) { - this.queue = new IterableDualNodeQueue(); // L: 11 - this.capacity = var1; // L: 19 - this.remaining = var1; // L: 20 + this.queue = new IterableDualNodeQueue(); + this.capacity = var1; + this.remaining = var1; int var3; - for (var3 = 1; var3 + var3 < var1 && var3 < var2; var3 += var3) { // L: 21 22 + for (var3 = 1; var3 + var3 < var1 && var3 < var2; var3 += var3) { } - this.hashTable = new IterableNodeHashTable(var3); // L: 23 - } // L: 24 + this.hashTable = new IterableNodeHashTable(var3); + } public DemotingHashTable(int var1) { - this(var1, var1); // L: 15 - } // L: 16 + this(var1, var1); + } @ObfuscatedName("c") @Export("get") public Object get(long var1) { - Wrapper var3 = (Wrapper)this.hashTable.get(var1); // L: 27 - if (var3 == null) { // L: 28 + Wrapper var3 = (Wrapper)this.hashTable.get(var1); + if (var3 == null) { return null; } else { - Object var4 = var3.get(); // L: 29 - if (var4 == null) { // L: 30 - var3.remove(); // L: 31 - var3.removeDual(); // L: 32 - this.remaining += var3.size; // L: 33 - return null; // L: 34 + Object var4 = var3.get(); + if (var4 == null) { + var3.remove(); + var3.removeDual(); + this.remaining += var3.size; + return null; } else { - if (var3.isSoft()) { // L: 36 - DirectWrapper var5 = new DirectWrapper(var4, var3.size); // L: 37 - this.hashTable.put(var5, var3.key); // L: 38 - this.queue.add(var5); // L: 39 - var5.keyDual = 0L; // L: 40 - var3.remove(); // L: 41 - var3.removeDual(); // L: 42 + if (var3.isSoft()) { + DirectWrapper var5 = new DirectWrapper(var4, var3.size); + this.hashTable.put(var5, var3.key); + this.queue.add(var5); + var5.keyDual = 0L; + var3.remove(); + var3.removeDual(); } else { - this.queue.add(var3); // L: 45 - var3.keyDual = 0L; // L: 46 + this.queue.add(var3); + var3.keyDual = 0L; } - return var4; // L: 48 + return var4; } } } @@ -80,9 +80,9 @@ public final class DemotingHashTable { @ObfuscatedName("b") @Export("remove") void remove(long var1) { - Wrapper var3 = (Wrapper)this.hashTable.get(var1); // L: 52 - this.removeWrapper(var3); // L: 53 - } // L: 54 + Wrapper var3 = (Wrapper)this.hashTable.get(var1); + this.removeWrapper(var3); + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -90,76 +90,76 @@ public final class DemotingHashTable { ) @Export("removeWrapper") void removeWrapper(Wrapper var1) { - if (var1 != null) { // L: 57 - var1.remove(); // L: 58 - var1.removeDual(); // L: 59 - this.remaining += var1.size; // L: 60 + if (var1 != null) { + var1.remove(); + var1.removeDual(); + this.remaining += var1.size; } - } // L: 62 + } @ObfuscatedName("m") public void method4958(Object var1, long var2) { - this.put(var1, var2, 1); // L: 65 - } // L: 66 + this.put(var1, var2, 1); + } @ObfuscatedName("t") @Export("put") public void put(Object var1, long var2, int var4) { - if (var4 > this.capacity) { // L: 69 + if (var4 > this.capacity) { throw new IllegalStateException(); } else { - this.remove(var2); // L: 70 - this.remaining -= var4; // L: 71 + this.remove(var2); + this.remaining -= var4; - while (this.remaining < 0) { // L: 72 - Wrapper var5 = (Wrapper)this.queue.removeLast(); // L: 73 - if (var5 == null) { // L: 74 - throw new RuntimeException(""); // L: 75 + while (this.remaining < 0) { + Wrapper var5 = (Wrapper)this.queue.removeLast(); + if (var5 == null) { + throw new RuntimeException(""); } - if (!var5.isSoft()) { // L: 77 + if (!var5.isSoft()) { } - this.removeWrapper(var5); // L: 78 - if (this.field2793 != null) { // L: 79 - this.field2793.method4944(var5.get()); // L: 80 + this.removeWrapper(var5); + if (this.field2793 != null) { + this.field2793.method4944(var5.get()); } } - DirectWrapper var6 = new DirectWrapper(var1, var4); // L: 83 - this.hashTable.put(var6, var2); // L: 84 - this.queue.add(var6); // L: 85 - var6.keyDual = 0L; // L: 86 + DirectWrapper var6 = new DirectWrapper(var1, var4); + this.hashTable.put(var6, var2); + this.queue.add(var6); + var6.keyDual = 0L; } - } // L: 87 + } @ObfuscatedName("s") @Export("demote") public void demote(int var1) { - for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) { // L: 90 - if (var2.isSoft()) { // L: 91 - if (var2.get() == null) { // L: 92 - var2.remove(); // L: 93 - var2.removeDual(); // L: 94 - this.remaining += var2.size; // L: 95 + for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) { + if (var2.isSoft()) { + if (var2.get() == null) { + var2.remove(); + var2.removeDual(); + this.remaining += var2.size; } - } else if (++var2.keyDual > (long)var1) { // L: 100 - SoftWrapper var3 = new SoftWrapper(var2.get(), var2.size); // L: 101 - this.hashTable.put(var3, var2.key); // L: 102 - IterableDualNodeQueue.DualNodeDeque_addBefore(var3, var2); // L: 103 - var2.remove(); // L: 104 - var2.removeDual(); // L: 105 + } else if (++var2.keyDual > (long)var1) { + SoftWrapper var3 = new SoftWrapper(var2.get(), var2.size); + this.hashTable.put(var3, var2.key); + IterableDualNodeQueue.DualNodeDeque_addBefore(var3, var2); + var2.remove(); + var2.removeDual(); } } - } // L: 109 + } @ObfuscatedName("j") @Export("clear") public void clear() { - this.queue.clear(); // L: 112 - this.hashTable.clear(); // L: 113 - this.remaining = this.capacity; // L: 114 - } // L: 115 + this.queue.clear(); + this.hashTable.clear(); + this.remaining = this.capacity; + } } diff --git a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java index cc6fe39b3c..1793b7e123 100644 --- a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java +++ b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java @@ -31,134 +31,134 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { @Export("get") public PlatformInfo get() { byte var1; - if (JagexCache.formattedOperatingSystemName.startsWith("win")) { // L: 16 + if (JagexCache.formattedOperatingSystemName.startsWith("win")) { var1 = 1; - } else if (JagexCache.formattedOperatingSystemName.startsWith("mac")) { // L: 17 + } else if (JagexCache.formattedOperatingSystemName.startsWith("mac")) { var1 = 2; - } else if (JagexCache.formattedOperatingSystemName.startsWith("linux")) { // L: 18 + } else if (JagexCache.formattedOperatingSystemName.startsWith("linux")) { var1 = 3; } else { - var1 = 4; // L: 19 + var1 = 4; } String var2; try { - var2 = System.getProperty("os.arch").toLowerCase(); // L: 23 - } catch (Exception var30) { // L: 25 - var2 = ""; // L: 26 + var2 = System.getProperty("os.arch").toLowerCase(); + } catch (Exception var30) { + var2 = ""; } String var3; try { - var3 = System.getProperty("os.version").toLowerCase(); // L: 29 - } catch (Exception var29) { // L: 31 - var3 = ""; // L: 32 + var3 = System.getProperty("os.version").toLowerCase(); + } catch (Exception var29) { + var3 = ""; } - String var4 = "Unknown"; // L: 34 - String var5 = "1.1"; // L: 35 + String var4 = "Unknown"; + String var5 = "1.1"; try { - var4 = System.getProperty("java.vendor"); // L: 37 - var5 = System.getProperty("java.version"); // L: 38 - } catch (Exception var28) { // L: 40 + var4 = System.getProperty("java.vendor"); + var5 = System.getProperty("java.version"); + } catch (Exception var28) { } boolean var27; - if (!var2.startsWith("amd64") && !var2.startsWith("x86_64")) { // L: 42 - var27 = false; // L: 43 + if (!var2.startsWith("amd64") && !var2.startsWith("x86_64")) { + var27 = false; } else { var27 = true; } - byte var7 = 0; // L: 44 - if (var1 == 1) { // L: 45 - if (var3.indexOf("4.0") != -1) { // L: 46 + byte var7 = 0; + if (var1 == 1) { + if (var3.indexOf("4.0") != -1) { var7 = 1; - } else if (var3.indexOf("4.1") != -1) { // L: 47 + } else if (var3.indexOf("4.1") != -1) { var7 = 2; - } else if (var3.indexOf("4.9") != -1) { // L: 48 + } else if (var3.indexOf("4.9") != -1) { var7 = 3; - } else if (var3.indexOf("5.0") != -1) { // L: 49 + } else if (var3.indexOf("5.0") != -1) { var7 = 4; - } else if (var3.indexOf("5.1") != -1) { // L: 50 + } else if (var3.indexOf("5.1") != -1) { var7 = 5; - } else if (var3.indexOf("5.2") != -1) { // L: 51 + } else if (var3.indexOf("5.2") != -1) { var7 = 8; - } else if (var3.indexOf("6.0") != -1) { // L: 52 + } else if (var3.indexOf("6.0") != -1) { var7 = 6; - } else if (var3.indexOf("6.1") != -1) { // L: 53 + } else if (var3.indexOf("6.1") != -1) { var7 = 7; - } else if (var3.indexOf("6.2") != -1) { // L: 54 + } else if (var3.indexOf("6.2") != -1) { var7 = 9; - } else if (var3.indexOf("6.3") != -1) { // L: 55 + } else if (var3.indexOf("6.3") != -1) { var7 = 10; - } else if (var3.indexOf("10.0") != -1) { // L: 56 + } else if (var3.indexOf("10.0") != -1) { var7 = 11; } - } else if (var1 == 2) { // L: 58 - if (var3.indexOf("10.4") != -1) { // L: 59 + } else if (var1 == 2) { + if (var3.indexOf("10.4") != -1) { var7 = 20; - } else if (var3.indexOf("10.5") != -1) { // L: 60 + } else if (var3.indexOf("10.5") != -1) { var7 = 21; - } else if (var3.indexOf("10.6") != -1) { // L: 61 + } else if (var3.indexOf("10.6") != -1) { var7 = 22; - } else if (var3.indexOf("10.7") != -1) { // L: 62 + } else if (var3.indexOf("10.7") != -1) { var7 = 23; - } else if (var3.indexOf("10.8") != -1) { // L: 63 + } else if (var3.indexOf("10.8") != -1) { var7 = 24; - } else if (var3.indexOf("10.9") != -1) { // L: 64 + } else if (var3.indexOf("10.9") != -1) { var7 = 25; - } else if (var3.indexOf("10.10") != -1) { // L: 65 + } else if (var3.indexOf("10.10") != -1) { var7 = 26; - } else if (var3.indexOf("10.11") != -1) { // L: 66 + } else if (var3.indexOf("10.11") != -1) { var7 = 27; - } else if (var3.indexOf("10.12") != -1) { // L: 67 + } else if (var3.indexOf("10.12") != -1) { var7 = 28; - } else if (var3.indexOf("10.13") != -1) { // L: 68 + } else if (var3.indexOf("10.13") != -1) { var7 = 29; } } byte var8; - if (var4.toLowerCase().indexOf("sun") != -1) { // L: 71 + if (var4.toLowerCase().indexOf("sun") != -1) { var8 = 1; - } else if (var4.toLowerCase().indexOf("microsoft") != -1) { // L: 72 + } else if (var4.toLowerCase().indexOf("microsoft") != -1) { var8 = 2; - } else if (var4.toLowerCase().indexOf("apple") != -1) { // L: 73 + } else if (var4.toLowerCase().indexOf("apple") != -1) { var8 = 3; - } else if (var4.toLowerCase().indexOf("oracle") != -1) { // L: 74 + } else if (var4.toLowerCase().indexOf("oracle") != -1) { var8 = 5; } else { - var8 = 4; // L: 75 + var8 = 4; } - this.method6821(var5); // L: 76 - boolean var9 = false; // L: 77 - int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1; // L: 78 + this.method6821(var5); + boolean var9 = false; + int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1; int var11; - if (this.field4262 > 3) { // L: 81 + if (this.field4262 > 3) { var11 = Runtime.getRuntime().availableProcessors(); } else { - var11 = 0; // L: 82 + var11 = 0; } - 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.field4262, this.field4259, this.field4263, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); // L: 98 + byte var12 = 0; + String var13 = ""; + String var14 = ""; + String var15 = ""; + String var16 = ""; + String var17 = ""; + String var18 = ""; + boolean var19 = false; + boolean var20 = false; + boolean var21 = false; + boolean var22 = false; + int[] var23 = new int[3]; + boolean var24 = false; + String var25 = ""; + boolean var26 = false; + return new PlatformInfo(var1, var27, var7, var8, this.field4262, this.field4259, this.field4263, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); } @ObfuscatedName("b") @@ -167,13 +167,13 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { garbageValue = "742897399" ) void method6821(String var1) { - if (var1.startsWith("1.")) { // L: 102 - this.method6822(var1); // L: 103 + if (var1.startsWith("1.")) { + this.method6822(var1); } else { - this.method6823(var1); // L: 106 + this.method6823(var1); } - } // L: 108 + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -181,17 +181,17 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { garbageValue = "-691110522" ) void method6822(String var1) { - String[] var2 = var1.split("\\."); // L: 111 + String[] var2 = var1.split("\\."); try { - this.field4262 = Integer.parseInt(var2[1]); // L: 113 - var2 = var2[2].split("_"); // L: 114 - this.field4259 = Integer.parseInt(var2[0]); // L: 115 - this.field4263 = Integer.parseInt(var2[1]); // L: 116 - } catch (Exception var4) { // L: 118 + this.field4262 = Integer.parseInt(var2[1]); + var2 = var2[2].split("_"); + this.field4259 = Integer.parseInt(var2[0]); + this.field4263 = Integer.parseInt(var2[1]); + } catch (Exception var4) { } - } // L: 119 + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -199,14 +199,14 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { garbageValue = "69" ) void method6823(String var1) { - String[] var2 = var1.split("\\."); // L: 122 + String[] var2 = var1.split("\\."); try { - this.field4262 = Integer.parseInt(var2[0]); // L: 124 - this.field4259 = Integer.parseInt(var2[1]); // L: 125 - this.field4263 = Integer.parseInt(var2[2]); // L: 126 - } catch (Exception var4) { // L: 128 + this.field4262 = Integer.parseInt(var2[0]); + this.field4259 = Integer.parseInt(var2[1]); + this.field4263 = Integer.parseInt(var2[2]); + } catch (Exception var4) { } - } // L: 129 + } } diff --git a/runescape-client/src/main/java/DevicePcmPlayer.java b/runescape-client/src/main/java/DevicePcmPlayer.java index 9b1cea680e..b23efa6e26 100644 --- a/runescape-client/src/main/java/DevicePcmPlayer.java +++ b/runescape-client/src/main/java/DevicePcmPlayer.java @@ -29,7 +29,7 @@ public class DevicePcmPlayer extends PcmPlayer { byte[] byteSamples; DevicePcmPlayer() { - } // L: 18 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -38,9 +38,9 @@ public class DevicePcmPlayer extends PcmPlayer { ) @Export("init") protected void init() { - this.format = new AudioFormat((float)class339.field4058, 16, SpriteMask.PcmPlayer_stereo ? 2 : 1, true, false); // L: 22 - this.byteSamples = new byte[256 << (SpriteMask.PcmPlayer_stereo ? 2 : 1)]; // L: 23 - } // L: 24 + this.format = new AudioFormat((float)class339.field4058, 16, SpriteMask.PcmPlayer_stereo ? 2 : 1, true, false); + this.byteSamples = new byte[256 << (SpriteMask.PcmPlayer_stereo ? 2 : 1)]; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -50,20 +50,20 @@ public class DevicePcmPlayer extends PcmPlayer { @Export("open") protected void open(int var1) throws LineUnavailableException { try { - Info var2 = new Info(SourceDataLine.class, this.format, var1 << (SpriteMask.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 (Language.method5825(var1) != 1) { // L: 36 - this.open(SpotAnimationDefinition.method3362(var1)); // L: 37 + Info var2 = new Info(SourceDataLine.class, this.format, var1 << (SpriteMask.PcmPlayer_stereo ? 2 : 1)); + this.line = (SourceDataLine)AudioSystem.getLine(var2); + this.line.open(); + this.line.start(); + this.capacity2 = var1; + } catch (LineUnavailableException var3) { + if (Language.method5825(var1) != 1) { + this.open(SpotAnimationDefinition.method3362(var1)); } else { - this.line = null; // L: 40 - throw var3; // L: 41 + this.line = null; + throw var3; } } - } // L: 38 43 + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -72,29 +72,29 @@ public class DevicePcmPlayer extends PcmPlayer { ) @Export("position") protected int position() { - return this.capacity2 - (this.line.available() >> (SpriteMask.PcmPlayer_stereo ? 2 : 1)); // L: 47 + return this.capacity2 - (this.line.available() >> (SpriteMask.PcmPlayer_stereo ? 2 : 1)); } @ObfuscatedName("m") @Export("write") protected void write() { - int var1 = 256; // L: 53 - if (SpriteMask.PcmPlayer_stereo) { // L: 54 + int var1 = 256; + if (SpriteMask.PcmPlayer_stereo) { var1 <<= 1; } - 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 + for (int var2 = 0; var2 < var1; ++var2) { + int var3 = super.samples[var2]; + if ((var3 + 8388608 & -16777216) != 0) { + var3 = 8388607 ^ var3 >> 31; } - this.byteSamples[var2 * 2] = (byte)(var3 >> 8); // L: 60 - this.byteSamples[var2 * 2 + 1] = (byte)(var3 >> 16); // L: 61 + this.byteSamples[var2 * 2] = (byte)(var3 >> 8); + this.byteSamples[var2 * 2 + 1] = (byte)(var3 >> 16); } - this.line.write(this.byteSamples, 0, var1 << 1); // L: 63 - } // L: 64 + this.line.write(this.byteSamples, 0, var1 << 1); + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -103,12 +103,12 @@ public class DevicePcmPlayer extends PcmPlayer { ) @Export("close") protected void close() { - if (this.line != null) { // L: 68 - this.line.close(); // L: 69 - this.line = null; // L: 70 + if (this.line != null) { + this.line.close(); + this.line = null; } - } // L: 72 + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -117,6 +117,6 @@ public class DevicePcmPlayer extends PcmPlayer { ) @Export("discard") protected void discard() { - this.line.flush(); // L: 76 - } // L: 77 + this.line.flush(); + } } diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index ffa4b3c533..f4159407be 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -8,7 +8,7 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("DevicePcmPlayerProvider") public class DevicePcmPlayerProvider implements class47 { DevicePcmPlayerProvider() { - } // L: 7 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -17,7 +17,7 @@ public class DevicePcmPlayerProvider implements class47 { ) @Export("player") public PcmPlayer player() { - return new DevicePcmPlayer(); // L: 11 + return new DevicePcmPlayer(); } @ObfuscatedName("b") @@ -27,17 +27,17 @@ public class DevicePcmPlayerProvider implements class47 { ) @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 + ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); + if (var4 == null) { + var4 = new ChatChannel(); + Messages.Messages_channels.put(var0, var4); } - Message var5 = var4.addMessage(var0, var1, var2, var3); // 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 + Message var5 = var4.addMessage(var0, var1, var2, var3); + Messages.Messages_hashTable.put(var5, (long)var5.count); + Messages.Messages_queue.add(var5); + Client.chatCycle = Client.cycleCntr; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -45,10 +45,10 @@ public class DevicePcmPlayerProvider implements class47 { garbageValue = "1" ) static void method393(Component var0) { - var0.setFocusTraversalKeysEnabled(false); // L: 155 - var0.addKeyListener(KeyHandler.KeyHandler_instance); // L: 156 - var0.addFocusListener(KeyHandler.KeyHandler_instance); // L: 157 - } // L: 158 + var0.setFocusTraversalKeysEnabled(false); + var0.addKeyListener(KeyHandler.KeyHandler_instance); + var0.addFocusListener(KeyHandler.KeyHandler_instance); + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -56,7 +56,7 @@ public class DevicePcmPlayerProvider implements class47 { garbageValue = "30675574" ) public static boolean method398(int var0) { - return var0 >= 0 && var0 < 112 ? KeyHandler.KeyHandler_pressedKeys[var0] : false; // L: 241 242 + return var0 >= 0 && var0 < 112 ? KeyHandler.KeyHandler_pressedKeys[var0] : false; } @ObfuscatedName("he") @@ -66,127 +66,127 @@ public class DevicePcmPlayerProvider implements class47 { ) @Export("loadRegions") static final void loadRegions(boolean var0, PacketBuffer var1) { - Client.isInInstance = var0; // L: 6145 + Client.isInInstance = var0; int var3; int var4; int var5; int var6; int var7; int var8; - if (!Client.isInInstance) { // L: 6146 - int var2 = var1.method7499(); // L: 6147 - var3 = var1.method7401(); // L: 6148 - var4 = var1.readUnsignedShort(); // L: 6149 - WorldMapID.xteaKeys = new int[var4][4]; // L: 6150 + if (!Client.isInInstance) { + int var2 = var1.method7499(); + var3 = var1.method7401(); + var4 = var1.readUnsignedShort(); + WorldMapID.xteaKeys = new int[var4][4]; - for (var5 = 0; var5 < var4; ++var5) { // L: 6151 - for (var6 = 0; var6 < 4; ++var6) { // L: 6152 - WorldMapID.xteaKeys[var5][var6] = var1.readInt(); // L: 6153 + for (var5 = 0; var5 < var4; ++var5) { + for (var6 = 0; var6 < 4; ++var6) { + WorldMapID.xteaKeys[var5][var6] = var1.readInt(); } } - class269.regions = new int[var4]; // L: 6156 - Tiles.regionMapArchiveIds = new int[var4]; // L: 6157 - class10.regionLandArchiveIds = new int[var4]; // L: 6158 - TileItem.regionLandArchives = new byte[var4][]; // L: 6159 - VarpDefinition.regionMapArchives = new byte[var4][]; // L: 6160 - boolean var16 = false; // L: 6161 - if (Client.field526) { // L: 6162 - if ((var3 / 8 == 48 || var3 / 8 == 49) && var2 / 8 == 48) { // L: 6163 + class269.regions = new int[var4]; + Tiles.regionMapArchiveIds = new int[var4]; + class10.regionLandArchiveIds = new int[var4]; + TileItem.regionLandArchives = new byte[var4][]; + VarpDefinition.regionMapArchives = new byte[var4][]; + boolean var16 = false; + if (Client.field526) { + if ((var3 / 8 == 48 || var3 / 8 == 49) && var2 / 8 == 48) { var16 = true; } - if (var3 / 8 == 48 && var2 / 8 == 148) { // L: 6164 + if (var3 / 8 == 48 && var2 / 8 == 148) { var16 = true; } } - var4 = 0; // L: 6166 + var4 = 0; - for (var6 = (var3 - 6) / 8; var6 <= (var3 + 6) / 8; ++var6) { // L: 6167 - for (var7 = (var2 - 6) / 8; var7 <= (var2 + 6) / 8; ++var7) { // L: 6168 - var8 = var7 + (var6 << 8); // L: 6169 - if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { // L: 6170 - class269.regions[var4] = var8; // L: 6171 - Tiles.regionMapArchiveIds[var4] = class140.archive5.getGroupId("m" + var6 + "_" + var7); // L: 6172 - class10.regionLandArchiveIds[var4] = class140.archive5.getGroupId("l" + var6 + "_" + var7); // L: 6173 - ++var4; // L: 6174 + for (var6 = (var3 - 6) / 8; var6 <= (var3 + 6) / 8; ++var6) { + for (var7 = (var2 - 6) / 8; var7 <= (var2 + 6) / 8; ++var7) { + var8 = var7 + (var6 << 8); + if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { + class269.regions[var4] = var8; + Tiles.regionMapArchiveIds[var4] = class140.archive5.getGroupId("m" + var6 + "_" + var7); + class10.regionLandArchiveIds[var4] = class140.archive5.getGroupId("l" + var6 + "_" + var7); + ++var4; } } } - ModelData0.method4320(var3, var2, true); // L: 6177 + ModelData0.method4320(var3, var2, true); } else { - boolean var15 = var1.method7392() == 1; // L: 6180 - var3 = var1.readUnsignedShort(); // L: 6181 - var4 = var1.method7401(); // L: 6182 - var5 = var1.readUnsignedShort(); // L: 6183 - var1.importIndex(); // L: 6184 + boolean var15 = var1.method7392() == 1; + var3 = var1.readUnsignedShort(); + var4 = var1.method7401(); + var5 = var1.readUnsignedShort(); + var1.importIndex(); int var9; - for (var6 = 0; var6 < 4; ++var6) { // L: 6185 - for (var7 = 0; var7 < 13; ++var7) { // L: 6186 - for (var8 = 0; var8 < 13; ++var8) { // L: 6187 - var9 = var1.readBits(1); // L: 6188 + for (var6 = 0; var6 < 4; ++var6) { + for (var7 = 0; var7 < 13; ++var7) { + for (var8 = 0; var8 < 13; ++var8) { + var9 = var1.readBits(1); if (var9 == 1) { - Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); // L: 6189 + Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); } else { - Client.instanceChunkTemplates[var6][var7][var8] = -1; // L: 6190 + Client.instanceChunkTemplates[var6][var7][var8] = -1; } } } } - var1.exportIndex(); // L: 6194 - WorldMapID.xteaKeys = new int[var5][4]; // L: 6195 + var1.exportIndex(); + WorldMapID.xteaKeys = new int[var5][4]; - for (var6 = 0; var6 < var5; ++var6) { // L: 6196 - for (var7 = 0; var7 < 4; ++var7) { // L: 6197 - WorldMapID.xteaKeys[var6][var7] = var1.readInt(); // L: 6198 + for (var6 = 0; var6 < var5; ++var6) { + for (var7 = 0; var7 < 4; ++var7) { + WorldMapID.xteaKeys[var6][var7] = var1.readInt(); } } - class269.regions = new int[var5]; // L: 6201 - Tiles.regionMapArchiveIds = new int[var5]; // L: 6202 - class10.regionLandArchiveIds = new int[var5]; // L: 6203 - TileItem.regionLandArchives = new byte[var5][]; // L: 6204 - VarpDefinition.regionMapArchives = new byte[var5][]; // L: 6205 - var5 = 0; // L: 6206 + class269.regions = new int[var5]; + Tiles.regionMapArchiveIds = new int[var5]; + class10.regionLandArchiveIds = new int[var5]; + TileItem.regionLandArchives = new byte[var5][]; + VarpDefinition.regionMapArchives = new byte[var5][]; + var5 = 0; - for (var6 = 0; var6 < 4; ++var6) { // L: 6207 - for (var7 = 0; var7 < 13; ++var7) { // L: 6208 - for (var8 = 0; var8 < 13; ++var8) { // L: 6209 - var9 = Client.instanceChunkTemplates[var6][var7][var8]; // L: 6210 - if (var9 != -1) { // L: 6211 - int var10 = var9 >> 14 & 1023; // L: 6212 - int var11 = var9 >> 3 & 2047; // L: 6213 - int var12 = (var10 / 8 << 8) + var11 / 8; // L: 6214 + for (var6 = 0; var6 < 4; ++var6) { + for (var7 = 0; var7 < 13; ++var7) { + for (var8 = 0; var8 < 13; ++var8) { + var9 = Client.instanceChunkTemplates[var6][var7][var8]; + if (var9 != -1) { + int var10 = var9 >> 14 & 1023; + int var11 = var9 >> 3 & 2047; + int var12 = (var10 / 8 << 8) + var11 / 8; int var13; - for (var13 = 0; var13 < var5; ++var13) { // L: 6215 + for (var13 = 0; var13 < var5; ++var13) { if (class269.regions[var13] == var12) { - var12 = -1; // L: 6216 - break; // L: 6217 + var12 = -1; + break; } } - if (var12 != -1) { // L: 6219 - class269.regions[var5] = var12; // L: 6220 - var13 = var12 >> 8 & 255; // L: 6221 - int var14 = var12 & 255; // L: 6222 - Tiles.regionMapArchiveIds[var5] = class140.archive5.getGroupId("m" + var13 + "_" + var14); // L: 6223 - class10.regionLandArchiveIds[var5] = class140.archive5.getGroupId("l" + var13 + "_" + var14); // L: 6224 - ++var5; // L: 6225 + if (var12 != -1) { + class269.regions[var5] = var12; + var13 = var12 >> 8 & 255; + int var14 = var12 & 255; + Tiles.regionMapArchiveIds[var5] = class140.archive5.getGroupId("m" + var13 + "_" + var14); + class10.regionLandArchiveIds[var5] = class140.archive5.getGroupId("l" + var13 + "_" + var14); + ++var5; } } } } } - ModelData0.method4320(var4, var3, !var15); // L: 6231 + ModelData0.method4320(var4, var3, !var15); } - } // L: 6233 + } @ObfuscatedName("hb") @ObfuscatedSignature( @@ -195,292 +195,292 @@ public class DevicePcmPlayerProvider implements class47 { ) @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: 8027 - if (Client.isLowDetail && var0 != class20.Client_plane) { // L: 8028 + if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) { + if (Client.isLowDetail && var0 != class20.Client_plane) { return; } - long var7 = 0L; // L: 8029 - boolean var9 = true; // L: 8030 - boolean var10 = false; // L: 8031 - boolean var11 = false; // L: 8032 - if (var1 == 0) { // L: 8033 + long var7 = 0L; + boolean var9 = true; + boolean var10 = false; + boolean var11 = false; + if (var1 == 0) { var7 = class7.scene.getBoundaryObjectTag(var0, var2, var3); } - if (var1 == 1) { // L: 8034 + if (var1 == 1) { var7 = class7.scene.getWallDecorationTag(var0, var2, var3); } - if (var1 == 2) { // L: 8035 + if (var1 == 2) { var7 = class7.scene.getGameObjectTag(var0, var2, var3); } - if (var1 == 3) { // L: 8036 + if (var1 == 3) { var7 = class7.scene.getFloorDecorationTag(var0, var2, var3); } int var12; - if (var7 != 0L) { // L: 8037 - var12 = class7.scene.getObjectFlags(var0, var2, var3, var7); // L: 8038 - int var38 = PacketWriter.Entity_unpackID(var7); // L: 8039 - int var39 = var12 & 31; // L: 8040 - int var40 = var12 >> 6 & 3; // L: 8041 + if (var7 != 0L) { + var12 = class7.scene.getObjectFlags(var0, var2, var3, var7); + int var38 = PacketWriter.Entity_unpackID(var7); + int var39 = var12 & 31; + int var40 = var12 >> 6 & 3; ObjectComposition var13; - if (var1 == 0) { // L: 8042 - class7.scene.removeBoundaryObject(var0, var2, var3); // L: 8043 - var13 = class148.getObjectDefinition(var38); // L: 8044 - if (var13.interactType != 0) { // L: 8045 + if (var1 == 0) { + class7.scene.removeBoundaryObject(var0, var2, var3); + var13 = class148.getObjectDefinition(var38); + if (var13.interactType != 0) { Client.collisionMaps[var0].method3693(var2, var3, var39, var40, var13.boolean1); } } - if (var1 == 1) { // L: 8047 + if (var1 == 1) { class7.scene.removeWallDecoration(var0, var2, var3); } - if (var1 == 2) { // L: 8048 - class7.scene.removeGameObject(var0, var2, var3); // L: 8049 - var13 = class148.getObjectDefinition(var38); // L: 8050 - if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { // L: 8051 + if (var1 == 2) { + class7.scene.removeGameObject(var0, var2, var3); + var13 = class148.getObjectDefinition(var38); + if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { return; } - if (var13.interactType != 0) { // L: 8052 + if (var13.interactType != 0) { Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var40, var13.boolean1); } } - if (var1 == 3) { // L: 8054 - class7.scene.removeFloorDecoration(var0, var2, var3); // L: 8055 - var13 = class148.getObjectDefinition(var38); // L: 8056 - if (var13.interactType == 1) { // L: 8057 + if (var1 == 3) { + class7.scene.removeFloorDecoration(var0, var2, var3); + var13 = class148.getObjectDefinition(var38); + if (var13.interactType == 1) { Client.collisionMaps[var0].method3701(var2, var3); } } } - if (var4 >= 0) { // L: 8060 - var12 = var0; // L: 8061 - if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 8062 + if (var4 >= 0) { + var12 = var0; + if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { var12 = var0 + 1; } - Scene var41 = class7.scene; // L: 8063 - CollisionMap var14 = Client.collisionMaps[var0]; // L: 8064 - ObjectComposition var15 = class148.getObjectDefinition(var4); // L: 8066 + Scene var41 = class7.scene; + CollisionMap var14 = Client.collisionMaps[var0]; + ObjectComposition var15 = class148.getObjectDefinition(var4); int var16; int var17; - if (var5 != 1 && var5 != 3) { // L: 8069 - var16 = var15.sizeX; // L: 8074 - var17 = var15.sizeY; // L: 8075 + if (var5 != 1 && var5 != 3) { + var16 = var15.sizeX; + var17 = var15.sizeY; } else { - var16 = var15.sizeY; // L: 8070 - var17 = var15.sizeX; // L: 8071 + var16 = var15.sizeY; + var17 = var15.sizeX; } int var18; int var19; - if (var16 + var2 <= 104) { // L: 8081 - var18 = (var16 >> 1) + var2; // L: 8082 - var19 = var2 + (var16 + 1 >> 1); // L: 8083 + if (var16 + var2 <= 104) { + var18 = (var16 >> 1) + var2; + var19 = var2 + (var16 + 1 >> 1); } else { - var18 = var2; // L: 8086 - var19 = var2 + 1; // L: 8087 + var18 = var2; + var19 = var2 + 1; } int var20; int var21; - if (var3 + var17 <= 104) { // L: 8089 - var20 = var3 + (var17 >> 1); // L: 8090 - var21 = var3 + (var17 + 1 >> 1); // L: 8091 + if (var3 + var17 <= 104) { + var20 = var3 + (var17 >> 1); + var21 = var3 + (var17 + 1 >> 1); } else { - var20 = var3; // L: 8094 - var21 = var3 + 1; // L: 8095 + var20 = var3; + var21 = var3 + 1; } - int[][] var22 = Tiles.Tiles_heights[var12]; // L: 8097 - int var23 = var22[var18][var20] + var22[var19][var20] + var22[var18][var21] + var22[var19][var21] >> 2; // L: 8098 - int var24 = (var2 << 7) + (var16 << 6); // L: 8099 - int var25 = (var3 << 7) + (var17 << 6); // L: 8100 - long var26 = SecureRandomFuture.calculateTag(var2, var3, 2, var15.int1 == 0, var4); // L: 8101 - int var28 = (var5 << 6) + var6; // L: 8102 - if (var15.int3 == 1) { // L: 8103 + int[][] var22 = Tiles.Tiles_heights[var12]; + int var23 = var22[var18][var20] + var22[var19][var20] + var22[var18][var21] + var22[var19][var21] >> 2; + int var24 = (var2 << 7) + (var16 << 6); + int var25 = (var3 << 7) + (var17 << 6); + long var26 = SecureRandomFuture.calculateTag(var2, var3, 2, var15.int1 == 0, var4); + int var28 = (var5 << 6) + var6; + if (var15.int3 == 1) { var28 += 256; } Object var36; - if (var6 == 22) { // L: 8104 - if (var15.animationId == -1 && var15.transforms == null) { // L: 8106 + if (var6 == 22) { + if (var15.animationId == -1 && var15.transforms == null) { 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: 8107 + var36 = new DynamicObject(var4, 22, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); } - var41.newFloorDecoration(var0, var2, var3, var23, (Renderable)var36, var26, var28); // L: 8108 - if (var15.interactType == 1) { // L: 8109 + var41.newFloorDecoration(var0, var2, var3, var23, (Renderable)var36, var26, var28); + if (var15.interactType == 1) { var14.setBlockedByFloorDec(var2, var3); } - } else if (var6 != 10 && var6 != 11) { // L: 8112 - if (var6 >= 12) { // L: 8120 - if (var15.animationId == -1 && var15.transforms == null) { // L: 8122 + } else if (var6 != 10 && var6 != 11) { + if (var6 >= 12) { + if (var15.animationId == -1 && var15.transforms == null) { 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: 8123 + var36 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); } - var41.method3960(var0, var2, var3, var23, 1, 1, (Renderable)var36, 0, var26, var28); // L: 8124 - if (var15.interactType != 0) { // L: 8125 + var41.method3960(var0, var2, var3, var23, 1, 1, (Renderable)var36, 0, var26, var28); + if (var15.interactType != 0) { var14.addGameObject(var2, var3, var16, var17, var15.boolean1); } - } else if (var6 == 0) { // L: 8128 - if (var15.animationId == -1 && var15.transforms == null) { // L: 8130 + } else if (var6 == 0) { + if (var15.animationId == -1 && var15.transforms == null) { 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: 8131 + var36 = new DynamicObject(var4, 0, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); } - var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field969[var5], 0, var26, var28); // L: 8132 - if (var15.interactType != 0) { // L: 8133 + var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field969[var5], 0, var26, var28); + if (var15.interactType != 0) { var14.method3721(var2, var3, var6, var5, var15.boolean1); } - } else if (var6 == 1) { // L: 8136 - if (var15.animationId == -1 && var15.transforms == null) { // L: 8138 + } else if (var6 == 1) { + if (var15.animationId == -1 && var15.transforms == null) { var36 = var15.getModel(1, var5, var22, var24, var23, var25); } else { - var36 = new DynamicObject(var4, 1, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 8139 + var36 = new DynamicObject(var4, 1, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); } - var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field970[var5], 0, var26, var28); // L: 8140 - if (var15.interactType != 0) { // L: 8141 + var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field970[var5], 0, var26, var28); + if (var15.interactType != 0) { var14.method3721(var2, var3, var6, var5, var15.boolean1); } } else { int var29; - if (var6 == 2) { // L: 8144 - var29 = var5 + 1 & 3; // L: 8145 + if (var6 == 2) { + var29 = var5 + 1 & 3; Object var31; Object var37; - if (var15.animationId == -1 && var15.transforms == null) { // L: 8148 - var37 = var15.getModel(2, var5 + 4, var22, var24, var23, var25); // L: 8149 - var31 = var15.getModel(2, var29, var22, var24, var23, var25); // L: 8150 + if (var15.animationId == -1 && var15.transforms == null) { + var37 = var15.getModel(2, var5 + 4, var22, var24, var23, var25); + var31 = var15.getModel(2, var29, var22, var24, var23, var25); } else { - var37 = new DynamicObject(var4, 2, var5 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 8153 - var31 = new DynamicObject(var4, 2, var29, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 8154 + var37 = new DynamicObject(var4, 2, var5 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); + var31 = new DynamicObject(var4, 2, var29, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); } - var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var37, (Renderable)var31, Tiles.field969[var5], Tiles.field969[var29], var26, var28); // L: 8156 - if (var15.interactType != 0) { // L: 8157 + var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var37, (Renderable)var31, Tiles.field969[var5], Tiles.field969[var29], var26, var28); + if (var15.interactType != 0) { var14.method3721(var2, var3, var6, var5, var15.boolean1); } - } else if (var6 == 3) { // L: 8160 - if (var15.animationId == -1 && var15.transforms == null) { // L: 8162 + } else if (var6 == 3) { + if (var15.animationId == -1 && var15.transforms == null) { 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: 8163 + var36 = new DynamicObject(var4, 3, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); } - var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field970[var5], 0, var26, var28); // L: 8164 - if (var15.interactType != 0) { // L: 8165 + var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field970[var5], 0, var26, var28); + if (var15.interactType != 0) { var14.method3721(var2, var3, var6, var5, var15.boolean1); } - } else if (var6 == 9) { // L: 8168 - if (var15.animationId == -1 && var15.transforms == null) { // L: 8170 + } else if (var6 == 9) { + if (var15.animationId == -1 && var15.transforms == null) { 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: 8171 + var36 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); } - var41.method3960(var0, var2, var3, var23, 1, 1, (Renderable)var36, 0, var26, var28); // L: 8172 - if (var15.interactType != 0) { // L: 8173 + var41.method3960(var0, var2, var3, var23, 1, 1, (Renderable)var36, 0, var26, var28); + if (var15.interactType != 0) { var14.addGameObject(var2, var3, var16, var17, var15.boolean1); } - } else if (var6 == 4) { // L: 8176 - if (var15.animationId == -1 && var15.transforms == null) { // L: 8178 + } else if (var6 == 4) { + if (var15.animationId == -1 && var15.transforms == null) { 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: 8179 + var36 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); } - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field969[var5], 0, 0, 0, var26, var28); // L: 8180 + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field969[var5], 0, 0, 0, var26, var28); } else { long var30; Object var32; - if (var6 == 5) { // L: 8183 - var29 = 16; // L: 8184 - var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 8185 - if (var30 != 0L) { // L: 8186 + if (var6 == 5) { + var29 = 16; + var30 = var41.getBoundaryObjectTag(var0, var2, var3); + if (var30 != 0L) { var29 = class148.getObjectDefinition(PacketWriter.Entity_unpackID(var30)).int2; } - if (var15.animationId == -1 && var15.transforms == null) { // L: 8188 + if (var15.animationId == -1 && var15.transforms == null) { var32 = var15.getModel(4, var5, var22, var24, var23, var25); } else { - var32 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 8189 + var32 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); } - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)null, Tiles.field969[var5], 0, var29 * Tiles.field976[var5], var29 * Tiles.field966[var5], var26, var28); // L: 8190 - } else if (var6 == 6) { // L: 8193 - var29 = 8; // L: 8194 - var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 8195 - if (var30 != 0L) { // L: 8196 + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)null, Tiles.field969[var5], 0, var29 * Tiles.field976[var5], var29 * Tiles.field966[var5], var26, var28); + } else if (var6 == 6) { + var29 = 8; + var30 = var41.getBoundaryObjectTag(var0, var2, var3); + if (var30 != 0L) { var29 = class148.getObjectDefinition(PacketWriter.Entity_unpackID(var30)).int2 / 2; } - if (var15.animationId == -1 && var15.transforms == null) { // L: 8198 + if (var15.animationId == -1 && var15.transforms == null) { var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); } else { - var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 8199 + var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); } - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)null, 256, var5, var29 * Tiles.field973[var5], var29 * Tiles.field974[var5], var26, var28); // L: 8200 - } else if (var6 == 7) { // L: 8203 - int var35 = var5 + 2 & 3; // L: 8205 - if (var15.animationId == -1 && var15.transforms == null) { // L: 8206 + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)null, 256, var5, var29 * Tiles.field973[var5], var29 * Tiles.field974[var5], var26, var28); + } else if (var6 == 7) { + int var35 = var5 + 2 & 3; + if (var15.animationId == -1 && var15.transforms == null) { 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: 8207 + var36 = new DynamicObject(var4, 4, var35 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); } - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, 256, var35, 0, 0, var26, var28); // L: 8208 - } else if (var6 == 8) { // L: 8211 - var29 = 8; // L: 8212 - var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 8213 - if (0L != var30) { // L: 8214 + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, 256, var35, 0, 0, var26, var28); + } else if (var6 == 8) { + var29 = 8; + var30 = var41.getBoundaryObjectTag(var0, var2, var3); + if (0L != var30) { var29 = class148.getObjectDefinition(PacketWriter.Entity_unpackID(var30)).int2 / 2; } - int var34 = var5 + 2 & 3; // L: 8217 + int var34 = var5 + 2 & 3; Object var33; - if (var15.animationId == -1 && var15.transforms == null) { // L: 8218 - var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); // L: 8219 - var33 = var15.getModel(4, var34 + 4, var22, var24, var23, var25); // L: 8220 + if (var15.animationId == -1 && var15.transforms == null) { + var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); + var33 = var15.getModel(4, var34 + 4, var22, var24, var23, var25); } else { - var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 8223 - var33 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 8224 + var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); + var33 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); } - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)var33, 256, var5, var29 * Tiles.field973[var5], var29 * Tiles.field974[var5], var26, var28); // L: 8226 + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)var33, 256, var5, var29 * Tiles.field973[var5], var29 * Tiles.field974[var5], var26, var28); } } } } else { - if (var15.animationId == -1 && var15.transforms == null) { // L: 8114 + if (var15.animationId == -1 && var15.transforms == null) { 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: 8115 + var36 = new DynamicObject(var4, 10, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); } - if (var36 != null) { // L: 8116 + if (var36 != null) { var41.method3960(var0, var2, var3, var23, var16, var17, (Renderable)var36, var6 == 11 ? 256 : 0, var26, var28); } - if (var15.interactType != 0) { // L: 8117 + if (var15.interactType != 0) { var14.addGameObject(var2, var3, var16, var17, var15.boolean1); } } } } - } // L: 8231 + } } diff --git a/runescape-client/src/main/java/DirectByteArrayCopier.java b/runescape-client/src/main/java/DirectByteArrayCopier.java index 786e3f2b8e..60f7a4ccfb 100644 --- a/runescape-client/src/main/java/DirectByteArrayCopier.java +++ b/runescape-client/src/main/java/DirectByteArrayCopier.java @@ -21,10 +21,10 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier { ) @Export("get") byte[] get() { - byte[] var1 = new byte[this.directBuffer.capacity()]; // L: 13 - this.directBuffer.position(0); // L: 14 - this.directBuffer.get(var1); // L: 15 - return var1; // L: 16 + byte[] var1 = new byte[this.directBuffer.capacity()]; + this.directBuffer.position(0); + this.directBuffer.get(var1); + return var1; } @ObfuscatedName("m") @@ -34,10 +34,10 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier { ) @Export("set") public 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("ha") @ObfuscatedSignature( @@ -45,7 +45,7 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier { garbageValue = "14" ) static final void method5328(class253 var0) { - PacketBuffer var1 = Client.packetWriter.packetBuffer; // L: 7664 + PacketBuffer var1 = Client.packetWriter.packetBuffer; int var6; int var7; int var8; @@ -55,41 +55,41 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier { int var38; int var39; int var40; - if (class253.field2911 == var0) { // L: 7665 - var37 = var1.method7403(); // L: 7666 - var38 = var1.method7520(); // L: 7667 - var39 = (var38 >> 4 & 7) + class17.field90; // L: 7668 - var40 = (var38 & 7) + class167.field1813; // L: 7669 - var6 = var1.method7394(); // L: 7670 - var7 = var6 >> 2; // L: 7671 - var8 = var6 & 3; // L: 7672 - var9 = Client.field537[var7]; // L: 7673 - if (var39 >= 0 && var40 >= 0 && var39 < 103 && var40 < 103) { // L: 7674 - if (var9 == 0) { // L: 7675 - BoundaryObject var36 = class7.scene.method4105(class20.Client_plane, var39, var40); // L: 7676 - if (var36 != null) { // L: 7677 - var11 = PacketWriter.Entity_unpackID(var36.tag); // L: 7678 - if (var7 == 2) { // L: 7679 - var36.renderable1 = new DynamicObject(var11, 2, var8 + 4, class20.Client_plane, var39, var40, var37, false, var36.renderable1); // L: 7680 - var36.renderable2 = new DynamicObject(var11, 2, var8 + 1 & 3, class20.Client_plane, var39, var40, var37, false, var36.renderable2); // L: 7681 + if (class253.field2911 == var0) { + var37 = var1.method7403(); + var38 = var1.method7520(); + var39 = (var38 >> 4 & 7) + class17.field90; + var40 = (var38 & 7) + class167.field1813; + var6 = var1.method7394(); + var7 = var6 >> 2; + var8 = var6 & 3; + var9 = Client.field537[var7]; + if (var39 >= 0 && var40 >= 0 && var39 < 103 && var40 < 103) { + if (var9 == 0) { + BoundaryObject var36 = class7.scene.method4105(class20.Client_plane, var39, var40); + if (var36 != null) { + var11 = PacketWriter.Entity_unpackID(var36.tag); + if (var7 == 2) { + var36.renderable1 = new DynamicObject(var11, 2, var8 + 4, class20.Client_plane, var39, var40, var37, false, var36.renderable1); + var36.renderable2 = new DynamicObject(var11, 2, var8 + 1 & 3, class20.Client_plane, var39, var40, var37, false, var36.renderable2); } else { - var36.renderable1 = new DynamicObject(var11, var7, var8, class20.Client_plane, var39, var40, var37, false, var36.renderable1); // L: 7683 + var36.renderable1 = new DynamicObject(var11, var7, var8, class20.Client_plane, var39, var40, var37, false, var36.renderable1); } } } - if (var9 == 1) { // L: 7686 - WallDecoration var44 = class7.scene.method3973(class20.Client_plane, var39, var40); // L: 7687 - if (var44 != null) { // L: 7688 - var11 = PacketWriter.Entity_unpackID(var44.tag); // L: 7689 - if (var7 != 4 && var7 != 5) { // L: 7690 - if (var7 == 6) { // L: 7691 + if (var9 == 1) { + WallDecoration var44 = class7.scene.method3973(class20.Client_plane, var39, var40); + if (var44 != null) { + var11 = PacketWriter.Entity_unpackID(var44.tag); + if (var7 != 4 && var7 != 5) { + if (var7 == 6) { var44.renderable1 = new DynamicObject(var11, 4, var8 + 4, class20.Client_plane, var39, var40, var37, false, var44.renderable1); - } else if (var7 == 7) { // L: 7692 + } else if (var7 == 7) { var44.renderable1 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, class20.Client_plane, var39, var40, var37, false, var44.renderable1); - } else if (var7 == 8) { // L: 7693 - var44.renderable1 = new DynamicObject(var11, 4, var8 + 4, class20.Client_plane, var39, var40, var37, false, var44.renderable1); // L: 7694 - var44.renderable2 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, class20.Client_plane, var39, var40, var37, false, var44.renderable2); // L: 7695 + } else if (var7 == 8) { + var44.renderable1 = new DynamicObject(var11, 4, var8 + 4, class20.Client_plane, var39, var40, var37, false, var44.renderable1); + var44.renderable2 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, class20.Client_plane, var39, var40, var37, false, var44.renderable2); } } else { var44.renderable1 = new DynamicObject(var11, 4, var8, class20.Client_plane, var39, var40, var37, false, var44.renderable1); @@ -97,20 +97,20 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier { } } - if (var9 == 2) { // L: 7699 - GameObject var45 = class7.scene.getGameObject(class20.Client_plane, var39, var40); // L: 7700 - if (var7 == 11) { // L: 7701 + if (var9 == 2) { + GameObject var45 = class7.scene.getGameObject(class20.Client_plane, var39, var40); + if (var7 == 11) { var7 = 10; } - if (var45 != null) { // L: 7702 + if (var45 != null) { var45.renderable = new DynamicObject(PacketWriter.Entity_unpackID(var45.tag), var7, var8, class20.Client_plane, var39, var40, var37, false, var45.renderable); } } - if (var9 == 3) { // L: 7704 - FloorDecoration var46 = class7.scene.getFloorDecoration(class20.Client_plane, var39, var40); // L: 7705 - if (var46 != null) { // L: 7706 + if (var9 == 3) { + FloorDecoration var46 = class7.scene.getFloorDecoration(class20.Client_plane, var39, var40); + if (var46 != null) { var46.renderable = new DynamicObject(PacketWriter.Entity_unpackID(var46.tag), 22, var8, class20.Client_plane, var39, var40, var37, false, var46.renderable); } } @@ -121,228 +121,228 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier { int var12; int var13; int var14; - if (class253.field2913 == var0) { // L: 7711 - byte var2 = var1.method7396(); // L: 7712 - byte var3 = var1.readByte(); // L: 7713 - byte var4 = var1.method7396(); // L: 7714 - byte var5 = var1.readByte(); // L: 7715 - var6 = var1.readUnsignedShort(); // L: 7716 - var7 = var1.method7499(); // L: 7717 - var8 = var1.readUnsignedShort(); // L: 7718 - var9 = var1.method7520(); // L: 7719 - var10 = (var9 >> 4 & 7) + class17.field90; // L: 7720 - var11 = (var9 & 7) + class167.field1813; // L: 7721 - var12 = var1.method7392(); // L: 7722 - var13 = var12 >> 2; // L: 7723 - var14 = var12 & 3; // L: 7724 - int var15 = Client.field537[var13]; // L: 7725 - int var16 = var1.method7401(); // L: 7726 + if (class253.field2913 == var0) { + byte var2 = var1.method7396(); + byte var3 = var1.readByte(); + byte var4 = var1.method7396(); + byte var5 = var1.readByte(); + var6 = var1.readUnsignedShort(); + var7 = var1.method7499(); + var8 = var1.readUnsignedShort(); + var9 = var1.method7520(); + var10 = (var9 >> 4 & 7) + class17.field90; + var11 = (var9 & 7) + class167.field1813; + var12 = var1.method7392(); + var13 = var12 >> 2; + var14 = var12 & 3; + int var15 = Client.field537[var13]; + int var16 = var1.method7401(); Player var17; - if (var16 == Client.localPlayerIndex) { // L: 7728 + if (var16 == Client.localPlayerIndex) { var17 = class340.localPlayer; } else { - var17 = Client.players[var16]; // L: 7729 + var17 = Client.players[var16]; } - if (var17 != null) { // L: 7730 - ObjectComposition var18 = class148.getObjectDefinition(var6); // L: 7731 + if (var17 != null) { + ObjectComposition var18 = class148.getObjectDefinition(var6); int var19; int var20; - if (var14 != 1 && var14 != 3) { // L: 7734 - var19 = var18.sizeX; // L: 7739 - var20 = var18.sizeY; // L: 7740 + if (var14 != 1 && var14 != 3) { + var19 = var18.sizeX; + var20 = var18.sizeY; } else { - var19 = var18.sizeY; // L: 7735 - var20 = var18.sizeX; // L: 7736 + var19 = var18.sizeY; + var20 = var18.sizeX; } - int var21 = var10 + (var19 >> 1); // L: 7742 - int var22 = var10 + (var19 + 1 >> 1); // L: 7743 - int var23 = var11 + (var20 >> 1); // L: 7744 - int var24 = var11 + (var20 + 1 >> 1); // L: 7745 - int[][] var25 = Tiles.Tiles_heights[class20.Client_plane]; // L: 7746 - int var26 = var25[var22][var24] + var25[var22][var23] + var25[var21][var23] + var25[var21][var24] >> 2; // L: 7747 - int var27 = (var10 << 7) + (var19 << 6); // L: 7748 - int var28 = (var11 << 7) + (var20 << 6); // L: 7749 - Model var29 = var18.getModel(var13, var14, var25, var27, var26, var28); // L: 7750 - if (var29 != null) { // L: 7751 - Varcs.updatePendingSpawn(class20.Client_plane, var10, var11, var15, -1, 0, 0, var7 + 1, var8 + 1); // L: 7752 - var17.animationCycleStart = var7 + Client.cycle; // L: 7753 - var17.animationCycleEnd = var8 + Client.cycle; // L: 7754 - var17.model0 = var29; // L: 7755 - var17.field1056 = var19 * 64 + var10 * 128; // L: 7756 - var17.field1058 = var20 * 64 + var11 * 128; // L: 7757 - var17.tileHeight2 = var26; // L: 7758 + int var21 = var10 + (var19 >> 1); + int var22 = var10 + (var19 + 1 >> 1); + int var23 = var11 + (var20 >> 1); + int var24 = var11 + (var20 + 1 >> 1); + int[][] var25 = Tiles.Tiles_heights[class20.Client_plane]; + int var26 = var25[var22][var24] + var25[var22][var23] + var25[var21][var23] + var25[var21][var24] >> 2; + int var27 = (var10 << 7) + (var19 << 6); + int var28 = (var11 << 7) + (var20 << 6); + Model var29 = var18.getModel(var13, var14, var25, var27, var26, var28); + if (var29 != null) { + Varcs.updatePendingSpawn(class20.Client_plane, var10, var11, var15, -1, 0, 0, var7 + 1, var8 + 1); + var17.animationCycleStart = var7 + Client.cycle; + var17.animationCycleEnd = var8 + Client.cycle; + var17.model0 = var29; + var17.field1056 = var19 * 64 + var10 * 128; + var17.field1058 = var20 * 64 + var11 * 128; + var17.tileHeight2 = var26; byte var30; - if (var3 > var2) { // L: 7759 - var30 = var3; // L: 7760 - var3 = var2; // L: 7761 - var2 = var30; // L: 7762 + if (var3 > var2) { + var30 = var3; + var3 = var2; + var2 = var30; } - if (var5 > var4) { // L: 7764 - var30 = var5; // L: 7765 - var5 = var4; // L: 7766 - var4 = var30; // L: 7767 + if (var5 > var4) { + var30 = var5; + var5 = var4; + var4 = var30; } - var17.minX = var10 + var3; // L: 7769 - var17.maxX = var10 + var2; // L: 7770 - var17.minY = var11 + var5; // L: 7771 - var17.maxY = var4 + var11; // L: 7772 + var17.minX = var10 + var3; + var17.maxX = var10 + var2; + var17.minY = var11 + var5; + var17.maxY = var4 + var11; } } } - if (class253.field2920 == var0) { // L: 7776 - var37 = var1.method7392(); // L: 7777 - var38 = (var37 >> 4 & 7) + class17.field90; // L: 7778 - var39 = (var37 & 7) + class167.field1813; // L: 7779 - var40 = var1.method7404(); // L: 7780 - byte var41 = var1.method7396(); // L: 7781 - var7 = var1.readUnsignedShort(); // L: 7782 - var8 = var1.readUnsignedByte(); // L: 7783 - var9 = var1.method7401(); // L: 7784 - var10 = var1.readUnsignedByte() * 4; // L: 7785 - var11 = var1.method7520(); // L: 7786 - var12 = var1.method7403(); // L: 7787 - var13 = var1.readUnsignedByte() * 4; // L: 7788 - byte var42 = var1.method7465(); // L: 7789 - var6 = var41 + var38; // L: 7790 - var14 = var42 + var39; // L: 7791 - if (var38 >= 0 && var39 >= 0 && var38 < 104 && var39 < 104 && var6 >= 0 && var14 >= 0 && var6 < 104 && var14 < 104 && var9 != 65535) { // L: 7792 - var38 = var38 * 128 + 64; // L: 7793 - var39 = var39 * 128 + 64; // L: 7794 - var6 = var6 * 128 + 64; // L: 7795 - var14 = var14 * 128 + 64; // L: 7796 - Projectile var35 = new Projectile(var9, class20.Client_plane, var38, var39, FaceNormal.getTileHeight(var38, var39, class20.Client_plane) - var10, var12 + Client.cycle, var7 + Client.cycle, var11, var8, var40, var13); // L: 7797 - var35.setDestination(var6, var14, FaceNormal.getTileHeight(var6, var14, class20.Client_plane) - var13, var12 + Client.cycle); // L: 7798 - Client.projectiles.addFirst(var35); // L: 7799 + if (class253.field2920 == var0) { + var37 = var1.method7392(); + var38 = (var37 >> 4 & 7) + class17.field90; + var39 = (var37 & 7) + class167.field1813; + var40 = var1.method7404(); + byte var41 = var1.method7396(); + var7 = var1.readUnsignedShort(); + var8 = var1.readUnsignedByte(); + var9 = var1.method7401(); + var10 = var1.readUnsignedByte() * 4; + var11 = var1.method7520(); + var12 = var1.method7403(); + var13 = var1.readUnsignedByte() * 4; + byte var42 = var1.method7465(); + var6 = var41 + var38; + var14 = var42 + var39; + if (var38 >= 0 && var39 >= 0 && var38 < 104 && var39 < 104 && var6 >= 0 && var14 >= 0 && var6 < 104 && var14 < 104 && var9 != 65535) { + var38 = var38 * 128 + 64; + var39 = var39 * 128 + 64; + var6 = var6 * 128 + 64; + var14 = var14 * 128 + 64; + Projectile var35 = new Projectile(var9, class20.Client_plane, var38, var39, FaceNormal.getTileHeight(var38, var39, class20.Client_plane) - var10, var12 + Client.cycle, var7 + Client.cycle, var11, var8, var40, var13); + var35.setDestination(var6, var14, FaceNormal.getTileHeight(var6, var14, class20.Client_plane) - var13, var12 + Client.cycle); + Client.projectiles.addFirst(var35); } - } else if (class253.field2916 == var0) { // L: 7803 - var37 = var1.method7394(); // L: 7804 - var38 = var37 >> 2; // L: 7805 - var39 = var37 & 3; // L: 7806 - var40 = Client.field537[var38]; // L: 7807 - var6 = var1.method7394(); // L: 7808 - var7 = (var6 >> 4 & 7) + class17.field90; // L: 7809 - var8 = (var6 & 7) + class167.field1813; // L: 7810 - var9 = var1.method7403(); // L: 7811 - if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { // L: 7812 - Varcs.updatePendingSpawn(class20.Client_plane, var7, var8, var40, var9, var38, var39, 0, -1); // L: 7813 + } else if (class253.field2916 == var0) { + var37 = var1.method7394(); + var38 = var37 >> 2; + var39 = var37 & 3; + var40 = Client.field537[var38]; + var6 = var1.method7394(); + var7 = (var6 >> 4 & 7) + class17.field90; + var8 = (var6 & 7) + class167.field1813; + var9 = var1.method7403(); + if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { + Varcs.updatePendingSpawn(class20.Client_plane, var7, var8, var40, var9, var38, var39, 0, -1); } - } else if (class253.field2918 == var0) { // L: 7817 - var37 = var1.readUnsignedByte(); // L: 7818 - var38 = var37 >> 2; // L: 7819 - var39 = var37 & 3; // L: 7820 - var40 = Client.field537[var38]; // L: 7821 - var6 = var1.method7392(); // L: 7822 - var7 = (var6 >> 4 & 7) + class17.field90; // L: 7823 - var8 = (var6 & 7) + class167.field1813; // L: 7824 - if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { // L: 7825 - Varcs.updatePendingSpawn(class20.Client_plane, var7, var8, var40, -1, var38, var39, 0, -1); // L: 7826 + } else if (class253.field2918 == var0) { + var37 = var1.readUnsignedByte(); + var38 = var37 >> 2; + var39 = var37 & 3; + var40 = Client.field537[var38]; + var6 = var1.method7392(); + var7 = (var6 >> 4 & 7) + class17.field90; + var8 = (var6 & 7) + class167.field1813; + if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { + Varcs.updatePendingSpawn(class20.Client_plane, var7, var8, var40, -1, var38, var39, 0, -1); } } else { TileItem var33; - if (class253.field2917 == var0) { // L: 7830 - var37 = var1.method7392(); // L: 7831 - var38 = (var37 >> 4 & 7) + class17.field90; // L: 7832 - var39 = (var37 & 7) + class167.field1813; // L: 7833 - var40 = var1.method7401(); // L: 7834 - if (var38 >= 0 && var39 >= 0 && var38 < 104 && var39 < 104) { // L: 7835 - NodeDeque var34 = Client.groundItems[class20.Client_plane][var38][var39]; // L: 7836 - if (var34 != null) { // L: 7837 - for (var33 = (TileItem)var34.last(); var33 != null; var33 = (TileItem)var34.previous()) { // L: 7838 7839 7844 - if ((var40 & 32767) == var33.id) { // L: 7840 - var33.remove(); // L: 7841 + if (class253.field2917 == var0) { + var37 = var1.method7392(); + var38 = (var37 >> 4 & 7) + class17.field90; + var39 = (var37 & 7) + class167.field1813; + var40 = var1.method7401(); + if (var38 >= 0 && var39 >= 0 && var38 < 104 && var39 < 104) { + NodeDeque var34 = Client.groundItems[class20.Client_plane][var38][var39]; + if (var34 != null) { + for (var33 = (TileItem)var34.last(); var33 != null; var33 = (TileItem)var34.previous()) { + if ((var40 & 32767) == var33.id) { + var33.remove(); break; } } - if (var34.last() == null) { // L: 7846 + if (var34.last() == null) { Client.groundItems[class20.Client_plane][var38][var39] = null; } - MouseHandler.updateItemPile(var38, var39); // L: 7847 + MouseHandler.updateItemPile(var38, var39); } } - } else if (class253.field2914 == var0) { // L: 7852 - var37 = var1.readUnsignedShort(); // L: 7853 - var38 = var1.method7394(); // L: 7854 - var39 = (var38 >> 4 & 7) + class17.field90; // L: 7855 - var40 = (var38 & 7) + class167.field1813; // L: 7856 - var6 = var1.method7401(); // L: 7857 - if (var39 >= 0 && var40 >= 0 && var39 < 104 && var40 < 104) { // L: 7858 - var33 = new TileItem(); // L: 7859 - var33.id = var37; // L: 7860 - var33.quantity = var6; // L: 7861 - if (Client.groundItems[class20.Client_plane][var39][var40] == null) { // L: 7862 + } else if (class253.field2914 == var0) { + var37 = var1.readUnsignedShort(); + var38 = var1.method7394(); + var39 = (var38 >> 4 & 7) + class17.field90; + var40 = (var38 & 7) + class167.field1813; + var6 = var1.method7401(); + if (var39 >= 0 && var40 >= 0 && var39 < 104 && var40 < 104) { + var33 = new TileItem(); + var33.id = var37; + var33.quantity = var6; + if (Client.groundItems[class20.Client_plane][var39][var40] == null) { Client.groundItems[class20.Client_plane][var39][var40] = new NodeDeque(); } - Client.groundItems[class20.Client_plane][var39][var40].addFirst(var33); // L: 7863 - MouseHandler.updateItemPile(var39, var40); // L: 7864 + Client.groundItems[class20.Client_plane][var39][var40].addFirst(var33); + MouseHandler.updateItemPile(var39, var40); } - } else if (class253.field2912 == var0) { // L: 7868 - var37 = var1.method7392(); // L: 7869 - var38 = (var37 >> 4 & 7) + class17.field90; // L: 7870 - var39 = (var37 & 7) + class167.field1813; // L: 7871 - var40 = var1.method7403(); // L: 7872 - var6 = var1.method7520(); // L: 7873 - var7 = var1.readUnsignedShort(); // L: 7874 - if (var38 >= 0 && var39 >= 0 && var38 < 104 && var39 < 104) { // L: 7875 - var38 = var38 * 128 + 64; // L: 7876 - var39 = var39 * 128 + 64; // L: 7877 - GraphicsObject var43 = new GraphicsObject(var40, class20.Client_plane, var38, var39, FaceNormal.getTileHeight(var38, var39, class20.Client_plane) - var6, var7, Client.cycle); // L: 7878 - Client.graphicsObjects.addFirst(var43); // L: 7879 + } else if (class253.field2912 == var0) { + var37 = var1.method7392(); + var38 = (var37 >> 4 & 7) + class17.field90; + var39 = (var37 & 7) + class167.field1813; + var40 = var1.method7403(); + var6 = var1.method7520(); + var7 = var1.readUnsignedShort(); + if (var38 >= 0 && var39 >= 0 && var38 < 104 && var39 < 104) { + var38 = var38 * 128 + 64; + var39 = var39 * 128 + 64; + GraphicsObject var43 = new GraphicsObject(var40, class20.Client_plane, var38, var39, FaceNormal.getTileHeight(var38, var39, class20.Client_plane) - var6, var7, Client.cycle); + Client.graphicsObjects.addFirst(var43); } } else { - if (class253.field2915 == var0) { // L: 7883 - var37 = var1.readUnsignedByte(); // L: 7884 - var38 = var37 >> 4 & 15; // L: 7885 - var39 = var37 & 7; // L: 7886 - var40 = var1.method7392(); // L: 7887 - var6 = var1.readUnsignedByte(); // L: 7888 - var7 = (var6 >> 4 & 7) + class17.field90; // L: 7889 - var8 = (var6 & 7) + class167.field1813; // L: 7890 - var9 = var1.method7499(); // L: 7891 - if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { // L: 7892 - var10 = var38 + 1; // L: 7893 - if (class340.localPlayer.pathX[0] >= var7 - var10 && class340.localPlayer.pathX[0] <= var10 + var7 && class340.localPlayer.pathY[0] >= var8 - var10 && class340.localPlayer.pathY[0] <= var10 + var8 && SecureRandomFuture.clientPreferences.areaSoundEffectsVolume != 0 && var39 > 0 && Client.soundEffectCount < 50) { // L: 7894 7895 - Client.soundEffectIds[Client.soundEffectCount] = var9; // L: 7896 - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var39; // L: 7897 - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var40; // L: 7898 - Client.soundEffects[Client.soundEffectCount] = null; // L: 7899 - Client.soundLocations[Client.soundEffectCount] = var38 + (var8 << 8) + (var7 << 16); // L: 7900 - ++Client.soundEffectCount; // L: 7901 + if (class253.field2915 == var0) { + var37 = var1.readUnsignedByte(); + var38 = var37 >> 4 & 15; + var39 = var37 & 7; + var40 = var1.method7392(); + var6 = var1.readUnsignedByte(); + var7 = (var6 >> 4 & 7) + class17.field90; + var8 = (var6 & 7) + class167.field1813; + var9 = var1.method7499(); + if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { + var10 = var38 + 1; + if (class340.localPlayer.pathX[0] >= var7 - var10 && class340.localPlayer.pathX[0] <= var10 + var7 && class340.localPlayer.pathY[0] >= var8 - var10 && class340.localPlayer.pathY[0] <= var10 + var8 && SecureRandomFuture.clientPreferences.areaSoundEffectsVolume != 0 && var39 > 0 && Client.soundEffectCount < 50) { + Client.soundEffectIds[Client.soundEffectCount] = var9; + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var39; + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var40; + Client.soundEffects[Client.soundEffectCount] = null; + Client.soundLocations[Client.soundEffectCount] = var38 + (var8 << 8) + (var7 << 16); + ++Client.soundEffectCount; } } } - if (class253.field2919 == var0) { // L: 7906 - var37 = var1.readUnsignedShort(); // L: 7907 - var38 = var1.method7499(); // L: 7908 - var39 = var1.method7392(); // L: 7909 - var40 = (var39 >> 4 & 7) + class17.field90; // L: 7910 - var6 = (var39 & 7) + class167.field1813; // L: 7911 - var7 = var1.method7401(); // L: 7912 - if (var40 >= 0 && var6 >= 0 && var40 < 104 && var6 < 104) { // L: 7913 - NodeDeque var31 = Client.groundItems[class20.Client_plane][var40][var6]; // L: 7914 - if (var31 != null) { // L: 7915 - for (TileItem var32 = (TileItem)var31.last(); var32 != null; var32 = (TileItem)var31.previous()) { // L: 7916 7917 7922 - if ((var7 & 32767) == var32.id && var38 == var32.quantity) { // L: 7918 - var32.quantity = var37; // L: 7919 + if (class253.field2919 == var0) { + var37 = var1.readUnsignedShort(); + var38 = var1.method7499(); + var39 = var1.method7392(); + var40 = (var39 >> 4 & 7) + class17.field90; + var6 = (var39 & 7) + class167.field1813; + var7 = var1.method7401(); + if (var40 >= 0 && var6 >= 0 && var40 < 104 && var6 < 104) { + NodeDeque var31 = Client.groundItems[class20.Client_plane][var40][var6]; + if (var31 != null) { + for (TileItem var32 = (TileItem)var31.last(); var32 != null; var32 = (TileItem)var31.previous()) { + if ((var7 & 32767) == var32.id && var38 == var32.quantity) { + var32.quantity = var37; break; } } - MouseHandler.updateItemPile(var40, var6); // L: 7924 + MouseHandler.updateItemPile(var40, var6); } } @@ -350,5 +350,5 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier { } } } - } // L: 7709 7801 7815 7828 7850 7866 7881 7927 7929 + } } diff --git a/runescape-client/src/main/java/DirectWrapper.java b/runescape-client/src/main/java/DirectWrapper.java index fe4ac026db..97661e60cc 100644 --- a/runescape-client/src/main/java/DirectWrapper.java +++ b/runescape-client/src/main/java/DirectWrapper.java @@ -10,19 +10,19 @@ public class DirectWrapper extends Wrapper { Object obj; DirectWrapper(Object var1, int var2) { - super(var2); // L: 7 - this.obj = var1; // L: 8 - } // L: 9 + super(var2); + this.obj = var1; + } @ObfuscatedName("c") @Export("get") Object get() { - return this.obj; // L: 12 + return this.obj; } @ObfuscatedName("b") @Export("isSoft") boolean isSoft() { - return false; // L: 16 + return false; } } diff --git a/runescape-client/src/main/java/DualNode.java b/runescape-client/src/main/java/DualNode.java index d84195a7cc..0ef980af8f 100644 --- a/runescape-client/src/main/java/DualNode.java +++ b/runescape-client/src/main/java/DualNode.java @@ -25,11 +25,11 @@ public class DualNode extends Node { @ObfuscatedName("do") @Export("removeDual") public void removeDual() { - if (this.nextDual != null) { // L: 9 - this.nextDual.previousDual = this.previousDual; // L: 10 - this.previousDual.nextDual = this.nextDual; // L: 11 - this.previousDual = null; // L: 12 - this.nextDual = null; // L: 13 + if (this.nextDual != null) { + this.nextDual.previousDual = this.previousDual; + this.previousDual.nextDual = this.nextDual; + this.previousDual = null; + this.nextDual = null; } - } // L: 14 + } } diff --git a/runescape-client/src/main/java/DualNodeDeque.java b/runescape-client/src/main/java/DualNodeDeque.java index 2c0f38a4cc..0760b88c3f 100644 --- a/runescape-client/src/main/java/DualNodeDeque.java +++ b/runescape-client/src/main/java/DualNodeDeque.java @@ -14,10 +14,10 @@ public final class DualNodeDeque { DualNode sentinel; public DualNodeDeque() { - this.sentinel = new DualNode(); // L: 6 - this.sentinel.previousDual = this.sentinel; // L: 9 - this.sentinel.nextDual = this.sentinel; // L: 10 - } // L: 11 + this.sentinel = new DualNode(); + this.sentinel.previousDual = this.sentinel; + this.sentinel.nextDual = this.sentinel; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -25,15 +25,15 @@ public final class DualNodeDeque { ) @Export("addFirst") public void addFirst(DualNode var1) { - if (var1.nextDual != null) { // L: 14 + if (var1.nextDual != null) { var1.removeDual(); } - var1.nextDual = this.sentinel.nextDual; // L: 15 - var1.previousDual = this.sentinel; // L: 16 - var1.nextDual.previousDual = var1; // L: 17 - var1.previousDual.nextDual = var1; // L: 18 - } // L: 19 + var1.nextDual = this.sentinel.nextDual; + var1.previousDual = this.sentinel; + var1.nextDual.previousDual = var1; + var1.previousDual.nextDual = var1; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -41,15 +41,15 @@ public final class DualNodeDeque { ) @Export("addLast") public void addLast(DualNode var1) { - if (var1.nextDual != null) { // L: 22 + if (var1.nextDual != null) { var1.removeDual(); } - var1.nextDual = this.sentinel; // L: 23 - var1.previousDual = this.sentinel.previousDual; // L: 24 - var1.nextDual.previousDual = var1; // L: 25 - var1.previousDual.nextDual = var1; // L: 26 - } // L: 27 + var1.nextDual = this.sentinel; + var1.previousDual = this.sentinel.previousDual; + var1.nextDual.previousDual = var1; + var1.previousDual.nextDual = var1; + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -57,7 +57,7 @@ public final class DualNodeDeque { ) @Export("removeLast") public DualNode removeLast() { - DualNode var1 = this.sentinel.previousDual; // L: 30 - return var1 == this.sentinel ? null : var1; // L: 31 32 + DualNode var1 = this.sentinel.previousDual; + return var1 == this.sentinel ? null : var1; } } diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index 9a82337678..fe99a6d7a0 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -69,36 +69,36 @@ public class DynamicObject extends Renderable { descriptor = "(IIIIIIIZLgt;)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 - this.type = var2; // L: 21 - this.orientation = var3; // L: 22 - this.plane = var4; // L: 23 - this.x = var5; // L: 24 - this.y = var6; // L: 25 - if (var7 != -1) { // L: 26 - this.sequenceDefinition = UserComparator5.SequenceDefinition_get(var7); // L: 27 - this.frame = 0; // L: 28 - this.cycleStart = Client.cycle - 1; // L: 29 - if (this.sequenceDefinition.field2078 == 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 - this.cycleStart = var10.cycleStart; // L: 34 - return; // L: 35 + this.id = var1; + this.type = var2; + this.orientation = var3; + this.plane = var4; + this.x = var5; + this.y = var6; + if (var7 != -1) { + this.sequenceDefinition = UserComparator5.SequenceDefinition_get(var7); + this.frame = 0; + this.cycleStart = Client.cycle - 1; + if (this.sequenceDefinition.field2078 == 0 && var9 != null && var9 instanceof DynamicObject) { + DynamicObject var10 = (DynamicObject)var9; + if (this.sequenceDefinition == var10.sequenceDefinition) { + this.frame = var10.frame; + this.cycleStart = var10.cycleStart; + return; } } - if (var8 && this.sequenceDefinition.frameCount != -1) { // L: 38 - if (!this.sequenceDefinition.method3690()) { // L: 39 - 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 + if (var8 && this.sequenceDefinition.frameCount != -1) { + if (!this.sequenceDefinition.method3690()) { + this.frame = (int)(Math.random() * (double)this.sequenceDefinition.frameIds.length); + this.cycleStart -= (int)(Math.random() * (double)this.sequenceDefinition.frameLengths[this.frame]); } else { - this.frame = (int)(Math.random() * (double)this.sequenceDefinition.method3647()); // L: 44 + this.frame = (int)(Math.random() * (double)this.sequenceDefinition.method3647()); } } } - } // L: 48 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -108,19 +108,19 @@ public class DynamicObject extends Renderable { @Export("getModel") protected final Model getModel() { int var2; - if (this.sequenceDefinition != null) { // L: 51 - int var1 = Client.cycle - this.cycleStart; // L: 52 - if (var1 > 100 && this.sequenceDefinition.frameCount > 0) { // L: 53 + if (this.sequenceDefinition != null) { + int var1 = Client.cycle - this.cycleStart; + if (var1 > 100 && this.sequenceDefinition.frameCount > 0) { var1 = 100; } - if (this.sequenceDefinition.method3690()) { // L: 54 - var2 = this.sequenceDefinition.method3647(); // L: 68 - this.frame += var1; // L: 69 - var1 = 0; // L: 70 - if (this.frame >= var2) { // L: 71 - this.frame = var2 - this.sequenceDefinition.frameCount; // L: 72 - if (this.frame < 0 || this.frame > var2) { // L: 73 + if (this.sequenceDefinition.method3690()) { + var2 = this.sequenceDefinition.method3647(); + this.frame += var1; + var1 = 0; + if (this.frame >= var2) { + this.frame = var2 - this.sequenceDefinition.frameCount; + if (this.frame < 0 || this.frame > var2) { this.sequenceDefinition = null; } } @@ -128,22 +128,22 @@ public class DynamicObject extends Renderable { label79: { do { do { - if (var1 <= this.sequenceDefinition.frameLengths[this.frame]) { // L: 55 + if (var1 <= this.sequenceDefinition.frameLengths[this.frame]) { break label79; } - var1 -= this.sequenceDefinition.frameLengths[this.frame]; // L: 56 - ++this.frame; // L: 57 - } while(this.frame < this.sequenceDefinition.frameIds.length); // L: 58 + var1 -= this.sequenceDefinition.frameLengths[this.frame]; + ++this.frame; + } while(this.frame < this.sequenceDefinition.frameIds.length); - this.frame -= this.sequenceDefinition.frameCount; // L: 59 - } while(this.frame >= 0 && this.frame < this.sequenceDefinition.frameIds.length); // L: 60 + this.frame -= this.sequenceDefinition.frameCount; + } while(this.frame >= 0 && this.frame < this.sequenceDefinition.frameIds.length); - this.sequenceDefinition = null; // L: 61 + this.sequenceDefinition = null; } } - this.cycleStart = Client.cycle - var1; // L: 78 + this.cycleStart = Client.cycle - var1; } ObjectComposition var12 = class148.getObjectDefinition(this.id); @@ -151,27 +151,27 @@ public class DynamicObject extends Renderable { var12 = var12.transform(); } - if (var12 == null) { // L: 82 + if (var12 == null) { return null; } else { int var3; if (this.orientation != 1 && this.orientation != 3) { - var2 = var12.sizeX; // L: 90 + var2 = var12.sizeX; var3 = var12.sizeY; } else { - var2 = var12.sizeY; // L: 86 + var2 = var12.sizeY; var3 = var12.sizeX; } int var4 = (var2 >> 1) + this.x; - int var5 = (var2 + 1 >> 1) + this.x; // L: 94 + int var5 = (var2 + 1 >> 1) + this.x; int var6 = (var3 >> 1) + this.y; - int var7 = (var3 + 1 >> 1) + this.y; // L: 96 - int[][] var8 = Tiles.Tiles_heights[this.plane]; // L: 97 - int var9 = var8[var4][var7] + var8[var4][var6] + var8[var5][var6] + var8[var5][var7] >> 2; // L: 98 - int var10 = (this.x << 7) + (var2 << 6); // L: 99 - int var11 = (this.y << 7) + (var3 << 6); // L: 100 - return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame); // L: 101 + int var7 = (var3 + 1 >> 1) + this.y; + int[][] var8 = Tiles.Tiles_heights[this.plane]; + int var9 = var8[var4][var7] + var8[var4][var6] + var8[var5][var6] + var8[var5][var7] >> 2; + int var10 = (this.x << 7) + (var2 << 6); + int var11 = (this.y << 7) + (var3 << 6); + return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame); } } @@ -182,32 +182,32 @@ public class DynamicObject extends Renderable { ) @Export("iLog") public static int iLog(int var0) { - int var1 = 0; // L: 74 - if (var0 < 0 || var0 >= 65536) { // L: 75 - var0 >>>= 16; // L: 76 - var1 += 16; // L: 77 + int var1 = 0; + if (var0 < 0 || var0 >= 65536) { + var0 >>>= 16; + var1 += 16; } - if (var0 >= 256) { // L: 79 - var0 >>>= 8; // L: 80 - var1 += 8; // L: 81 + if (var0 >= 256) { + var0 >>>= 8; + var1 += 8; } - if (var0 >= 16) { // L: 83 - var0 >>>= 4; // L: 84 - var1 += 4; // L: 85 + if (var0 >= 16) { + var0 >>>= 4; + var1 += 4; } - if (var0 >= 4) { // L: 87 - var0 >>>= 2; // L: 88 - var1 += 2; // L: 89 + if (var0 >= 4) { + var0 >>>= 2; + var1 += 2; } - if (var0 >= 1) { // L: 91 - var0 >>>= 1; // L: 92 - ++var1; // L: 93 + if (var0 >= 1) { + var0 >>>= 1; + ++var1; } - return var0 + var1; // L: 95 + return var0 + var1; } } diff --git a/runescape-client/src/main/java/EnumComposition.java b/runescape-client/src/main/java/EnumComposition.java index 314114dda5..395ddd07ac 100644 --- a/runescape-client/src/main/java/EnumComposition.java +++ b/runescape-client/src/main/java/EnumComposition.java @@ -51,13 +51,13 @@ public class EnumComposition extends DualNode { public String[] strVals; static { - EnumDefinition_cached = new EvictingDualNodeHashTable(64); // L: 12 + EnumDefinition_cached = new EvictingDualNodeHashTable(64); } EnumComposition() { - this.defaultStr = "null"; // L: 15 - this.outputCount = 0; // L: 17 - } // L: 22 + this.defaultStr = "null"; + this.outputCount = 0; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -67,12 +67,12 @@ public class EnumComposition extends DualNode { @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 36 - if (var2 == 0) { // L: 37 - return; // L: 40 + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; } - this.decodeNext(var1, var2); // L: 38 + this.decodeNext(var1, var2); } } @@ -83,38 +83,38 @@ public class EnumComposition extends DualNode { ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 43 + if (var2 == 1) { this.inputType = (char)var1.readUnsignedByte(); - } else if (var2 == 2) { // L: 44 + } else if (var2 == 2) { this.outputType = (char)var1.readUnsignedByte(); - } else if (var2 == 3) { // L: 45 + } else if (var2 == 3) { this.defaultStr = var1.readStringCp1252NullTerminated(); - } else if (var2 == 4) { // L: 46 + } else if (var2 == 4) { this.defaultInt = var1.readInt(); } else { int var3; - 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 + if (var2 == 5) { + this.outputCount = var1.readUnsignedShort(); + this.keys = new int[this.outputCount]; + this.strVals = new String[this.outputCount]; - for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 51 - this.keys[var3] = var1.readInt(); // L: 52 - this.strVals[var3] = var1.readStringCp1252NullTerminated(); // L: 53 + for (var3 = 0; var3 < this.outputCount; ++var3) { + this.keys[var3] = var1.readInt(); + this.strVals[var3] = var1.readStringCp1252NullTerminated(); } - } 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 + } else if (var2 == 6) { + this.outputCount = var1.readUnsignedShort(); + this.keys = new int[this.outputCount]; + this.intVals = new int[this.outputCount]; - for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 60 - this.keys[var3] = var1.readInt(); // L: 61 - this.intVals[var3] = var1.readInt(); // L: 62 + for (var3 = 0; var3 < this.outputCount; ++var3) { + this.keys[var3] = var1.readInt(); + this.intVals[var3] = var1.readInt(); } } } - } // L: 66 + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -123,7 +123,7 @@ public class EnumComposition extends DualNode { ) @Export("size") public int size() { - return this.outputCount; // L: 69 + return this.outputCount; } @ObfuscatedName("o") @@ -133,128 +133,128 @@ public class EnumComposition extends DualNode { ) @Export("getItemSprite") public static final SpritePixels getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { - if (var1 == -1) { // L: 357 + if (var1 == -1) { var4 = 0; - } else if (var4 == 2 && var1 != 1) { // L: 358 + } else if (var4 == 2 && var1 != 1) { var4 = 1; } - long var6 = ((long)var4 << 40) + ((long)var2 << 38) + ((long)var1 << 16) + (long)var0 + ((long)var3 << 42); // L: 359 + long var6 = ((long)var4 << 40) + ((long)var2 << 38) + ((long)var1 << 16) + (long)var0 + ((long)var3 << 42); SpritePixels var8; - if (!var5) { // L: 361 - var8 = (SpritePixels)ItemComposition.ItemDefinition_cachedSprites.get(var6); // L: 362 - if (var8 != null) { // L: 363 + if (!var5) { + var8 = (SpritePixels)ItemComposition.ItemDefinition_cachedSprites.get(var6); + if (var8 != null) { return var8; } } - ItemComposition var9 = UserComparator6.ItemDefinition_get(var0); // L: 365 - if (var1 > 1 && var9.countobj != null) { // L: 366 - int var10 = -1; // L: 367 + ItemComposition var9 = UserComparator6.ItemDefinition_get(var0); + if (var1 > 1 && var9.countobj != null) { + int var10 = -1; - for (int var11 = 0; var11 < 10; ++var11) { // L: 368 - if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { // L: 369 + for (int var11 = 0; var11 < 10; ++var11) { + if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { var10 = var9.countobj[var11]; } } - if (var10 != -1) { // L: 371 + if (var10 != -1) { var9 = UserComparator6.ItemDefinition_get(var10); } } - Model var21 = var9.getModel(1); // L: 373 - if (var21 == null) { // L: 374 + Model var21 = var9.getModel(1); + if (var21 == null) { return null; } else { - SpritePixels var22 = null; // L: 375 - if (var9.noteTemplate != -1) { // L: 376 - var22 = getItemSprite(var9.note, 10, 1, 0, 0, true); // L: 377 - if (var22 == null) { // L: 378 + SpritePixels var22 = null; + if (var9.noteTemplate != -1) { + var22 = getItemSprite(var9.note, 10, 1, 0, 0, true); + if (var22 == null) { return null; } - } else if (var9.notedId != -1) { // L: 380 - var22 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); // L: 381 - if (var22 == null) { // L: 382 + } else if (var9.notedId != -1) { + var22 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); + if (var22 == null) { return null; } - } else if (var9.placeholderTemplate != -1) { // L: 384 - var22 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); // L: 385 - if (var22 == null) { // L: 386 + } else if (var9.placeholderTemplate != -1) { + var22 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); + if (var22 == null) { 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.method3913(16, 16); // L: 397 - Rasterizer3D.field2276 = false; // L: 398 - if (var9.placeholderTemplate != -1) { // L: 399 + int[] var12 = Rasterizer2D.Rasterizer2D_pixels; + int var13 = Rasterizer2D.Rasterizer2D_width; + int var14 = Rasterizer2D.Rasterizer2D_height; + int[] var15 = new int[4]; + Rasterizer2D.Rasterizer2D_getClipArray(var15); + var8 = new SpritePixels(36, 32); + Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); + Rasterizer2D.Rasterizer2D_clear(); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); + Rasterizer3D.method3913(16, 16); + Rasterizer3D.field2276 = false; + if (var9.placeholderTemplate != -1) { var22.drawTransBgAt(0, 0); } - int var16 = var9.zoom2d; // L: 400 - if (var5) { // L: 401 + int var16 = var9.zoom2d; + if (var5) { var16 = (int)(1.5D * (double)var16); - } else if (var2 == 2) { // L: 402 + } else if (var2 == 2) { var16 = (int)((double)var16 * 1.04D); } - int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; // L: 403 - int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; // L: 404 - var21.calculateBoundsCylinder(); // L: 405 - var21.method4241(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var21.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); // L: 406 - if (var9.notedId != -1) { // L: 407 + int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; + int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; + var21.calculateBoundsCylinder(); + var21.method4241(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var21.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); + if (var9.notedId != -1) { var22.drawTransBgAt(0, 0); } - if (var2 >= 1) { // L: 408 + if (var2 >= 1) { var8.outline(1); } - if (var2 >= 2) { // L: 409 + if (var2 >= 2) { var8.outline(16777215); } - if (var3 != 0) { // L: 410 + if (var3 != 0) { var8.shadow(var3); } - Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 411 - if (var9.noteTemplate != -1) { // L: 412 + Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); + if (var9.noteTemplate != -1) { var22.drawTransBgAt(0, 0); } - if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { // L: 413 - Font var19 = ItemComposition.ItemDefinition_fontPlain11; // L: 414 + if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { + Font var19 = ItemComposition.ItemDefinition_fontPlain11; String var20; - if (var1 < 100000) { // L: 417 - var20 = "" + var1 + ""; // L: 418 - } else if (var1 < 10000000) { // L: 421 - var20 = "" + var1 / 1000 + "K" + ""; // L: 422 + if (var1 < 100000) { + var20 = "" + var1 + ""; + } else if (var1 < 10000000) { + var20 = "" + var1 / 1000 + "K" + ""; } else { - var20 = "" + var1 / 1000000 + "M" + ""; // L: 425 + var20 = "" + var1 / 1000000 + "M" + ""; } - var19.draw(var20, 0, 9, 16776960, 1); // L: 427 + var19.draw(var20, 0, 9, 16776960, 1); } - if (!var5) { // L: 429 + if (!var5) { ItemComposition.ItemDefinition_cachedSprites.put(var8, var6); } - Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); // L: 430 - Rasterizer2D.Rasterizer2D_setClipArray(var15); // L: 431 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 432 - Rasterizer3D.field2276 = true; // L: 433 - return var8; // L: 434 + Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); + Rasterizer2D.Rasterizer2D_setClipArray(var15); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); + Rasterizer3D.field2276 = true; + return var8; } } } diff --git a/runescape-client/src/main/java/EvictingDualNodeHashTable.java b/runescape-client/src/main/java/EvictingDualNodeHashTable.java index 5ff9c2f41b..da17922d03 100644 --- a/runescape-client/src/main/java/EvictingDualNodeHashTable.java +++ b/runescape-client/src/main/java/EvictingDualNodeHashTable.java @@ -31,17 +31,17 @@ public final class EvictingDualNodeHashTable { IterableDualNodeQueue deque; public EvictingDualNodeHashTable(int var1) { - this.field2797 = new DualNode(); // L: 8 - this.deque = new IterableDualNodeQueue(); // L: 12 - this.capacity = var1; // L: 15 - this.remainingCapacity = var1; // L: 16 + this.field2797 = new DualNode(); + this.deque = new IterableDualNodeQueue(); + this.capacity = var1; + this.remainingCapacity = var1; int var2; - for (var2 = 1; var2 + var2 < var1; var2 += var2) { // L: 17 18 + for (var2 = 1; var2 + var2 < var1; var2 += var2) { } - this.hashTable = new IterableNodeHashTable(var2); // L: 19 - } // L: 20 + this.hashTable = new IterableNodeHashTable(var2); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -49,25 +49,25 @@ public final class EvictingDualNodeHashTable { ) @Export("get") public DualNode get(long var1) { - DualNode var3 = (DualNode)this.hashTable.get(var1); // L: 24 - if (var3 != null) { // L: 25 - this.deque.add(var3); // L: 26 + DualNode var3 = (DualNode)this.hashTable.get(var1); + if (var3 != null) { + this.deque.add(var3); } - return var3; // L: 29 + return var3; } @ObfuscatedName("b") @Export("remove") public void remove(long var1) { - 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 + DualNode var3 = (DualNode)this.hashTable.get(var1); + if (var3 != null) { + var3.remove(); + var3.removeDual(); + ++this.remainingCapacity; } - } // L: 39 + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -75,29 +75,29 @@ public final class EvictingDualNodeHashTable { ) @Export("put") public void put(DualNode var1, long var2) { - if (this.remainingCapacity == 0) { // L: 42 - DualNode var4 = this.deque.removeLast(); // L: 43 - var4.remove(); // L: 44 - var4.removeDual(); // L: 45 - if (var4 == this.field2797) { // L: 46 - var4 = this.deque.removeLast(); // L: 47 - var4.remove(); // L: 48 - var4.removeDual(); // L: 49 + if (this.remainingCapacity == 0) { + DualNode var4 = this.deque.removeLast(); + var4.remove(); + var4.removeDual(); + if (var4 == this.field2797) { + var4 = this.deque.removeLast(); + var4.remove(); + var4.removeDual(); } } else { - --this.remainingCapacity; // L: 52 + --this.remainingCapacity; } - this.hashTable.put(var1, var2); // L: 53 - this.deque.add(var1); // L: 54 - } // L: 55 + this.hashTable.put(var1, var2); + this.deque.add(var1); + } @ObfuscatedName("m") @Export("clear") public void clear() { - this.deque.clear(); // L: 58 - this.hashTable.clear(); // L: 59 - this.field2797 = new DualNode(); // L: 60 - this.remainingCapacity = this.capacity; // L: 61 - } // L: 62 + this.deque.clear(); + this.hashTable.clear(); + this.field2797 = new DualNode(); + this.remainingCapacity = this.capacity; + } } diff --git a/runescape-client/src/main/java/FaceNormal.java b/runescape-client/src/main/java/FaceNormal.java index da3464c94a..075f8d0886 100644 --- a/runescape-client/src/main/java/FaceNormal.java +++ b/runescape-client/src/main/java/FaceNormal.java @@ -27,7 +27,7 @@ public class FaceNormal { int z; FaceNormal() { - } // L: 8 + } @ObfuscatedName("n") @ObfuscatedSignature( @@ -35,8 +35,8 @@ public class FaceNormal { garbageValue = "37" ) public static int method4142(int var0, int var1) { - int var2 = var0 >>> 31; // L: 109 - return (var0 + var2) / var1 - var2; // L: 110 + int var2 = var0 >>> 31; + return (var0 + var2) / var1 - var2; } @ObfuscatedName("hr") @@ -46,19 +46,19 @@ public class FaceNormal { ) @Export("getTileHeight") static final int getTileHeight(int var0, int var1, int var2) { - int var3 = var0 >> 7; // L: 6079 - int var4 = var1 >> 7; // L: 6080 - if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { // L: 6081 - int var5 = var2; // L: 6082 - if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 6083 + int var3 = var0 >> 7; + int var4 = var1 >> 7; + if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { + int var5 = var2; + if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { var5 = var2 + 1; } - int var6 = var0 & 127; // L: 6084 - int var7 = var1 & 127; // L: 6085 - int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4] >> 7; // L: 6086 - int var9 = var6 * Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] + Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) >> 7; // L: 6087 - return var8 * (128 - var7) + var9 * var7 >> 7; // L: 6088 + int var6 = var0 & 127; + int var7 = var1 & 127; + int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4] >> 7; + int var9 = var6 * Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] + Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) >> 7; + return var8 * (128 - var7) + var9 * var7 >> 7; } else { return 0; } diff --git a/runescape-client/src/main/java/FileSystem.java b/runescape-client/src/main/java/FileSystem.java index eb78dd949a..8dd33ebc91 100644 --- a/runescape-client/src/main/java/FileSystem.java +++ b/runescape-client/src/main/java/FileSystem.java @@ -21,9 +21,9 @@ public class FileSystem { static WorldMapEvent worldMapEvent; static { - FileSystem_hasPermissions = false; // L: 7 + FileSystem_hasPermissions = false; FileSystem_cacheFiles = new Hashtable(16); - } // L: 9 + } @ObfuscatedName("ix") @ObfuscatedSignature( @@ -31,25 +31,25 @@ public class FileSystem { garbageValue = "497428397" ) static void method3084() { - for (int var0 = 0; var0 < Client.menuOptionsCount; ++var0) { // L: 10063 - if (InvDefinition.method3157(Client.menuOpcodes[var0])) { // L: 10064 - if (var0 < Client.menuOptionsCount - 1) { // L: 10065 - for (int var1 = var0; var1 < Client.menuOptionsCount - 1; ++var1) { // L: 10066 - Client.menuActions[var1] = Client.menuActions[var1 + 1]; // L: 10067 - Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; // L: 10068 - Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; // L: 10069 - Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; // L: 10070 - Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; // L: 10071 - Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; // L: 10072 - Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; // L: 10073 + for (int var0 = 0; var0 < Client.menuOptionsCount; ++var0) { + if (InvDefinition.method3157(Client.menuOpcodes[var0])) { + if (var0 < Client.menuOptionsCount - 1) { + for (int var1 = var0; var1 < Client.menuOptionsCount - 1; ++var1) { + Client.menuActions[var1] = Client.menuActions[var1 + 1]; + Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; + Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; + Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; + Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; + Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; + Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; } } - --var0; // L: 10076 - --Client.menuOptionsCount; // L: 10077 + --var0; + --Client.menuOptionsCount; } } - Clock.method3144(); // L: 10080 - } // L: 10081 + Clock.method3144(); + } } diff --git a/runescape-client/src/main/java/FloorDecoration.java b/runescape-client/src/main/java/FloorDecoration.java index f0760a3cb5..5c806938fd 100644 --- a/runescape-client/src/main/java/FloorDecoration.java +++ b/runescape-client/src/main/java/FloorDecoration.java @@ -45,7 +45,7 @@ public final class FloorDecoration { int flags; FloorDecoration() { - } // L: 11 + } @ObfuscatedName("ih") @ObfuscatedSignature( @@ -54,73 +54,73 @@ public final class FloorDecoration { ) @Export("addSceneMenuOptions") static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { - if (Client.isItemSelected == 0 && !Client.isSpellSelected) { // L: 10088 - class11.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); // L: 10089 + if (Client.isItemSelected == 0 && !Client.isSpellSelected) { + class11.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); } - long var4 = -1L; // L: 10092 - long var6 = -1L; // L: 10093 + long var4 = -1L; + long var6 = -1L; int var8; - for (var8 = 0; var8 < class113.method2616(); ++var8) { // L: 10094 - long var23 = MenuAction.method1960(var8); // L: 10095 - if (var23 != var6) { // L: 10096 - var6 = var23; // L: 10097 - int var25 = FloorOverlayDefinition.method3618(var8); // L: 10098 - long var14 = ViewportMouse.ViewportMouse_entityTags[var8]; // L: 10102 - int var13 = (int)(var14 >>> 7 & 127L); // L: 10104 - var13 = var13; // L: 10108 - int var26 = class114.method2629(var8); // L: 10109 - int var15 = PacketWriter.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var8]); // L: 10112 - int var16 = var15; // L: 10114 - if (var26 == 2 && class7.scene.getObjectFlags(class20.Client_plane, var25, var13, var23) >= 0) { // L: 10115 10116 - ObjectComposition var17 = class148.getObjectDefinition(var15); // L: 10117 - if (var17.transforms != null) { // L: 10118 + for (var8 = 0; var8 < class113.method2616(); ++var8) { + long var23 = MenuAction.method1960(var8); + if (var23 != var6) { + var6 = var23; + int var25 = FloorOverlayDefinition.method3618(var8); + long var14 = ViewportMouse.ViewportMouse_entityTags[var8]; + int var13 = (int)(var14 >>> 7 & 127L); + var13 = var13; + int var26 = class114.method2629(var8); + int var15 = PacketWriter.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var8]); + int var16 = var15; + if (var26 == 2 && class7.scene.getObjectFlags(class20.Client_plane, var25, var13, var23) >= 0) { + ObjectComposition var17 = class148.getObjectDefinition(var15); + if (var17.transforms != null) { var17 = var17.transform(); } - if (var17 == null) { // L: 10119 + if (var17 == null) { continue; } - if (Client.isItemSelected == 1) { // L: 10120 - class11.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator5.colorStartTag(65535) + var17.name, 1, var15, var25, var13); // L: 10121 - } else if (Client.isSpellSelected) { // L: 10124 - if ((class91.selectedSpellFlags & 4) == 4) { // L: 10125 - class11.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator5.colorStartTag(65535) + var17.name, 2, var15, var25, var13); // L: 10126 + if (Client.isItemSelected == 1) { + class11.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator5.colorStartTag(65535) + var17.name, 1, var15, var25, var13); + } else if (Client.isSpellSelected) { + if ((class91.selectedSpellFlags & 4) == 4) { + class11.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator5.colorStartTag(65535) + var17.name, 2, var15, var25, var13); } } else { - String[] var18 = var17.actions; // L: 10131 - if (var18 != null) { // L: 10132 - for (int var19 = 4; var19 >= 0; --var19) { // L: 10133 - if (var18[var19] != null) { // L: 10134 - short var20 = 0; // L: 10135 - if (var19 == 0) { // L: 10136 + String[] var18 = var17.actions; + if (var18 != null) { + for (int var19 = 4; var19 >= 0; --var19) { + if (var18[var19] != null) { + short var20 = 0; + if (var19 == 0) { var20 = 3; } - if (var19 == 1) { // L: 10137 + if (var19 == 1) { var20 = 4; } - if (var19 == 2) { // L: 10138 + if (var19 == 2) { var20 = 5; } - if (var19 == 3) { // L: 10139 + if (var19 == 3) { var20 = 6; } - if (var19 == 4) { // L: 10140 + if (var19 == 4) { var20 = 1001; } - class11.insertMenuItemNoShift(var18[var19], UserComparator5.colorStartTag(65535) + var17.name, var20, var16, var25, var13); // L: 10141 + class11.insertMenuItemNoShift(var18[var19], UserComparator5.colorStartTag(65535) + var17.name, var20, var16, var25, var13); } } } - class11.insertMenuItemNoShift("Examine", UserComparator5.colorStartTag(65535) + var17.name, 1002, var17.id, var25, var13); // L: 10146 + class11.insertMenuItemNoShift("Examine", UserComparator5.colorStartTag(65535) + var17.name, 1002, var17.id, var25, var13); } } @@ -129,110 +129,110 @@ public final class FloorDecoration { NPC var28; int var35; int[] var36; - if (var26 == 1) { // L: 10151 - NPC var31 = Client.npcs[var16]; // L: 10152 - if (var31 == null) { // L: 10153 + if (var26 == 1) { + NPC var31 = Client.npcs[var16]; + if (var31 == null) { continue; } - if (var31.definition.size == 1 && (var31.x & 127) == 64 && (var31.y & 127) == 64) { // L: 10154 - for (var27 = 0; var27 < Client.npcCount; ++var27) { // L: 10155 - var28 = Client.npcs[Client.npcIndices[var27]]; // L: 10156 - if (var28 != null && var28 != var31 && var28.definition.size == 1 && var31.x == var28.x && var28.y == var31.y) { // L: 10157 + if (var31.definition.size == 1 && (var31.x & 127) == 64 && (var31.y & 127) == 64) { + for (var27 = 0; var27 < Client.npcCount; ++var27) { + var28 = Client.npcs[Client.npcIndices[var27]]; + if (var28 != null && var28 != var31 && var28.definition.size == 1 && var31.x == var28.x && var28.y == var31.y) { GrandExchangeOfferAgeComparator.addNpcToMenu(var28, Client.npcIndices[var27], var25, var13); } } - var27 = Players.Players_count; // L: 10159 - var36 = Players.Players_indices; // L: 10160 + var27 = Players.Players_count; + var36 = Players.Players_indices; - for (var35 = 0; var35 < var27; ++var35) { // L: 10161 - var21 = Client.players[var36[var35]]; // L: 10162 - if (var21 != null && var31.x == var21.x && var21.y == var31.y) { // L: 10163 + for (var35 = 0; var35 < var27; ++var35) { + var21 = Client.players[var36[var35]]; + if (var21 != null && var31.x == var21.x && var21.y == var31.y) { class233.addPlayerToMenu(var21, var36[var35], var25, var13); } } } - GrandExchangeOfferAgeComparator.addNpcToMenu(var31, var16, var25, var13); // L: 10166 + GrandExchangeOfferAgeComparator.addNpcToMenu(var31, var16, var25, var13); } - if (var26 == 0) { // L: 10168 - Player var32 = Client.players[var16]; // L: 10169 - if (var32 == null) { // L: 10170 + if (var26 == 0) { + Player var32 = Client.players[var16]; + if (var32 == null) { continue; } - if ((var32.x & 127) == 64 && (var32.y & 127) == 64) { // L: 10171 - for (var27 = 0; var27 < Client.npcCount; ++var27) { // L: 10172 - var28 = Client.npcs[Client.npcIndices[var27]]; // L: 10173 - if (var28 != null && var28.definition.size == 1 && var32.x == var28.x && var32.y == var28.y) { // L: 10174 + if ((var32.x & 127) == 64 && (var32.y & 127) == 64) { + for (var27 = 0; var27 < Client.npcCount; ++var27) { + var28 = Client.npcs[Client.npcIndices[var27]]; + if (var28 != null && var28.definition.size == 1 && var32.x == var28.x && var32.y == var28.y) { GrandExchangeOfferAgeComparator.addNpcToMenu(var28, Client.npcIndices[var27], var25, var13); } } - var27 = Players.Players_count; // L: 10176 - var36 = Players.Players_indices; // L: 10177 + var27 = Players.Players_count; + var36 = Players.Players_indices; - for (var35 = 0; var35 < var27; ++var35) { // L: 10178 - var21 = Client.players[var36[var35]]; // L: 10179 - if (var21 != null && var32 != var21 && var21.x == var32.x && var21.y == var32.y) { // L: 10180 + for (var35 = 0; var35 < var27; ++var35) { + var21 = Client.players[var36[var35]]; + if (var21 != null && var32 != var21 && var21.x == var32.x && var21.y == var32.y) { class233.addPlayerToMenu(var21, var36[var35], var25, var13); } } } - if (var16 != Client.combatTargetPlayerIndex) { // L: 10183 + if (var16 != Client.combatTargetPlayerIndex) { class233.addPlayerToMenu(var32, var16, var25, var13); } else { - var4 = var23; // L: 10184 + var4 = var23; } } - if (var26 == 3) { // L: 10186 - NodeDeque var34 = Client.groundItems[class20.Client_plane][var25][var13]; // L: 10187 - if (var34 != null) { // L: 10188 - for (TileItem var33 = (TileItem)var34.first(); var33 != null; var33 = (TileItem)var34.next()) { // L: 10189 10190 10223 - ItemComposition var37 = UserComparator6.ItemDefinition_get(var33.id); // L: 10191 - if (Client.isItemSelected == 1) { // L: 10192 - class11.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator5.colorStartTag(16748608) + var37.name, 16, var33.id, var25, var13); // L: 10193 - } else if (Client.isSpellSelected) { // L: 10196 - if ((class91.selectedSpellFlags & 1) == 1) { // L: 10197 - class11.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator5.colorStartTag(16748608) + var37.name, 17, var33.id, var25, var13); // L: 10198 + if (var26 == 3) { + NodeDeque var34 = Client.groundItems[class20.Client_plane][var25][var13]; + if (var34 != null) { + for (TileItem var33 = (TileItem)var34.first(); var33 != null; var33 = (TileItem)var34.next()) { + ItemComposition var37 = UserComparator6.ItemDefinition_get(var33.id); + if (Client.isItemSelected == 1) { + class11.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator5.colorStartTag(16748608) + var37.name, 16, var33.id, var25, var13); + } else if (Client.isSpellSelected) { + if ((class91.selectedSpellFlags & 1) == 1) { + class11.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator5.colorStartTag(16748608) + var37.name, 17, var33.id, var25, var13); } } else { - String[] var29 = var37.groundActions; // L: 10203 + String[] var29 = var37.groundActions; - for (int var30 = 4; var30 >= 0; --var30) { // L: 10204 - if (var29 != null && var29[var30] != null) { // L: 10205 - byte var22 = 0; // L: 10206 - if (var30 == 0) { // L: 10207 + for (int var30 = 4; var30 >= 0; --var30) { + if (var29 != null && var29[var30] != null) { + byte var22 = 0; + if (var30 == 0) { var22 = 18; } - if (var30 == 1) { // L: 10208 + if (var30 == 1) { var22 = 19; } - if (var30 == 2) { // L: 10209 + if (var30 == 2) { var22 = 20; } - if (var30 == 3) { // L: 10210 + if (var30 == 3) { var22 = 21; } - if (var30 == 4) { // L: 10211 + if (var30 == 4) { var22 = 22; } - class11.insertMenuItemNoShift(var29[var30], UserComparator5.colorStartTag(16748608) + var37.name, var22, var33.id, var25, var13); // L: 10212 - } else if (var30 == 2) { // L: 10215 - class11.insertMenuItemNoShift("Take", UserComparator5.colorStartTag(16748608) + var37.name, 20, var33.id, var25, var13); // L: 10216 + class11.insertMenuItemNoShift(var29[var30], UserComparator5.colorStartTag(16748608) + var37.name, var22, var33.id, var25, var13); + } else if (var30 == 2) { + class11.insertMenuItemNoShift("Take", UserComparator5.colorStartTag(16748608) + var37.name, 20, var33.id, var25, var13); } } - class11.insertMenuItemNoShift("Examine", UserComparator5.colorStartTag(16748608) + var37.name, 1004, var33.id, var25, var13); // L: 10220 + class11.insertMenuItemNoShift("Examine", UserComparator5.colorStartTag(16748608) + var37.name, 1004, var33.id, var25, var13); } } } @@ -240,12 +240,12 @@ public final class FloorDecoration { } } - if (-1L != var4) { // L: 10228 - var8 = MouseRecorder.method2159(var4); // L: 10229 - int var9 = (int)(var4 >>> 7 & 127L); // L: 10232 - Player var11 = Client.players[Client.combatTargetPlayerIndex]; // L: 10235 - class233.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var9); // L: 10236 + if (-1L != var4) { + var8 = MouseRecorder.method2159(var4); + int var9 = (int)(var4 >>> 7 & 127L); + Player var11 = Client.players[Client.combatTargetPlayerIndex]; + class233.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var9); } - } // L: 10238 + } } diff --git a/runescape-client/src/main/java/FloorOverlayDefinition.java b/runescape-client/src/main/java/FloorOverlayDefinition.java index e2dae1c9ba..16d68fb08c 100644 --- a/runescape-client/src/main/java/FloorOverlayDefinition.java +++ b/runescape-client/src/main/java/FloorOverlayDefinition.java @@ -84,15 +84,15 @@ public class FloorOverlayDefinition extends DualNode { public int secondaryLightness; static { - FloorOverlayDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11 + FloorOverlayDefinition_cached = new EvictingDualNodeHashTable(64); } FloorOverlayDefinition() { - this.primaryRgb = 0; // L: 12 - this.texture = -1; // L: 13 - this.hideUnderlay = true; // L: 14 - this.secondaryRgb = -1; // L: 15 - } // L: 23 + this.primaryRgb = 0; + this.texture = -1; + this.hideUnderlay = true; + this.secondaryRgb = -1; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -101,15 +101,15 @@ public class FloorOverlayDefinition extends DualNode { ) @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; // L: 40 - this.secondaryLightness = this.lightness; // L: 41 + if (this.secondaryRgb != -1) { + this.setHsl(this.secondaryRgb); + this.secondaryHue = this.hue; + this.secondarySaturation = this.saturation; + this.secondaryLightness = this.lightness; } - this.setHsl(this.primaryRgb); // L: 43 - } // L: 44 + this.setHsl(this.primaryRgb); + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -119,12 +119,12 @@ public class FloorOverlayDefinition extends DualNode { @Export("decode") void decode(Buffer var1, int var2) { while (true) { - int var3 = var1.readUnsignedByte(); // L: 48 - if (var3 == 0) { // L: 49 - return; // L: 52 + int var3 = var1.readUnsignedByte(); + if (var3 == 0) { + return; } - this.decodeNext(var1, var3, var2); // L: 50 + this.decodeNext(var1, var3, var2); } } @@ -135,10 +135,10 @@ public class FloorOverlayDefinition extends DualNode { ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { - if (var2 == 1) { // L: 55 + if (var2 == 1) { this.primaryRgb = var1.readMedium(); } else if (var2 == 2) { - this.texture = var1.readUnsignedByte(); // L: 56 + this.texture = var1.readUnsignedByte(); } else if (var2 == 5) { this.hideUnderlay = false; } else if (var2 == 7) { @@ -146,7 +146,7 @@ public class FloorOverlayDefinition extends DualNode { } else if (var2 == 8) { } - } // L: 61 + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -156,64 +156,64 @@ public class FloorOverlayDefinition extends DualNode { @Export("setHsl") void setHsl(int var1) { double var2 = (double)(var1 >> 16 & 255) / 256.0D; - double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 65 - double var6 = (double)(var1 & 255) / 256.0D; // L: 66 - double var8 = var2; // L: 67 - if (var4 < var2) { // L: 68 + double var4 = (double)(var1 >> 8 & 255) / 256.0D; + double var6 = (double)(var1 & 255) / 256.0D; + double var8 = var2; + if (var4 < var2) { var8 = var4; } - if (var6 < var8) { // L: 69 + if (var6 < var8) { var8 = var6; } - double var10 = var2; // L: 70 - if (var4 > var2) { // L: 71 + double var10 = var2; + if (var4 > var2) { var10 = var4; } - if (var6 > var10) { // L: 72 + if (var6 > var10) { var10 = var6; } - double var12 = 0.0D; // L: 73 - double var14 = 0.0D; // L: 74 - double var16 = (var8 + var10) / 2.0D; // L: 75 - if (var8 != var10) { // L: 76 - if (var16 < 0.5D) { // L: 77 + double var12 = 0.0D; + double var14 = 0.0D; + double var16 = (var8 + var10) / 2.0D; + if (var8 != var10) { + if (var16 < 0.5D) { var14 = (var10 - var8) / (var8 + var10); } - if (var16 >= 0.5D) { // L: 78 + if (var16 >= 0.5D) { var14 = (var10 - var8) / (2.0D - var10 - var8); } - if (var10 == var2) { // L: 79 + if (var10 == var2) { var12 = (var4 - var6) / (var10 - var8); - } else if (var10 == var4) { // L: 80 + } else if (var10 == var4) { var12 = 2.0D + (var6 - var2) / (var10 - var8); } else if (var10 == var6) { - var12 = 4.0D + (var2 - var4) / (var10 - var8); // L: 81 + var12 = 4.0D + (var2 - var4) / (var10 - var8); } } - var12 /= 6.0D; // L: 83 - this.hue = (int)(var12 * 256.0D); // L: 84 - this.saturation = (int)(256.0D * var14); // L: 85 - this.lightness = (int)(var16 * 256.0D); // L: 86 - if (this.saturation < 0) { // L: 87 + var12 /= 6.0D; + this.hue = (int)(var12 * 256.0D); + this.saturation = (int)(256.0D * var14); + this.lightness = (int)(var16 * 256.0D); + if (this.saturation < 0) { this.saturation = 0; - } else if (this.saturation > 255) { // L: 88 + } else if (this.saturation > 255) { this.saturation = 255; } - if (this.lightness < 0) { // L: 89 + if (this.lightness < 0) { this.lightness = 0; - } else if (this.lightness > 255) { // L: 90 + } else if (this.lightness > 255) { this.lightness = 255; } - } // L: 91 + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -221,7 +221,7 @@ public class FloorOverlayDefinition extends DualNode { garbageValue = "-1253625598" ) public static int method3618(int var0) { - return MouseRecorder.method2159(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 64 + return MouseRecorder.method2159(ViewportMouse.ViewportMouse_entityTags[var0]); } @ObfuscatedName("t") @@ -230,9 +230,9 @@ public class FloorOverlayDefinition extends DualNode { garbageValue = "1421542986" ) public static int method3636(int var0, int var1, int var2) { - int var3 = WorldMapEvent.method4942(var2 - var1 + 1); // L: 57 - var3 <<= var1; // L: 58 - var0 |= var3; // L: 59 - return var0; // L: 60 + int var3 = WorldMapEvent.method4942(var2 - var1 + 1); + var3 <<= var1; + var0 |= var3; + return var0; } } diff --git a/runescape-client/src/main/java/FloorUnderlayDefinition.java b/runescape-client/src/main/java/FloorUnderlayDefinition.java index 892f9e3b90..9396955431 100644 --- a/runescape-client/src/main/java/FloorUnderlayDefinition.java +++ b/runescape-client/src/main/java/FloorUnderlayDefinition.java @@ -55,8 +55,8 @@ public class FloorUnderlayDefinition extends DualNode { } FloorUnderlayDefinition() { - this.rgb = 0; // L: 12 - } // L: 18 + this.rgb = 0; + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -65,8 +65,8 @@ public class FloorUnderlayDefinition extends DualNode { ) @Export("postDecode") void postDecode() { - this.setHsl(this.rgb); // L: 36 - } // L: 37 + this.setHsl(this.rgb); + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -76,12 +76,12 @@ public class FloorUnderlayDefinition extends DualNode { @Export("decode") void decode(Buffer var1, int var2) { while (true) { - int var3 = var1.readUnsignedByte(); // L: 41 - if (var3 == 0) { // L: 42 - return; // L: 45 + int var3 = var1.readUnsignedByte(); + if (var3 == 0) { + return; } - this.decodeNext(var1, var3, var2); // L: 43 + this.decodeNext(var1, var3, var2); } } @@ -92,11 +92,11 @@ public class FloorUnderlayDefinition extends DualNode { ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { - if (var2 == 1) { // L: 48 + if (var2 == 1) { this.rgb = var1.readMedium(); } - } // L: 50 + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -105,75 +105,75 @@ public class FloorUnderlayDefinition extends DualNode { ) @Export("setHsl") void setHsl(int var1) { - double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 53 - double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 54 - double var6 = (double)(var1 & 255) / 256.0D; // L: 55 - double var8 = var2; // L: 56 - if (var4 < var2) { // L: 57 + 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) { var8 = var4; } - if (var6 < var8) { // L: 58 + if (var6 < var8) { var8 = var6; } - double var10 = var2; // L: 59 - if (var4 > var2) { // L: 60 + double var10 = var2; + if (var4 > var2) { var10 = var4; } - if (var6 > var10) { // L: 61 + if (var6 > var10) { var10 = var6; } - double var12 = 0.0D; // L: 62 - double var14 = 0.0D; // L: 63 - double var16 = (var8 + var10) / 2.0D; // L: 64 - if (var10 != var8) { // L: 65 - if (var16 < 0.5D) { // L: 66 + double var12 = 0.0D; + double var14 = 0.0D; + double var16 = (var8 + var10) / 2.0D; + if (var10 != var8) { + if (var16 < 0.5D) { var14 = (var10 - var8) / (var8 + var10); } - if (var16 >= 0.5D) { // L: 67 + if (var16 >= 0.5D) { var14 = (var10 - var8) / (2.0D - var10 - var8); } - if (var10 == var2) { // L: 68 + if (var10 == var2) { var12 = (var4 - var6) / (var10 - var8); - } else if (var4 == var10) { // L: 69 + } else if (var4 == var10) { var12 = 2.0D + (var6 - var2) / (var10 - var8); } else if (var6 == var10) { - var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 70 + var12 = (var2 - var4) / (var10 - var8) + 4.0D; } } - var12 /= 6.0D; // L: 72 - this.saturation = (int)(var14 * 256.0D); // L: 73 - this.lightness = (int)(var16 * 256.0D); // L: 74 - if (this.saturation < 0) { // L: 75 + var12 /= 6.0D; + this.saturation = (int)(var14 * 256.0D); + this.lightness = (int)(var16 * 256.0D); + if (this.saturation < 0) { this.saturation = 0; - } else if (this.saturation > 255) { // L: 76 + } else if (this.saturation > 255) { this.saturation = 255; } - if (this.lightness < 0) { // L: 77 + if (this.lightness < 0) { this.lightness = 0; - } else if (this.lightness > 255) { // L: 78 + } else if (this.lightness > 255) { this.lightness = 255; } - if (var16 > 0.5D) { // L: 79 + if (var16 > 0.5D) { this.hueMultiplier = (int)((1.0D - var16) * var14 * 512.0D); } else { - this.hueMultiplier = (int)(512.0D * var14 * var16); // L: 80 + this.hueMultiplier = (int)(512.0D * var14 * var16); } - if (this.hueMultiplier < 1) { // L: 81 + if (this.hueMultiplier < 1) { this.hueMultiplier = 1; } - this.hue = (int)((double)this.hueMultiplier * var12); // L: 82 - } // L: 83 + this.hue = (int)((double)this.hueMultiplier * var12); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -181,7 +181,7 @@ public class FloorUnderlayDefinition extends DualNode { garbageValue = "1097818392" ) static PrivateChatMode[] method3381() { - return new PrivateChatMode[]{PrivateChatMode.field4594, PrivateChatMode.field4595, PrivateChatMode.field4596}; // L: 11 + return new PrivateChatMode[]{PrivateChatMode.field4594, PrivateChatMode.field4595, PrivateChatMode.field4596}; } @ObfuscatedName("c") @@ -190,6 +190,6 @@ public class FloorUnderlayDefinition extends DualNode { garbageValue = "440486773" ) static AttackOption[] method3376() { - return new AttackOption[]{AttackOption.field1232, AttackOption.AttackOption_hidden, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.field1234, AttackOption.AttackOption_alwaysRightClick}; // L: 12748 + return new AttackOption[]{AttackOption.field1232, AttackOption.AttackOption_hidden, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.field1234, AttackOption.AttackOption_alwaysRightClick}; } } diff --git a/runescape-client/src/main/java/Font.java b/runescape-client/src/main/java/Font.java index 2468bd0207..78cb62bd93 100644 --- a/runescape-client/src/main/java/Font.java +++ b/runescape-client/src/main/java/Font.java @@ -6,94 +6,94 @@ import net.runelite.mapping.ObfuscatedName; @Implements("Font") public final class Font extends AbstractFont { public Font(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) { - super(var1, var2, var3, var4, var5, var6, var7); // L: 7 - } // L: 8 + super(var1, var2, var3, var4, var5, var6, var7); + } public Font(byte[] var1) { - super(var1); // L: 11 - } // L: 12 + super(var1); + } @ObfuscatedName("c") @Export("drawGlyph") final void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6) { - int var7 = var3 * Rasterizer2D.Rasterizer2D_width + var2; // L: 15 - int var8 = Rasterizer2D.Rasterizer2D_width - var4; // L: 16 - int var9 = 0; // L: 17 - int var10 = 0; // L: 18 + int var7 = var3 * Rasterizer2D.Rasterizer2D_width + var2; + int var8 = Rasterizer2D.Rasterizer2D_width - var4; + int var9 = 0; + int var10 = 0; int var11; - if (var3 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 19 - var11 = Rasterizer2D.Rasterizer2D_yClipStart - var3; // L: 20 - var5 -= var11; // L: 21 - var3 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 22 - var10 += var11 * var4; // L: 23 - var7 += var11 * Rasterizer2D.Rasterizer2D_width; // L: 24 + if (var3 < Rasterizer2D.Rasterizer2D_yClipStart) { + var11 = Rasterizer2D.Rasterizer2D_yClipStart - var3; + var5 -= var11; + var3 = Rasterizer2D.Rasterizer2D_yClipStart; + var10 += var11 * var4; + var7 += var11 * Rasterizer2D.Rasterizer2D_width; } - if (var3 + var5 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 26 + if (var3 + var5 > Rasterizer2D.Rasterizer2D_yClipEnd) { var5 -= var3 + var5 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var2 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 27 - var11 = Rasterizer2D.Rasterizer2D_xClipStart - var2; // L: 28 - var4 -= var11; // L: 29 - var2 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 30 - var10 += var11; // L: 31 - var7 += var11; // L: 32 - var9 += var11; // L: 33 - var8 += var11; // L: 34 + if (var2 < Rasterizer2D.Rasterizer2D_xClipStart) { + var11 = Rasterizer2D.Rasterizer2D_xClipStart - var2; + var4 -= var11; + var2 = Rasterizer2D.Rasterizer2D_xClipStart; + var10 += var11; + var7 += var11; + var9 += var11; + var8 += var11; } - if (var2 + var4 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 36 - var11 = var2 + var4 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 37 - var4 -= var11; // L: 38 - var9 += var11; // L: 39 - var8 += var11; // L: 40 + if (var2 + var4 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var11 = var2 + var4 - Rasterizer2D.Rasterizer2D_xClipEnd; + var4 -= var11; + var9 += var11; + var8 += var11; } - if (var4 > 0 && var5 > 0) { // L: 42 - AbstractFont.AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var1, var6, var10, var7, var4, var5, var8, var9); // L: 43 + if (var4 > 0 && var5 > 0) { + AbstractFont.AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var1, var6, var10, var7, var4, var5, var8, var9); } - } // L: 44 + } @ObfuscatedName("b") @Export("drawGlyphAlpha") final void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7) { - int var8 = var3 * Rasterizer2D.Rasterizer2D_width + var2; // L: 47 - int var9 = Rasterizer2D.Rasterizer2D_width - var4; // L: 48 - int var10 = 0; // L: 49 - int var11 = 0; // L: 50 + int var8 = var3 * Rasterizer2D.Rasterizer2D_width + var2; + int var9 = Rasterizer2D.Rasterizer2D_width - var4; + int var10 = 0; + int var11 = 0; int var12; - if (var3 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 51 - var12 = Rasterizer2D.Rasterizer2D_yClipStart - var3; // L: 52 - var5 -= var12; // L: 53 - var3 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 54 - var11 += var12 * var4; // L: 55 - var8 += var12 * Rasterizer2D.Rasterizer2D_width; // L: 56 + if (var3 < Rasterizer2D.Rasterizer2D_yClipStart) { + var12 = Rasterizer2D.Rasterizer2D_yClipStart - var3; + var5 -= var12; + var3 = Rasterizer2D.Rasterizer2D_yClipStart; + var11 += var12 * var4; + var8 += var12 * Rasterizer2D.Rasterizer2D_width; } - if (var3 + var5 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 58 + if (var3 + var5 > Rasterizer2D.Rasterizer2D_yClipEnd) { var5 -= var3 + var5 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var2 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 59 - var12 = Rasterizer2D.Rasterizer2D_xClipStart - var2; // L: 60 - var4 -= var12; // L: 61 - var2 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 62 - var11 += var12; // L: 63 - var8 += var12; // L: 64 - var10 += var12; // L: 65 - var9 += var12; // L: 66 + if (var2 < Rasterizer2D.Rasterizer2D_xClipStart) { + var12 = Rasterizer2D.Rasterizer2D_xClipStart - var2; + var4 -= var12; + var2 = Rasterizer2D.Rasterizer2D_xClipStart; + var11 += var12; + var8 += var12; + var10 += var12; + var9 += var12; } - if (var2 + var4 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 68 - var12 = var2 + var4 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 69 - var4 -= var12; // L: 70 - var10 += var12; // L: 71 - var9 += var12; // L: 72 + if (var2 + var4 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var12 = var2 + var4 - Rasterizer2D.Rasterizer2D_xClipEnd; + var4 -= var12; + var10 += var12; + var9 += var12; } - if (var4 > 0 && var5 > 0) { // L: 74 - AbstractFont.AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, var11, var8, var4, var5, var9, var10, var7); // L: 75 + if (var4 > 0 && var5 > 0) { + AbstractFont.AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, var11, var8, var4, var5, var9, var10, var7); } - } // L: 76 + } } diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index 5b29d4b777..9192254796 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -53,17 +53,17 @@ public class FontName { String name; static { - FontName_plain11 = new FontName("p11_full"); // L: 7 - FontName_plain12 = new FontName("p12_full"); // L: 8 - FontName_bold12 = new FontName("b12_full"); // L: 9 - FontName_verdana11 = new FontName("verdana_11pt_regular"); // L: 10 - FontName_verdana13 = new FontName("verdana_13pt_regular"); // L: 11 + FontName_plain11 = new FontName("p11_full"); + FontName_plain12 = new FontName("p12_full"); + FontName_bold12 = new FontName("b12_full"); + FontName_verdana11 = new FontName("verdana_11pt_regular"); + FontName_verdana13 = new FontName("verdana_13pt_regular"); FontName_verdana15 = new FontName("verdana_15pt_regular"); } FontName(String var1) { - this.name = var1; // L: 16 - } // L: 17 + this.name = var1; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -71,7 +71,7 @@ public class FontName { garbageValue = "-2104552307" ) public static class6[] method7075() { - return new class6[]{class6.field15}; // L: 12 + return new class6[]{class6.field15}; } @ObfuscatedName("w") @@ -81,11 +81,11 @@ public class FontName { ) public static int method7074(int var0, int var1) { int var2; - for (var2 = 0; var1 > 0; --var1) { // L: 99 100 103 - var2 = var2 << 1 | var0 & 1; // L: 101 - var0 >>>= 1; // L: 102 + for (var2 = 0; var1 > 0; --var1) { + var2 = var2 << 1 | var0 & 1; + var0 >>>= 1; } - return var2; // L: 105 + return var2; } } diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java index 526174bcfd..99288035bc 100644 --- a/runescape-client/src/main/java/Fonts.java +++ b/runescape-client/src/main/java/Fonts.java @@ -27,10 +27,10 @@ public class Fonts { descriptor = "(Lku;Lku;)V" ) public Fonts(AbstractArchive var1, AbstractArchive var2) { - this.spritesArchive = var1; // L: 14 - this.fontsArchive = var2; // L: 15 - this.map = new HashMap(); // L: 16 - } // L: 17 + this.spritesArchive = var1; + this.fontsArchive = var2; + this.map = new HashMap(); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -39,43 +39,43 @@ public class Fonts { ) @Export("createMap") public HashMap createMap(FontName[] var1) { - HashMap var2 = new HashMap(); // L: 20 - FontName[] var3 = var1; // L: 22 + HashMap var2 = new HashMap(); + FontName[] var3 = var1; - for (int var4 = 0; var4 < var3.length; ++var4) { // L: 23 - FontName var5 = var3[var4]; // L: 24 - if (this.map.containsKey(var5)) { // L: 26 - var2.put(var5, this.map.get(var5)); // L: 27 + for (int var4 = 0; var4 < var3.length; ++var4) { + FontName var5 = var3[var4]; + if (this.map.containsKey(var5)) { + var2.put(var5, this.map.get(var5)); } else { - AbstractArchive var7 = this.spritesArchive; // L: 31 - AbstractArchive var8 = this.fontsArchive; // L: 32 - String var9 = var5.name; // L: 33 - int var10 = var7.getGroupId(var9); // L: 35 - int var11 = var7.getFileId(var10, ""); // L: 36 + AbstractArchive var7 = this.spritesArchive; + AbstractArchive var8 = this.fontsArchive; + String var9 = var5.name; + int var10 = var7.getGroupId(var9); + int var11 = var7.getFileId(var10, ""); Font var12; - if (!class147.method3009(var7, var10, var11)) { // L: 39 - var12 = null; // L: 40 + if (!class147.method3009(var7, var10, var11)) { + var12 = null; } else { - byte[] var14 = var8.takeFile(var10, var11); // L: 44 + byte[] var14 = var8.takeFile(var10, var11); Font var13; - if (var14 == null) { // L: 46 - var13 = null; // L: 47 + if (var14 == null) { + var13 = null; } else { - Font var15 = new Font(var14, class141.SpriteBuffer_xOffsets, RouteStrategy.SpriteBuffer_yOffsets, class432.SpriteBuffer_spriteWidths, class330.SpriteBuffer_spriteHeights, class432.SpriteBuffer_spritePalette, class369.SpriteBuffer_pixels); // L: 50 - UserComparator3.method2529(); // L: 51 - var13 = var15; // L: 52 + Font var15 = new Font(var14, class141.SpriteBuffer_xOffsets, RouteStrategy.SpriteBuffer_yOffsets, class432.SpriteBuffer_spriteWidths, class330.SpriteBuffer_spriteHeights, class432.SpriteBuffer_spritePalette, class369.SpriteBuffer_pixels); + UserComparator3.method2529(); + var13 = var15; } - var12 = var13; // L: 54 + var12 = var13; } - if (var12 != null) { // L: 59 - this.map.put(var5, var12); // L: 60 - var2.put(var5, var12); // L: 61 + if (var12 != null) { + this.map.put(var5, var12); + var2.put(var5, var12); } } } - return var2; // L: 67 + return var2; } } diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java index 80f09f80f7..d1931e6338 100644 --- a/runescape-client/src/main/java/Frames.java +++ b/runescape-client/src/main/java/Frames.java @@ -18,33 +18,33 @@ public class Frames extends DualNode { garbageValue = "0" ) 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 + NodeDeque var5 = new NodeDeque(); + int var6 = var1.getGroupFileCount(var3); + this.frames = new Animation[var6]; + int[] var7 = var1.getGroupFileIds(var3); - 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 (int var8 = 0; var8 < var7.length; ++var8) { + byte[] var9 = var1.takeFile(var3, var7[var8]); + Skeleton var10 = null; + int var11 = (var9[0] & 255) << 8 | var9[1] & 255; - for (Skeleton var12 = (Skeleton)var5.last(); var12 != null; var12 = (Skeleton)var5.previous()) { // L: 19 20 25 + for (Skeleton var12 = (Skeleton)var5.last(); var12 != null; var12 = (Skeleton)var5.previous()) { if (var11 == var12.id) { - var10 = var12; // L: 22 + var10 = var12; break; } } - if (var10 == null) { // L: 27 - byte[] var13 = var2.getFile(var11, 0); // L: 30 - var10 = new Skeleton(var11, var13); // L: 31 - var5.addFirst(var10); // L: 32 + if (var10 == null) { + byte[] var13 = var2.getFile(var11, 0); + var10 = new Skeleton(var11, var13); + var5.addFirst(var10); } - this.frames[var7[var8]] = new Animation(var9, var10); // L: 34 + this.frames[var7[var8]] = new Animation(var9, var10); } - } // L: 36 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -53,7 +53,7 @@ public class Frames extends DualNode { ) @Export("hasAlphaTransform") public boolean hasAlphaTransform(int var1) { - return this.frames[var1].hasAlphaTransform; // L: 39 + return this.frames[var1].hasAlphaTransform; } @ObfuscatedName("m") @@ -62,6 +62,6 @@ public class Frames extends DualNode { garbageValue = "-24" ) public static int method4149(int var0) { - return var0 >> 17 & 7; // L: 21 + return var0 >> 17 & 7; } } diff --git a/runescape-client/src/main/java/Friend.java b/runescape-client/src/main/java/Friend.java index 5fca196385..15eabbef6d 100644 --- a/runescape-client/src/main/java/Friend.java +++ b/runescape-client/src/main/java/Friend.java @@ -17,7 +17,7 @@ public class Friend extends Buddy { boolean field4086; Friend() { - } // L: 9 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -26,24 +26,24 @@ public class Friend extends Buddy { ) @Export("compareToFriend") int compareToFriend(Friend var1) { - if (super.world == Client.worldId && Client.worldId != var1.world) { // L: 12 + if (super.world == Client.worldId && Client.worldId != var1.world) { return -1; - } else if (Client.worldId == var1.world && super.world != Client.worldId) { // L: 13 + } else if (Client.worldId == var1.world && super.world != Client.worldId) { return 1; - } else if (super.world != 0 && var1.world == 0) { // L: 14 + } else if (super.world != 0 && var1.world == 0) { return -1; - } else if (var1.world != 0 && super.world == 0) { // L: 15 + } else if (var1.world != 0 && super.world == 0) { return 1; - } else if (this.field4085 && !var1.field4085) { // L: 16 + } else if (this.field4085 && !var1.field4085) { return -1; - } else if (!this.field4085 && var1.field4085) { // L: 17 + } else if (!this.field4085 && var1.field4085) { return 1; - } else if (this.field4086 && !var1.field4086) { // L: 18 + } else if (this.field4086 && !var1.field4086) { return -1; - } else if (!this.field4086 && var1.field4086) { // L: 19 + } else if (!this.field4086 && var1.field4086) { return 1; } else { - return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2; // L: 20 21 24 + return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2; } } @@ -58,7 +58,7 @@ public class Friend extends Buddy { } public int compareTo(Object var1) { - return this.compareToFriend((Friend)var1); // L: 33 + return this.compareToFriend((Friend)var1); } @ObfuscatedName("c") @@ -67,12 +67,12 @@ public class Friend extends Buddy { garbageValue = "28" ) public static class365 method6296() { - synchronized(class365.field4189) { // L: 26 - if (class365.field4185 == 0) { // L: 27 + synchronized(class365.field4189) { + if (class365.field4185 == 0) { return new class365(); } else { - class365.field4189[--class365.field4185].method6627(); // L: 29 - return class365.field4189[class365.field4185]; // L: 30 + class365.field4189[--class365.field4185].method6627(); + return class365.field4189[class365.field4185]; } } } @@ -83,13 +83,13 @@ public class Friend extends Buddy { garbageValue = "337" ) public static void method6294() { - if (MouseHandler.MouseHandler_instance != null) { // L: 50 + if (MouseHandler.MouseHandler_instance != null) { synchronized(MouseHandler.MouseHandler_instance) { MouseHandler.MouseHandler_instance = null; - } // L: 53 + } } - } // L: 55 + } @ObfuscatedName("ac") @ObfuscatedSignature( @@ -97,14 +97,14 @@ public class Friend extends Buddy { garbageValue = "-696884945" ) public static int method6298(byte[] var0, int var1, int var2) { - int var3 = -1; // L: 47 + int var3 = -1; - for (int var4 = var1; var4 < var2; ++var4) { // L: 48 - var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; // L: 49 + for (int var4 = var1; var4 < var2; ++var4) { + var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; } - var3 = ~var3; // L: 51 - return var3; // L: 52 + var3 = ~var3; + return var3; } @ObfuscatedName("it") @@ -113,33 +113,33 @@ public class Friend extends Buddy { garbageValue = "2055581970" ) static final void method6288(int var0, int var1) { - if (Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) { // L: 8795 - if (Client.showMouseOverText) { // L: 8796 - int var2 = UserComparator10.method2543(); // L: 8797 + if (Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) { + if (Client.showMouseOverText) { + int var2 = UserComparator10.method2543(); String var3; - if (Client.isItemSelected == 1 && Client.menuOptionsCount < 2) { // L: 8799 + if (Client.isItemSelected == 1 && Client.menuOptionsCount < 2) { var3 = "Use" + " " + Client.selectedItemName + " " + "->"; - } else if (Client.isSpellSelected && Client.menuOptionsCount < 2) { // L: 8800 + } else if (Client.isSpellSelected && Client.menuOptionsCount < 2) { var3 = Client.selectedSpellActionName + " " + Client.selectedSpellName + " " + "->"; } else { String var4; - if (var2 < 0) { // L: 8804 - var4 = ""; // L: 8805 - } else if (Client.menuTargets[var2].length() > 0) { // L: 8808 + if (var2 < 0) { + var4 = ""; + } else if (Client.menuTargets[var2].length() > 0) { var4 = Client.menuActions[var2] + " " + Client.menuTargets[var2]; } else { - var4 = Client.menuActions[var2]; // L: 8809 + var4 = Client.menuActions[var2]; } - var3 = var4; // L: 8811 + var3 = var4; } - if (Client.menuOptionsCount > 2) { // L: 8813 + if (Client.menuOptionsCount > 2) { var3 = var3 + UserComparator5.colorStartTag(16777215) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options"; } - class136.fontBold12.drawRandomAlphaAndSpacing(var3, var0 + 4, var1 + 15, 16777215, 0, Client.cycle / 1000); // L: 8814 + class136.fontBold12.drawRandomAlphaAndSpacing(var3, var0 + 4, var1 + 15, 16777215, 0, Client.cycle / 1000); } } - } // L: 8815 + } } diff --git a/runescape-client/src/main/java/FriendLoginUpdate.java b/runescape-client/src/main/java/FriendLoginUpdate.java index 8637b1ff63..810ed9264b 100644 --- a/runescape-client/src/main/java/FriendLoginUpdate.java +++ b/runescape-client/src/main/java/FriendLoginUpdate.java @@ -31,8 +31,8 @@ public class FriendLoginUpdate extends Link { descriptor = "(Lpo;I)V" ) FriendLoginUpdate(Username var1, int var2) { - this.field4097 = (int)(Ignored.method6459() / 1000L); // L: 109 - this.username = var1; // L: 110 - this.world = (short)var2; // L: 111 - } // L: 112 + this.field4097 = (int)(Ignored.method6459() / 1000L); + this.username = var1; + this.world = (short)var2; + } } diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index 61d5051445..89784eda09 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -36,11 +36,11 @@ public class FriendSystem { descriptor = "(Low;)V" ) FriendSystem(LoginType var1) { - this.field778 = 0; // L: 23 - this.loginType = var1; // L: 26 - this.friendsList = new FriendsList(var1); // L: 27 - this.ignoreList = new IgnoreList(var1); // L: 28 - } // L: 29 + this.field778 = 0; + this.loginType = var1; + this.friendsList = new FriendsList(var1); + this.ignoreList = new IgnoreList(var1); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -48,7 +48,7 @@ public class FriendSystem { garbageValue = "1072720259" ) boolean method1728() { - return this.field778 == 2; // L: 32 + return this.field778 == 2; } @ObfuscatedName("b") @@ -57,8 +57,8 @@ public class FriendSystem { garbageValue = "-1893042213" ) final void method1764() { - this.field778 = 1; // L: 36 - } // L: 37 + this.field778 = 1; + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -67,10 +67,10 @@ public class FriendSystem { ) @Export("readUpdate") final void readUpdate(Buffer var1, int var2) { - this.friendsList.read(var1, var2); // L: 40 - this.field778 = 2; // L: 41 - WorldMapSection1.method4831(); // L: 42 - } // L: 43 + this.friendsList.read(var1, var2); + this.field778 = 2; + WorldMapSection1.method4831(); + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -79,21 +79,21 @@ public class FriendSystem { ) @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.field4097 < Ignored.method6459() / 1000L - 5L) { // L: 47 + for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { + if ((long)var1.field4097 < Ignored.method6459() / 1000L - 5L) { if (var1.world > 0) { - class194.addGameMessage(5, "", var1.username + " has logged in."); // L: 48 + class194.addGameMessage(5, "", var1.username + " has logged in."); } - if (var1.world == 0) { // L: 49 + if (var1.world == 0) { class194.addGameMessage(5, "", var1.username + " has logged out."); } - var1.remove(); // L: 50 + var1.remove(); } } - } // L: 53 + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -102,10 +102,10 @@ public class FriendSystem { ) @Export("clear") final void clear() { - this.field778 = 0; // L: 56 - this.friendsList.clear(); // L: 57 - this.ignoreList.clear(); // L: 58 - } // L: 59 + this.field778 = 0; + this.friendsList.clear(); + this.ignoreList.clear(); + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -114,12 +114,12 @@ public class FriendSystem { ) @Export("isFriended") final boolean isFriended(Username var1, boolean var2) { - if (var1 == null) { // L: 62 + if (var1 == null) { return false; - } else if (var1.equals(class340.localPlayer.username)) { // L: 63 + } else if (var1.equals(class340.localPlayer.username)) { return true; } else { - return this.friendsList.isFriended(var1, var2); // L: 64 + return this.friendsList.isFriended(var1, var2); } } @@ -130,10 +130,10 @@ public class FriendSystem { ) @Export("isIgnored") final boolean isIgnored(Username var1) { - if (var1 == null) { // L: 69 + if (var1 == null) { return false; } else { - return this.ignoreList.contains(var1); // L: 70 + return this.ignoreList.contains(var1); } } @@ -144,32 +144,32 @@ public class FriendSystem { ) @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 - ScriptEvent.method2152(); // L: 79 + if (var1 != null) { + Username var2 = new Username(var1, this.loginType); + if (var2.hasCleanName()) { + if (this.friendsListIsFull()) { + ScriptEvent.method2152(); } else { StringBuilder var10000; String var3; - if (class340.localPlayer.username.equals(var2)) { // L: 82 - var10000 = null; // L: 84 + if (class340.localPlayer.username.equals(var2)) { + var10000 = null; var3 = "You can't add yourself to your own friend list"; - class194.addGameMessage(30, "", var3); // L: 86 - } else if (this.isFriended(var2, false)) { // L: 91 - var10000 = (new StringBuilder()).append(var1); // L: 93 + class194.addGameMessage(30, "", var3); + } else if (this.isFriended(var2, false)) { + var10000 = (new StringBuilder()).append(var1); Object var10001 = null; var3 = var10000.append(" is already on your friend list").toString(); - class194.addGameMessage(30, "", var3); // L: 95 - } else if (this.isIgnored(var2)) { // L: 100 - Client.method1662(var1); // L: 101 + class194.addGameMessage(30, "", var3); + } else if (this.isIgnored(var2)) { + Client.method1662(var1); } else { - class10.method123(var1); // L: 104 + class10.method123(var1); } } } } - } // L: 80 89 98 102 105 + } @ObfuscatedName("v") @ObfuscatedSignature( @@ -178,7 +178,7 @@ public class FriendSystem { ) @Export("friendsListIsFull") final boolean friendsListIsFull() { - return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field594 != 1; // L: 130 + return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field594 != 1; } @ObfuscatedName("d") @@ -188,38 +188,38 @@ public class FriendSystem { ) @Export("addIgnore") final void addIgnore(String var1) { - if (var1 != null) { // L: 137 - Username var2 = new Username(var1, this.loginType); // L: 138 - if (var2.hasCleanName()) { // L: 139 + if (var1 != null) { + Username var2 = new Username(var1, this.loginType); + if (var2.hasCleanName()) { StringBuilder var10000; String var3; - if (this.canAddIgnore()) { // L: 140 - var10000 = null; // L: 142 + if (this.canAddIgnore()) { + var10000 = null; var3 = "Your ignore list is full. Max of 100 for free users, and 400 for members"; - class194.addGameMessage(30, "", var3); // L: 144 - } else if (class340.localPlayer.username.equals(var2)) { // L: 149 - Skills.method5487(); // L: 150 + class194.addGameMessage(30, "", var3); + } else if (class340.localPlayer.username.equals(var2)) { + Skills.method5487(); } else { Object var10001; - if (this.isIgnored(var2)) { // L: 153 - var10000 = (new StringBuilder()).append(var1); // L: 155 + if (this.isIgnored(var2)) { + var10000 = (new StringBuilder()).append(var1); var10001 = null; var3 = var10000.append(" is already on your ignore list").toString(); - class194.addGameMessage(30, "", var3); // L: 157 - } else if (this.isFriended(var2, false)) { // L: 162 + class194.addGameMessage(30, "", var3); + } else if (this.isFriended(var2, false)) { var10000 = new StringBuilder(); - var10001 = null; // L: 164 + var10001 = null; var10000 = var10000.append("Please remove ").append(var1); var10001 = null; var3 = var10000.append(" from your friend list first").toString(); - class194.addGameMessage(30, "", var3); // L: 166 + class194.addGameMessage(30, "", var3); } else { - class6.method55(var1); // L: 171 + class6.method55(var1); } } } } - } // L: 147 151 160 169 172 + } @ObfuscatedName("e") @ObfuscatedSignature( @@ -228,7 +228,7 @@ public class FriendSystem { ) @Export("canAddIgnore") final boolean canAddIgnore() { - return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field594 != 1; // L: 190 + return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field594 != 1; } @ObfuscatedName("a") @@ -238,21 +238,21 @@ public class FriendSystem { ) @Export("removeFriend") final void removeFriend(String var1) { - if (var1 != null) { // L: 197 - Username var2 = new Username(var1, this.loginType); // L: 198 - if (var2.hasCleanName()) { // L: 199 - if (this.friendsList.removeByUsername(var2)) { // L: 200 - class409.method7267(); // L: 201 - PacketBufferNode var3 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2854, Client.packetWriter.isaacCipher); // L: 203 - var3.packetBuffer.writeByte(class116.stringCp1252NullTerminatedByteSize(var1)); // L: 204 - var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 205 - Client.packetWriter.addNode(var3); // L: 206 + if (var1 != null) { + Username var2 = new Username(var1, this.loginType); + if (var2.hasCleanName()) { + if (this.friendsList.removeByUsername(var2)) { + class409.method7267(); + PacketBufferNode var3 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2854, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(class116.stringCp1252NullTerminatedByteSize(var1)); + var3.packetBuffer.writeStringCp1252NullTerminated(var1); + Client.packetWriter.addNode(var3); } - WorldMapSection1.method4831(); // L: 208 + WorldMapSection1.method4831(); } } - } // L: 209 + } @ObfuscatedName("u") @ObfuscatedSignature( @@ -261,21 +261,21 @@ public class FriendSystem { ) @Export("removeIgnore") final void removeIgnore(String var1) { - if (var1 != null) { // L: 212 - Username var2 = new Username(var1, this.loginType); // L: 213 - if (var2.hasCleanName()) { // L: 214 - if (this.ignoreList.removeByUsername(var2)) { // L: 215 - class409.method7267(); // L: 216 - PacketBufferNode var3 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2805, Client.packetWriter.isaacCipher); // L: 218 - var3.packetBuffer.writeByte(class116.stringCp1252NullTerminatedByteSize(var1)); // L: 219 - var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 220 - Client.packetWriter.addNode(var3); // L: 221 + if (var1 != null) { + Username var2 = new Username(var1, this.loginType); + if (var2.hasCleanName()) { + if (this.ignoreList.removeByUsername(var2)) { + class409.method7267(); + PacketBufferNode var3 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2805, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(class116.stringCp1252NullTerminatedByteSize(var1)); + var3.packetBuffer.writeStringCp1252NullTerminated(var1); + Client.packetWriter.addNode(var3); } - Skeleton.FriendSystem_invalidateIgnoreds(); // L: 223 + Skeleton.FriendSystem_invalidateIgnoreds(); } } - } // L: 224 + } @ObfuscatedName("f") @ObfuscatedSignature( @@ -284,8 +284,8 @@ public class FriendSystem { ) @Export("isFriendAndHasWorld") final boolean isFriendAndHasWorld(Username var1) { - Friend var2 = (Friend)this.friendsList.getByUsername(var1); // L: 236 - return var2 != null && var2.hasWorld(); // L: 237 + Friend var2 = (Friend)this.friendsList.getByUsername(var1); + return var2 != null && var2.hasWorld(); } @ObfuscatedName("fs") @@ -294,22 +294,22 @@ public class FriendSystem { garbageValue = "32" ) static final void method1791(boolean var0) { - if (var0) { // L: 3658 - Client.field507 = Login.field882 ? class122.field1471 : class122.field1474; // L: 3659 + if (var0) { + Client.field507 = Login.field882 ? class122.field1471 : class122.field1474; } else { - LinkedHashMap var1 = SecureRandomFuture.clientPreferences.parameters; // L: 3662 - String var3 = Login.Login_username; // L: 3664 - int var4 = var3.length(); // L: 3666 - int var5 = 0; // L: 3667 + LinkedHashMap var1 = SecureRandomFuture.clientPreferences.parameters; + String var3 = Login.Login_username; + int var4 = var3.length(); + int var5 = 0; - for (int var6 = 0; var6 < var4; ++var6) { // L: 3668 + for (int var6 = 0; var6 < var4; ++var6) { var5 = (var5 << 5) - var5 + var3.charAt(var6); } - Client.field507 = var1.containsKey(var5) ? class122.field1476 : class122.field1473; // L: 3671 + Client.field507 = var1.containsKey(var5) ? class122.field1476 : class122.field1473; } - } // L: 3673 + } @ObfuscatedName("jk") @ObfuscatedSignature( @@ -318,16 +318,16 @@ public class FriendSystem { ) @Export("formatItemStacks") static final String formatItemStacks(int var0) { - String var1 = Integer.toString(var0); // L: 10895 + String var1 = Integer.toString(var0); - for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { // L: 10896 - var1 = var1.substring(0, var2) + "," + var1.substring(var2); // L: 10897 + for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { + var1 = var1.substring(0, var2) + "," + var1.substring(var2); } - if (var1.length() > 9) { // L: 10899 + if (var1.length() > 9) { return " " + UserComparator5.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; } else { - return var1.length() > 6 ? " " + UserComparator5.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + UserComparator5.colorStartTag(16776960) + var1 + ""; // L: 10900 10901 + return var1.length() > 6 ? " " + UserComparator5.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + UserComparator5.colorStartTag(16776960) + var1 + ""; } } @@ -338,581 +338,581 @@ public class FriendSystem { ) @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: 11386 - Widget var9 = var0[var8]; // L: 11387 - if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || class363.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { // L: 11388 11389 11390 - if (var9.isIf3) { // L: 11391 - if (StudioGame.isComponentHidden(var9)) { // L: 11392 + for (int var8 = 0; var8 < var0.length; ++var8) { + Widget var9 = var0[var8]; + if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || class363.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { + if (var9.isIf3) { + if (StudioGame.isComponentHidden(var9)) { continue; } - } else if (var9.type == 0 && var9 != class4.mousedOverWidgetIf1 && StudioGame.isComponentHidden(var9)) { // L: 11395 + } else if (var9.type == 0 && var9 != class4.mousedOverWidgetIf1 && StudioGame.isComponentHidden(var9)) { continue; } - int var10 = var9.x + var6; // L: 11397 - int var11 = var7 + var9.y; // L: 11398 + int var10 = var9.x + var6; + int var11 = var7 + var9.y; int var12; int var13; int var14; int var15; int var17; int var18; - if (var9.type == 2) { // L: 11403 - var12 = var2; // L: 11404 - var13 = var3; // L: 11405 - var14 = var4; // L: 11406 - var15 = var5; // L: 11407 + if (var9.type == 2) { + var12 = var2; + var13 = var3; + var14 = var4; + var15 = var5; } else { int var16; - if (var9.type == 9) { // L: 11409 - var16 = var10; // L: 11410 - var17 = var11; // L: 11411 - var18 = var10 + var9.width; // L: 11412 - int var19 = var11 + var9.height; // L: 11413 - if (var18 < var10) { // L: 11414 - var16 = var18; // L: 11416 - var18 = var10; // L: 11417 + if (var9.type == 9) { + var16 = var10; + var17 = var11; + var18 = var10 + var9.width; + int var19 = var11 + var9.height; + if (var18 < var10) { + var16 = var18; + var18 = var10; } - if (var19 < var11) { // L: 11419 - var17 = var19; // L: 11421 - var19 = var11; // L: 11422 + if (var19 < var11) { + var17 = var19; + var19 = var11; } - ++var18; // L: 11424 - ++var19; // L: 11425 - var12 = var16 > var2 ? var16 : var2; // L: 11426 - var13 = var17 > var3 ? var17 : var3; // L: 11427 - var14 = var18 < var4 ? var18 : var4; // L: 11428 - var15 = var19 < var5 ? var19 : var5; // L: 11429 + ++var18; + ++var19; + var12 = var16 > var2 ? var16 : var2; + var13 = var17 > var3 ? var17 : var3; + var14 = var18 < var4 ? var18 : var4; + var15 = var19 < var5 ? var19 : var5; } else { - var16 = var10 + var9.width; // L: 11432 - var17 = var11 + var9.height; // L: 11433 - var12 = var10 > var2 ? var10 : var2; // L: 11434 - var13 = var11 > var3 ? var11 : var3; // L: 11435 - var14 = var16 < var4 ? var16 : var4; // L: 11436 - var15 = var17 < var5 ? var17 : var5; // L: 11437 + var16 = var10 + var9.width; + var17 = var11 + var9.height; + var12 = var10 > var2 ? var10 : var2; + var13 = var11 > var3 ? var11 : var3; + var14 = var16 < var4 ? var16 : var4; + var15 = var17 < var5 ? var17 : var5; } } - if (var9 == Client.clickedWidget) { // L: 11439 - Client.field657 = true; // L: 11440 - Client.field658 = var10; // L: 11441 - Client.field660 = var11; // L: 11442 + if (var9 == Client.clickedWidget) { + Client.field657 = true; + Client.field658 = var10; + Client.field660 = var11; } - boolean var33 = false; // L: 11444 - if (var9.field3299) { // L: 11445 - switch(Client.field638) { // L: 11446 + boolean var33 = false; + if (var9.field3299) { + switch(Client.field638) { case 0: - var33 = true; // L: 11458 + var33 = true; case 1: default: break; case 2: - if (Client.field639 == var9.id >>> 16) { // L: 11453 - var33 = true; // L: 11454 + if (Client.field639 == var9.id >>> 16) { + var33 = true; } break; case 3: - if (var9.id == Client.field639) { // L: 11448 - var33 = true; // L: 11449 + if (var9.id == Client.field639) { + var33 = true; } } } - if (var33 || !var9.isIf3 || var12 < var14 && var13 < var15) { // L: 11462 - if (var9.isIf3) { // L: 11463 + if (var33 || !var9.isIf3 || var12 < var14 && var13 < var15) { + if (var9.isIf3) { ScriptEvent var26; - if (var9.noClickThrough) { // L: 11464 - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11465 - for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 11466 - if (var26.isMouseInputEvent) { // L: 11467 - var26.remove(); // L: 11468 - var26.widget.containsMouse = false; // L: 11469 + if (var9.noClickThrough) { + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { + if (var26.isMouseInputEvent) { + var26.remove(); + var26.widget.containsMouse = false; } } - if (class87.widgetDragDuration == 0) { // L: 11472 - Client.clickedWidget = null; // L: 11473 - Client.clickedWidgetParent = null; // L: 11474 + if (class87.widgetDragDuration == 0) { + Client.clickedWidget = null; + Client.clickedWidgetParent = null; } - if (!Client.isMenuOpen) { // L: 11476 - WorldMapElement.addCancelMenuEntry(); // L: 11477 + if (!Client.isMenuOpen) { + WorldMapElement.addCancelMenuEntry(); } } - } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11481 11482 - for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 11483 - if (var26.isMouseInputEvent && var26.widget.onScroll == var26.args) { // L: 11484 - var26.remove(); // L: 11485 + } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { + if (var26.isMouseInputEvent && var26.widget.onScroll == var26.args) { + var26.remove(); } } } } - var17 = MouseHandler.MouseHandler_x; // L: 11491 - var18 = MouseHandler.MouseHandler_y; // L: 11492 - if (MouseHandler.MouseHandler_lastButton != 0) { // L: 11493 - var17 = MouseHandler.MouseHandler_lastPressedX; // L: 11494 - var18 = MouseHandler.MouseHandler_lastPressedY; // L: 11495 + var17 = MouseHandler.MouseHandler_x; + var18 = MouseHandler.MouseHandler_y; + if (MouseHandler.MouseHandler_lastButton != 0) { + var17 = MouseHandler.MouseHandler_lastPressedX; + var18 = MouseHandler.MouseHandler_lastPressedY; } - boolean var34 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; // L: 11497 - if (var9.contentType == 1337) { // L: 11498 - if (!Client.isLoading && !Client.isMenuOpen && var34) { // L: 11499 + boolean var34 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; + if (var9.contentType == 1337) { + if (!Client.isLoading && !Client.isMenuOpen && var34) { FloorDecoration.addSceneMenuOptions(var17, var18, var12, var13); } - } else if (var9.contentType == 1338) { // L: 11502 - class312.checkIfMinimapClicked(var9, var10, var11); // L: 11503 + } else if (var9.contentType == 1338) { + class312.checkIfMinimapClicked(var9, var10, var11); } else { - if (var9.contentType == 1400) { // L: 11506 - Varcs.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var34, var10, var11, var9.width, var9.height); // L: 11507 + if (var9.contentType == 1400) { + Varcs.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var34, var10, var11, var9.width, var9.height); } - if (!Client.isMenuOpen && var34) { // L: 11509 - if (var9.contentType == 1400) { // L: 11510 - Varcs.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18); // L: 11511 + if (!Client.isMenuOpen && var34) { + if (var9.contentType == 1400) { + Varcs.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18); } else { - Client.Widget_addToMenu(var9, var17 - var10, var18 - var11); // L: 11514 + Client.Widget_addToMenu(var9, var17 - var10, var18 - var11); } } boolean var21; int var23; - if (var33) { // L: 11517 - for (int var20 = 0; var20 < var9.field3300.length; ++var20) { // L: 11518 - var21 = false; // L: 11519 - boolean var27 = false; // L: 11520 - if (!var21 && var9.field3300[var20] != null) { // L: 11521 - for (var23 = 0; var23 < var9.field3300[var20].length; ++var23) { // L: 11522 - boolean var24 = false; // L: 11523 - if (var9.field3368 != null) { // L: 11524 - var24 = KeyHandler.KeyHandler_pressedKeys[var9.field3300[var20][var23]]; // L: 11525 + if (var33) { + for (int var20 = 0; var20 < var9.field3300.length; ++var20) { + var21 = false; + boolean var27 = false; + if (!var21 && var9.field3300[var20] != null) { + for (var23 = 0; var23 < var9.field3300[var20].length; ++var23) { + boolean var24 = false; + if (var9.field3368 != null) { + var24 = KeyHandler.KeyHandler_pressedKeys[var9.field3300[var20][var23]]; } - if (BZip2State.method7571(var9.field3300[var20][var23]) || var24) { // L: 11527 - var21 = true; // L: 11528 - if (var9.field3368 != null && var9.field3368[var20] > Client.cycle) { // L: 11529 + if (BZip2State.method7571(var9.field3300[var20][var23]) || var24) { + var21 = true; + if (var9.field3368 != null && var9.field3368[var20] > Client.cycle) { break; } - byte var32 = var9.field3301[var20][var23]; // L: 11530 - if (var32 == 0 || ((var32 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var32 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var32 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var32 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { // L: 11531 11532 11533 11534 11535 - var27 = true; // L: 11537 - break; // L: 11538 + byte var32 = var9.field3301[var20][var23]; + if (var32 == 0 || ((var32 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var32 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var32 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var32 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { + var27 = true; + break; } } } } - if (var27) { // L: 11543 - if (var20 < 10) { // L: 11544 + if (var27) { + if (var20 < 10) { SoundCache.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); - } else if (var20 == 10) { // L: 11545 - HealthBar.Widget_runOnTargetLeave(); // L: 11546 - UrlRequest.selectSpell(var9.id, var9.childIndex, class404.Widget_unpackTargetMask(class363.getWidgetFlags(var9)), var9.itemId); // L: 11547 - Client.selectedSpellActionName = SecureRandomFuture.Widget_getSpellActionName(var9); // L: 11548 - if (Client.selectedSpellActionName == null) { // L: 11549 + } else if (var20 == 10) { + HealthBar.Widget_runOnTargetLeave(); + UrlRequest.selectSpell(var9.id, var9.childIndex, class404.Widget_unpackTargetMask(class363.getWidgetFlags(var9)), var9.itemId); + Client.selectedSpellActionName = SecureRandomFuture.Widget_getSpellActionName(var9); + if (Client.selectedSpellActionName == null) { Client.selectedSpellActionName = "null"; } - Client.selectedSpellName = var9.dataText + UserComparator5.colorStartTag(16777215); // L: 11550 + Client.selectedSpellName = var9.dataText + UserComparator5.colorStartTag(16777215); } - var23 = var9.field3302[var20]; // L: 11552 - if (var9.field3368 == null) { // L: 11553 + var23 = var9.field3302[var20]; + if (var9.field3368 == null) { var9.field3368 = new int[var9.field3300.length]; } - if (var9.field3303 == null) { // L: 11554 + if (var9.field3303 == null) { var9.field3303 = new int[var9.field3300.length]; } - if (var23 != 0) { // L: 11555 - if (var9.field3368[var20] == 0) { // L: 11556 + if (var23 != 0) { + if (var9.field3368[var20] == 0) { var9.field3368[var20] = var23 + Client.cycle + var9.field3303[var20]; } else { - var9.field3368[var20] = var23 + Client.cycle; // L: 11557 + var9.field3368[var20] = var23 + Client.cycle; } } else { - var9.field3368[var20] = Integer.MAX_VALUE; // L: 11559 + var9.field3368[var20] = Integer.MAX_VALUE; } } - if (!var21 && var9.field3368 != null) { // L: 11561 11562 + if (!var21 && var9.field3368 != null) { var9.field3368[var20] = 0; } } } - if (var9.isIf3) { // L: 11566 - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11567 + if (var9.isIf3) { + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { var34 = true; } else { - var34 = false; // L: 11568 + var34 = false; } - boolean var35 = false; // L: 11569 - if ((MouseHandler.MouseHandler_currentButton == 1 || !class150.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var34) { // L: 11570 + boolean var35 = false; + if ((MouseHandler.MouseHandler_currentButton == 1 || !class150.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var34) { var35 = true; } - var21 = false; // L: 11571 - if ((MouseHandler.MouseHandler_lastButton == 1 || !class150.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { // L: 11572 + var21 = false; + if ((MouseHandler.MouseHandler_lastButton == 1 || !class150.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { var21 = true; } - if (var21) { // L: 11573 + if (var21) { class29.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11); } - if (var9.contentType == 1400) { // L: 11574 - Varcs.worldMap.method7062(var17, var18, var34 & var35, var34 & var21); // L: 11575 + if (var9.contentType == 1400) { + Varcs.worldMap.method7062(var17, var18, var34 & var35, var34 & var21); } - if (Client.clickedWidget != null && var9 != Client.clickedWidget && var34 && class136.method2841(class363.getWidgetFlags(var9))) { // L: 11577 + if (Client.clickedWidget != null && var9 != Client.clickedWidget && var34 && class136.method2841(class363.getWidgetFlags(var9))) { Client.draggedOnWidget = var9; } - if (var9 == Client.clickedWidgetParent) { // L: 11578 - Client.field531 = true; // L: 11579 - Client.field681 = var10; // L: 11580 - Client.field659 = var11; // L: 11581 + if (var9 == Client.clickedWidgetParent) { + Client.field531 = true; + Client.field681 = var10; + Client.field659 = var11; } - if (var9.hasListener) { // L: 11583 + if (var9.hasListener) { ScriptEvent var22; - if (var34 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { // L: 11584 - var22 = new ScriptEvent(); // L: 11585 - var22.isMouseInputEvent = true; // L: 11586 - var22.widget = var9; // L: 11587 - var22.mouseY = Client.mouseWheelRotation; // L: 11588 - var22.args = var9.onScroll; // L: 11589 - Client.scriptEvents.addFirst(var22); // L: 11590 + if (var34 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { + var22 = new ScriptEvent(); + var22.isMouseInputEvent = true; + var22.widget = var9; + var22.mouseY = Client.mouseWheelRotation; + var22.args = var9.onScroll; + Client.scriptEvents.addFirst(var22); } - if (Client.clickedWidget != null || class143.dragInventoryWidget != null || Client.isMenuOpen) { // L: 11592 - var21 = false; // L: 11593 - var35 = false; // L: 11594 - var34 = false; // L: 11595 + if (Client.clickedWidget != null || class143.dragInventoryWidget != null || Client.isMenuOpen) { + var21 = false; + var35 = false; + var34 = false; } - if (!var9.isClicked && var21) { // L: 11597 - var9.isClicked = true; // L: 11598 - if (var9.onClick != null) { // L: 11599 - var22 = new ScriptEvent(); // L: 11600 - var22.isMouseInputEvent = true; // L: 11601 - var22.widget = var9; // L: 11602 - var22.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; // L: 11603 - var22.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; // L: 11604 - var22.args = var9.onClick; // L: 11605 - Client.scriptEvents.addFirst(var22); // L: 11606 + if (!var9.isClicked && var21) { + var9.isClicked = true; + if (var9.onClick != null) { + var22 = new ScriptEvent(); + var22.isMouseInputEvent = true; + var22.widget = var9; + var22.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; + var22.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; + var22.args = var9.onClick; + Client.scriptEvents.addFirst(var22); } } - if (var9.isClicked && var35 && var9.onClickRepeat != null) { // L: 11609 11610 - var22 = new ScriptEvent(); // L: 11611 - var22.isMouseInputEvent = true; // L: 11612 - var22.widget = var9; // L: 11613 - var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 11614 - var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11615 - var22.args = var9.onClickRepeat; // L: 11616 - Client.scriptEvents.addFirst(var22); // L: 11617 + if (var9.isClicked && var35 && var9.onClickRepeat != null) { + var22 = new ScriptEvent(); + var22.isMouseInputEvent = true; + var22.widget = var9; + var22.mouseX = MouseHandler.MouseHandler_x - var10; + var22.mouseY = MouseHandler.MouseHandler_y - var11; + var22.args = var9.onClickRepeat; + Client.scriptEvents.addFirst(var22); } - if (var9.isClicked && !var35) { // L: 11620 - var9.isClicked = false; // L: 11621 - if (var9.onRelease != null) { // L: 11622 - var22 = new ScriptEvent(); // L: 11623 - var22.isMouseInputEvent = true; // L: 11624 - var22.widget = var9; // L: 11625 - var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 11626 - var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11627 - var22.args = var9.onRelease; // L: 11628 - Client.field579.addFirst(var22); // L: 11629 + if (var9.isClicked && !var35) { + var9.isClicked = false; + if (var9.onRelease != null) { + var22 = new ScriptEvent(); + var22.isMouseInputEvent = true; + var22.widget = var9; + var22.mouseX = MouseHandler.MouseHandler_x - var10; + var22.mouseY = MouseHandler.MouseHandler_y - var11; + var22.args = var9.onRelease; + Client.field579.addFirst(var22); } } - if (var35 && var9.onHold != null) { // L: 11632 11633 - var22 = new ScriptEvent(); // L: 11634 - var22.isMouseInputEvent = true; // L: 11635 - var22.widget = var9; // L: 11636 - var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 11637 - var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11638 - var22.args = var9.onHold; // L: 11639 - Client.scriptEvents.addFirst(var22); // L: 11640 + if (var35 && var9.onHold != null) { + var22 = new ScriptEvent(); + var22.isMouseInputEvent = true; + var22.widget = var9; + var22.mouseX = MouseHandler.MouseHandler_x - var10; + var22.mouseY = MouseHandler.MouseHandler_y - var11; + var22.args = var9.onHold; + Client.scriptEvents.addFirst(var22); } - if (!var9.containsMouse && var34) { // L: 11643 - var9.containsMouse = true; // L: 11644 - if (var9.onMouseOver != null) { // L: 11645 - var22 = new ScriptEvent(); // L: 11646 - var22.isMouseInputEvent = true; // L: 11647 - var22.widget = var9; // L: 11648 - var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 11649 - var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11650 - var22.args = var9.onMouseOver; // L: 11651 - Client.scriptEvents.addFirst(var22); // L: 11652 + if (!var9.containsMouse && var34) { + var9.containsMouse = true; + if (var9.onMouseOver != null) { + var22 = new ScriptEvent(); + var22.isMouseInputEvent = true; + var22.widget = var9; + var22.mouseX = MouseHandler.MouseHandler_x - var10; + var22.mouseY = MouseHandler.MouseHandler_y - var11; + var22.args = var9.onMouseOver; + Client.scriptEvents.addFirst(var22); } } - if (var9.containsMouse && var34 && var9.onMouseRepeat != null) { // L: 11655 11656 - var22 = new ScriptEvent(); // L: 11657 - var22.isMouseInputEvent = true; // L: 11658 - var22.widget = var9; // L: 11659 - var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 11660 - var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11661 - var22.args = var9.onMouseRepeat; // L: 11662 - Client.scriptEvents.addFirst(var22); // L: 11663 + if (var9.containsMouse && var34 && var9.onMouseRepeat != null) { + var22 = new ScriptEvent(); + var22.isMouseInputEvent = true; + var22.widget = var9; + var22.mouseX = MouseHandler.MouseHandler_x - var10; + var22.mouseY = MouseHandler.MouseHandler_y - var11; + var22.args = var9.onMouseRepeat; + Client.scriptEvents.addFirst(var22); } - if (var9.containsMouse && !var34) { // L: 11666 - var9.containsMouse = false; // L: 11667 - if (var9.onMouseLeave != null) { // L: 11668 - var22 = new ScriptEvent(); // L: 11669 - var22.isMouseInputEvent = true; // L: 11670 - var22.widget = var9; // L: 11671 - var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 11672 - var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11673 - var22.args = var9.onMouseLeave; // L: 11674 - Client.field579.addFirst(var22); // L: 11675 + if (var9.containsMouse && !var34) { + var9.containsMouse = false; + if (var9.onMouseLeave != null) { + var22 = new ScriptEvent(); + var22.isMouseInputEvent = true; + var22.widget = var9; + var22.mouseX = MouseHandler.MouseHandler_x - var10; + var22.mouseY = MouseHandler.MouseHandler_y - var11; + var22.args = var9.onMouseLeave; + Client.field579.addFirst(var22); } } - if (var9.onTimer != null) { // L: 11678 - var22 = new ScriptEvent(); // L: 11679 - var22.widget = var9; // L: 11680 - var22.args = var9.onTimer; // L: 11681 - Client.field680.addFirst(var22); // L: 11682 + if (var9.onTimer != null) { + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.onTimer; + Client.field680.addFirst(var22); } ScriptEvent var25; int var36; int var37; - if (var9.onVarTransmit != null && Client.changedVarpCount > var9.field3363) { // L: 11684 - if (var9.varTransmitTriggers != null && Client.changedVarpCount - var9.field3363 <= 32) { // L: 11685 + if (var9.onVarTransmit != null && Client.changedVarpCount > var9.field3363) { + if (var9.varTransmitTriggers != null && Client.changedVarpCount - var9.field3363 <= 32) { label809: - for (var37 = var9.field3363; var37 < Client.changedVarpCount; ++var37) { // L: 11692 - var23 = Client.changedVarps[var37 & 31]; // L: 11693 + for (var37 = var9.field3363; var37 < Client.changedVarpCount; ++var37) { + var23 = Client.changedVarps[var37 & 31]; - for (var36 = 0; var36 < var9.varTransmitTriggers.length; ++var36) { // L: 11694 - if (var23 == var9.varTransmitTriggers[var36]) { // L: 11695 - var25 = new ScriptEvent(); // L: 11696 - var25.widget = var9; // L: 11697 - var25.args = var9.onVarTransmit; // L: 11698 - Client.scriptEvents.addFirst(var25); // L: 11699 - break label809; // L: 11700 + for (var36 = 0; var36 < var9.varTransmitTriggers.length; ++var36) { + if (var23 == var9.varTransmitTriggers[var36]) { + var25 = new ScriptEvent(); + var25.widget = var9; + var25.args = var9.onVarTransmit; + Client.scriptEvents.addFirst(var25); + break label809; } } } } else { - var22 = new ScriptEvent(); // L: 11686 - var22.widget = var9; // L: 11687 - var22.args = var9.onVarTransmit; // L: 11688 - Client.scriptEvents.addFirst(var22); // L: 11689 + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.onVarTransmit; + Client.scriptEvents.addFirst(var22); } - var9.field3363 = Client.changedVarpCount; // L: 11705 + var9.field3363 = Client.changedVarpCount; } - if (var9.onInvTransmit != null && Client.field665 > var9.field3364) { // L: 11707 - if (var9.invTransmitTriggers != null && Client.field665 - var9.field3364 <= 32) { // L: 11708 + if (var9.onInvTransmit != null && Client.field665 > var9.field3364) { + if (var9.invTransmitTriggers != null && Client.field665 - var9.field3364 <= 32) { label785: - for (var37 = var9.field3364; var37 < Client.field665; ++var37) { // L: 11715 - var23 = Client.changedItemContainers[var37 & 31]; // L: 11716 + for (var37 = var9.field3364; var37 < Client.field665; ++var37) { + var23 = Client.changedItemContainers[var37 & 31]; - for (var36 = 0; var36 < var9.invTransmitTriggers.length; ++var36) { // L: 11717 - if (var23 == var9.invTransmitTriggers[var36]) { // L: 11718 - var25 = new ScriptEvent(); // L: 11719 - var25.widget = var9; // L: 11720 - var25.args = var9.onInvTransmit; // L: 11721 - Client.scriptEvents.addFirst(var25); // L: 11722 - break label785; // L: 11723 + for (var36 = 0; var36 < var9.invTransmitTriggers.length; ++var36) { + if (var23 == var9.invTransmitTriggers[var36]) { + var25 = new ScriptEvent(); + var25.widget = var9; + var25.args = var9.onInvTransmit; + Client.scriptEvents.addFirst(var25); + break label785; } } } } else { - var22 = new ScriptEvent(); // L: 11709 - var22.widget = var9; // L: 11710 - var22.args = var9.onInvTransmit; // L: 11711 - Client.scriptEvents.addFirst(var22); // L: 11712 + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.onInvTransmit; + Client.scriptEvents.addFirst(var22); } - var9.field3364 = Client.field665; // L: 11728 + var9.field3364 = Client.field665; } - if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field3365) { // L: 11730 - if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field3365 <= 32) { // L: 11731 + if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field3365) { + if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field3365 <= 32) { label761: - for (var37 = var9.field3365; var37 < Client.changedSkillsCount; ++var37) { // L: 11738 - var23 = Client.changedSkills[var37 & 31]; // L: 11739 + for (var37 = var9.field3365; var37 < Client.changedSkillsCount; ++var37) { + var23 = Client.changedSkills[var37 & 31]; - for (var36 = 0; var36 < var9.statTransmitTriggers.length; ++var36) { // L: 11740 - if (var23 == var9.statTransmitTriggers[var36]) { // L: 11741 - var25 = new ScriptEvent(); // L: 11742 - var25.widget = var9; // L: 11743 - var25.args = var9.onStatTransmit; // L: 11744 - Client.scriptEvents.addFirst(var25); // L: 11745 - break label761; // L: 11746 + for (var36 = 0; var36 < var9.statTransmitTriggers.length; ++var36) { + if (var23 == var9.statTransmitTriggers[var36]) { + var25 = new ScriptEvent(); + var25.widget = var9; + var25.args = var9.onStatTransmit; + Client.scriptEvents.addFirst(var25); + break label761; } } } } else { - var22 = new ScriptEvent(); // L: 11732 - var22.widget = var9; // L: 11733 - var22.args = var9.onStatTransmit; // L: 11734 - Client.scriptEvents.addFirst(var22); // L: 11735 + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.onStatTransmit; + Client.scriptEvents.addFirst(var22); } - var9.field3365 = Client.changedSkillsCount; // L: 11751 + var9.field3365 = Client.changedSkillsCount; } - if (Client.chatCycle > var9.field3341 && var9.onChatTransmit != null) { // L: 11753 - var22 = new ScriptEvent(); // L: 11754 - var22.widget = var9; // L: 11755 - var22.args = var9.onChatTransmit; // L: 11756 - Client.scriptEvents.addFirst(var22); // L: 11757 + if (Client.chatCycle > var9.field3341 && var9.onChatTransmit != null) { + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.onChatTransmit; + Client.scriptEvents.addFirst(var22); } - if (Client.field671 > var9.field3341 && var9.onFriendTransmit != null) { // L: 11759 - var22 = new ScriptEvent(); // L: 11760 - var22.widget = var9; // L: 11761 - var22.args = var9.onFriendTransmit; // L: 11762 - Client.scriptEvents.addFirst(var22); // L: 11763 + if (Client.field671 > var9.field3341 && var9.onFriendTransmit != null) { + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.onFriendTransmit; + Client.scriptEvents.addFirst(var22); } - if (Client.field672 > var9.field3341 && var9.onClanTransmit != null) { // L: 11765 - var22 = new ScriptEvent(); // L: 11766 - var22.widget = var9; // L: 11767 - var22.args = var9.onClanTransmit; // L: 11768 - Client.scriptEvents.addFirst(var22); // L: 11769 + if (Client.field672 > var9.field3341 && var9.onClanTransmit != null) { + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.onClanTransmit; + Client.scriptEvents.addFirst(var22); } - if (Client.field673 > var9.field3341 && var9.field3217 != null) { // L: 11771 - var22 = new ScriptEvent(); // L: 11772 - var22.widget = var9; // L: 11773 - var22.args = var9.field3217; // L: 11774 - Client.scriptEvents.addFirst(var22); // L: 11775 + if (Client.field673 > var9.field3341 && var9.field3217 != null) { + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.field3217; + Client.scriptEvents.addFirst(var22); } - if (Client.field583 > var9.field3341 && var9.field3340 != null) { // L: 11777 - var22 = new ScriptEvent(); // L: 11778 - var22.widget = var9; // L: 11779 - var22.args = var9.field3340; // L: 11780 - Client.scriptEvents.addFirst(var22); // L: 11781 + if (Client.field583 > var9.field3341 && var9.field3340 != null) { + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.field3340; + Client.scriptEvents.addFirst(var22); } - if (Client.field675 > var9.field3341 && var9.onStockTransmit != null) { // L: 11783 - var22 = new ScriptEvent(); // L: 11784 - var22.widget = var9; // L: 11785 - var22.args = var9.onStockTransmit; // L: 11786 - Client.scriptEvents.addFirst(var22); // L: 11787 + if (Client.field675 > var9.field3341 && var9.onStockTransmit != null) { + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.onStockTransmit; + Client.scriptEvents.addFirst(var22); } - if (Client.field669 > var9.field3341 && var9.field3294 != null) { // L: 11789 - var22 = new ScriptEvent(); // L: 11790 - var22.widget = var9; // L: 11791 - var22.args = var9.field3294; // L: 11792 - Client.scriptEvents.addFirst(var22); // L: 11793 + if (Client.field669 > var9.field3341 && var9.field3294 != null) { + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.field3294; + Client.scriptEvents.addFirst(var22); } - if (Client.field471 > var9.field3341 && var9.onMiscTransmit != null) { // L: 11795 - var22 = new ScriptEvent(); // L: 11796 - var22.widget = var9; // L: 11797 - var22.args = var9.onMiscTransmit; // L: 11798 - Client.scriptEvents.addFirst(var22); // L: 11799 + if (Client.field471 > var9.field3341 && var9.onMiscTransmit != null) { + var22 = new ScriptEvent(); + var22.widget = var9; + var22.args = var9.onMiscTransmit; + Client.scriptEvents.addFirst(var22); } - var9.field3341 = Client.cycleCntr; // L: 11801 - if (var9.onKey != null) { // L: 11802 - for (var37 = 0; var37 < Client.field701; ++var37) { // L: 11803 - ScriptEvent var31 = new ScriptEvent(); // L: 11804 - var31.widget = var9; // L: 11805 - var31.keyTyped = Client.field522[var37]; // L: 11806 - var31.keyPressed = Client.field758[var37]; // L: 11807 - var31.args = var9.onKey; // L: 11808 - Client.scriptEvents.addFirst(var31); // L: 11809 + var9.field3341 = Client.cycleCntr; + if (var9.onKey != null) { + for (var37 = 0; var37 < Client.field701; ++var37) { + ScriptEvent var31 = new ScriptEvent(); + var31.widget = var9; + var31.keyTyped = Client.field522[var37]; + var31.keyPressed = Client.field758[var37]; + var31.args = var9.onKey; + Client.scriptEvents.addFirst(var31); } } ScriptEvent var30; int[] var38; - if (var9.field3335 != null) { // L: 11812 - var38 = class78.method2140(); // L: 11813 + if (var9.field3335 != null) { + var38 = class78.method2140(); - for (var23 = 0; var23 < var38.length; ++var23) { // L: 11814 - var30 = new ScriptEvent(); // L: 11815 - var30.widget = var9; // L: 11816 - var30.keyTyped = var38[var23]; // L: 11817 - var30.args = var9.field3335; // L: 11818 - Client.scriptEvents.addFirst(var30); // L: 11819 + for (var23 = 0; var23 < var38.length; ++var23) { + var30 = new ScriptEvent(); + var30.widget = var9; + var30.keyTyped = var38[var23]; + var30.args = var9.field3335; + Client.scriptEvents.addFirst(var30); } } - if (var9.field3336 != null) { // L: 11822 - var38 = Language.method5840(); // L: 11823 + if (var9.field3336 != null) { + var38 = Language.method5840(); - for (var23 = 0; var23 < var38.length; ++var23) { // L: 11824 - var30 = new ScriptEvent(); // L: 11825 - var30.widget = var9; // L: 11826 - var30.keyTyped = var38[var23]; // L: 11827 - var30.args = var9.field3336; // L: 11828 - Client.scriptEvents.addFirst(var30); // L: 11829 + for (var23 = 0; var23 < var38.length; ++var23) { + var30 = new ScriptEvent(); + var30.widget = var9; + var30.keyTyped = var38[var23]; + var30.args = var9.field3336; + Client.scriptEvents.addFirst(var30); } } } } - if (!var9.isIf3) { // L: 11834 - if (Client.clickedWidget != null || class143.dragInventoryWidget != null || Client.isMenuOpen) { // L: 11835 + if (!var9.isIf3) { + if (Client.clickedWidget != null || class143.dragInventoryWidget != null || Client.isMenuOpen) { continue; } - if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11836 - if (var9.mouseOverRedirect >= 0) { // L: 11837 + if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + if (var9.mouseOverRedirect >= 0) { class4.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; } else { - class4.mousedOverWidgetIf1 = var9; // L: 11838 + class4.mousedOverWidgetIf1 = var9; } } - if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11840 - class281.field3375 = var9; // L: 11841 + if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + class281.field3375 = var9; } - if (var9.scrollHeight > var9.height) { // L: 11843 + if (var9.scrollHeight > var9.height) { ClientPreferences.method2293(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); } } - if (var9.type == 0) { // L: 11845 - updateInterface(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); // L: 11846 - if (var9.children != null) { // L: 11847 + if (var9.type == 0) { + updateInterface(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); + if (var9.children != null) { updateInterface(var9.children, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); } - InterfaceParent var28 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); // L: 11848 - if (var28 != null) { // L: 11849 - if (var28.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { // L: 11850 - for (ScriptEvent var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 11851 - if (var29.isMouseInputEvent) { // L: 11852 - var29.remove(); // L: 11853 - var29.widget.containsMouse = false; // L: 11854 + InterfaceParent var28 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); + if (var28 != null) { + if (var28.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { + for (ScriptEvent var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) { + if (var29.isMouseInputEvent) { + var29.remove(); + var29.widget.containsMouse = false; } } - if (class87.widgetDragDuration == 0) { // L: 11857 - Client.clickedWidget = null; // L: 11858 - Client.clickedWidgetParent = null; // L: 11859 + if (class87.widgetDragDuration == 0) { + Client.clickedWidget = null; + Client.clickedWidgetParent = null; } - if (!Client.isMenuOpen) { // L: 11861 - WorldMapElement.addCancelMenuEntry(); // L: 11862 + if (!Client.isMenuOpen) { + WorldMapElement.addCancelMenuEntry(); } } - class13.updateRootInterface(var28.group, var12, var13, var14, var15, var10, var11); // L: 11865 + class13.updateRootInterface(var28.group, var12, var13, var14, var15, var10, var11); } } } @@ -920,5 +920,5 @@ public class FriendSystem { } } - } // L: 11869 + } } diff --git a/runescape-client/src/main/java/FriendsChat.java b/runescape-client/src/main/java/FriendsChat.java index b76bb416a2..98891973e7 100644 --- a/runescape-client/src/main/java/FriendsChat.java +++ b/runescape-client/src/main/java/FriendsChat.java @@ -44,13 +44,13 @@ public class FriendsChat extends UserList { descriptor = "(Low;Lmz;)V" ) public FriendsChat(LoginType var1, Usernamed var2) { - super(100); // L: 19 - this.name = null; // L: 12 - this.owner = null; // L: 13 - this.field4090 = 1; // L: 16 - this.loginType = var1; // L: 20 - this.localUser = var2; // L: 21 - } // L: 22 + super(100); + this.name = null; + this.owner = null; + this.field4090 = 1; + this.loginType = var1; + this.localUser = var2; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -59,7 +59,7 @@ public class FriendsChat extends UserList { ) @Export("newInstance") User newInstance() { - return new ClanMate(); // L: 26 + return new ClanMate(); } @ObfuscatedName("b") @@ -69,7 +69,7 @@ public class FriendsChat extends UserList { ) @Export("newTypedArray") User[] newTypedArray(int var1) { - return new ClanMate[var1]; // L: 31 + return new ClanMate[var1]; } @ObfuscatedName("p") @@ -79,8 +79,8 @@ public class FriendsChat extends UserList { ) @Export("readName") final void readName(String var1) { - this.name = class92.method2353(var1); // L: 35 - } // L: 36 + this.name = class92.method2353(var1); + } @ObfuscatedName("w") @ObfuscatedSignature( @@ -89,8 +89,8 @@ public class FriendsChat extends UserList { ) @Export("setOwner") final void setOwner(String var1) { - this.owner = class92.method2353(var1); // L: 39 - } // L: 40 + this.owner = class92.method2353(var1); + } @ObfuscatedName("n") @ObfuscatedSignature( @@ -99,25 +99,25 @@ public class FriendsChat extends UserList { ) @Export("readUpdate") public final void readUpdate(Buffer var1) { - this.setOwner(var1.readStringCp1252NullTerminated()); // L: 43 - long var2 = var1.readLong(); // L: 44 - this.readName(BufferedNetSocket.method6496(var2)); // L: 45 - this.minKick = var1.readByte(); // L: 46 - int var4 = var1.readUnsignedByte(); // L: 47 - if (var4 != 255) { // L: 48 - this.clear(); // L: 49 + this.setOwner(var1.readStringCp1252NullTerminated()); + long var2 = var1.readLong(); + this.readName(BufferedNetSocket.method6496(var2)); + this.minKick = var1.readByte(); + int var4 = var1.readUnsignedByte(); + if (var4 != 255) { + this.clear(); - for (int var5 = 0; var5 < var4; ++var5) { // L: 50 - ClanMate var6 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); // L: 51 - int var7 = var1.readUnsignedShort(); // L: 52 - var6.set(var7, ++this.field4090 - 1); // L: 53 - var6.rank = var1.readByte(); // L: 54 - var1.readStringCp1252NullTerminated(); // L: 55 - this.isLocalPlayer(var6); // L: 56 + for (int var5 = 0; var5 < var4; ++var5) { + ClanMate var6 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); + int var7 = var1.readUnsignedShort(); + var6.set(var7, ++this.field4090 - 1); + var6.rank = var1.readByte(); + var1.readStringCp1252NullTerminated(); + this.isLocalPlayer(var6); } } - } // L: 58 + } @ObfuscatedName("r") @ObfuscatedSignature( @@ -125,41 +125,41 @@ public class FriendsChat extends UserList { garbageValue = "191521599" ) public final void method6305(Buffer var1) { - Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 61 - int var3 = var1.readUnsignedShort(); // L: 62 - byte var4 = var1.readByte(); // L: 63 - boolean var5 = false; // L: 64 - if (var4 == -128) { // L: 65 + Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); + int var3 = var1.readUnsignedShort(); + byte var4 = var1.readByte(); + boolean var5 = false; + if (var4 == -128) { var5 = true; } ClanMate var6; - if (var5) { // L: 66 - if (this.getSize() == 0) { // L: 67 + if (var5) { + if (this.getSize() == 0) { return; } - var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 68 - if (var6 != null && var6.getWorld() == var3) { // L: 69 - this.remove(var6); // L: 70 + var6 = (ClanMate)this.getByCurrentUsername(var2); + if (var6 != null && var6.getWorld() == var3) { + this.remove(var6); } } else { - var1.readStringCp1252NullTerminated(); // L: 74 - var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 75 - if (var6 == null) { // L: 76 - if (this.getSize() > super.capacity) { // L: 77 + var1.readStringCp1252NullTerminated(); + var6 = (ClanMate)this.getByCurrentUsername(var2); + if (var6 == null) { + if (this.getSize() > super.capacity) { return; } - var6 = (ClanMate)this.addLastNoPreviousUsername(var2); // L: 78 + var6 = (ClanMate)this.addLastNoPreviousUsername(var2); } - var6.set(var3, ++this.field4090 - 1); // L: 80 - var6.rank = var4; // L: 81 - this.isLocalPlayer(var6); // L: 82 + var6.set(var3, ++this.field4090 - 1); + var6.rank = var4; + this.isLocalPlayer(var6); } - } // L: 84 + } @ObfuscatedName("o") @ObfuscatedSignature( @@ -168,11 +168,11 @@ public class FriendsChat extends UserList { ) @Export("clearFriends") public final void clearFriends() { - for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 87 - ((ClanMate)this.get(var1)).clearIsFriend(); // L: 88 + for (int var1 = 0; var1 < this.getSize(); ++var1) { + ((ClanMate)this.get(var1)).clearIsFriend(); } - } // L: 90 + } @ObfuscatedName("v") @ObfuscatedSignature( @@ -181,11 +181,11 @@ public class FriendsChat extends UserList { ) @Export("invalidateIgnoreds") public final void invalidateIgnoreds() { - for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 93 - ((ClanMate)this.get(var1)).clearIsIgnored(); // L: 94 + for (int var1 = 0; var1 < this.getSize(); ++var1) { + ((ClanMate)this.get(var1)).clearIsIgnored(); } - } // L: 96 + } @ObfuscatedName("d") @ObfuscatedSignature( @@ -194,9 +194,9 @@ public class FriendsChat extends UserList { ) @Export("isLocalPlayer") final void isLocalPlayer(ClanMate var1) { - if (var1.getUsername().equals(this.localUser.username())) { // L: 99 + if (var1.getUsername().equals(this.localUser.username())) { this.rank = var1.rank; } - } // L: 100 + } } diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java index 8b95e3e071..ee76b114b2 100644 --- a/runescape-client/src/main/java/FriendsList.java +++ b/runescape-client/src/main/java/FriendsList.java @@ -29,11 +29,11 @@ public class FriendsList extends UserList { descriptor = "(Low;)V" ) public FriendsList(LoginType var1) { - super(400); // L: 18 - this.field4081 = 1; // L: 14 - this.friendLoginUpdates = new LinkDeque(); // L: 15 - this.loginType = var1; // L: 19 - } // L: 20 + super(400); + this.field4081 = 1; + this.friendLoginUpdates = new LinkDeque(); + this.loginType = var1; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -42,7 +42,7 @@ public class FriendsList extends UserList { ) @Export("newInstance") User newInstance() { - return new Friend(); // L: 24 + return new Friend(); } @ObfuscatedName("b") @@ -52,7 +52,7 @@ public class FriendsList extends UserList { ) @Export("newTypedArray") User[] newTypedArray(int var1) { - return new Friend[var1]; // L: 29 + return new Friend[var1]; } @ObfuscatedName("p") @@ -62,11 +62,11 @@ public class FriendsList extends UserList { ) @Export("isFriended") public boolean isFriended(Username var1, boolean var2) { - Friend var3 = (Friend)this.getByUsername(var1); // L: 33 + Friend var3 = (Friend)this.getByUsername(var1); if (var3 == null) { - return false; // L: 34 + return false; } else { - return !var2 || var3.world != 0; // L: 35 + return !var2 || var3.world != 0; } } @@ -78,84 +78,84 @@ public class FriendsList extends UserList { @Export("read") public void read(Buffer var1, int var2) { while (true) { - 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 + if (var1.offset < var2) { + boolean var3 = var1.readUnsignedByte() == 1; + Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); + Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); + int var6 = var1.readUnsignedShort(); + int var7 = var1.readUnsignedByte(); + int var8 = var1.readUnsignedByte(); + boolean var9 = (var8 & 2) != 0; + boolean var10 = (var8 & 1) != 0; + if (var6 > 0) { + var1.readStringCp1252NullTerminated(); + var1.readUnsignedByte(); + var1.readInt(); } - 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 && var11 != var12) { // L: 59 - if (var11 != null) { // L: 60 - this.remove(var12); // L: 61 + var1.readStringCp1252NullTerminated(); + if (var4 != null && var4.hasCleanName()) { + Friend var11 = (Friend)this.getByCurrentUsername(var4); + if (var3) { + Friend var12 = (Friend)this.getByCurrentUsername(var5); + if (var12 != null && var11 != var12) { + if (var11 != null) { + this.remove(var12); } else { - var11 = var12; // L: 64 + var11 = var12; } } } - if (var11 != null) { // L: 68 - this.changeName(var11, var4, var5); // L: 69 - if (var6 != var11.world) { // L: 70 - boolean var14 = true; // L: 71 + if (var11 != null) { + this.changeName(var11, var4, var5); + if (var6 != var11.world) { + boolean var14 = true; for (FriendLoginUpdate var13 = (FriendLoginUpdate)this.friendLoginUpdates.last(); var13 != null; var13 = (FriendLoginUpdate)this.friendLoginUpdates.previous()) { - if (var13.username.equals(var4)) { // 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 (var13.username.equals(var4)) { + if (var6 != 0 && var13.world == 0) { + var13.remove(); + var14 = false; + } else if (var6 == 0 && var13.world != 0) { + var13.remove(); + var14 = false; } } } - if (var14) { // L: 84 + if (var14) { this.friendLoginUpdates.addFirst(new FriendLoginUpdate(var4, var6)); } } } else { - if (this.getSize() >= 400) { // L: 87 + if (this.getSize() >= 400) { continue; } - var11 = (Friend)this.addLast(var4, var5); // L: 88 + var11 = (Friend)this.addLast(var4, var5); } - if (var6 != var11.world) { // L: 91 - var11.int2 = ++this.field4081 - 1; // L: 92 - if (var11.world == -1 && var6 == 0) { // L: 93 + if (var6 != var11.world) { + var11.int2 = ++this.field4081 - 1; + if (var11.world == -1 && var6 == 0) { var11.int2 = -(var11.int2 * -818070345) * -79798009; } - var11.world = var6; // L: 94 + var11.world = var6; } - var11.rank = var7; // L: 96 - var11.field4085 = var9; // L: 97 - var11.field4086 = var10; // L: 98 - continue; // L: 99 + var11.rank = var7; + var11.field4085 = var9; + var11.field4086 = var10; + continue; } - throw new IllegalStateException(); // L: 72 + throw new IllegalStateException(); } - this.sort(); // L: 100 - return; // L: 101 + this.sort(); + return; } } } diff --git a/runescape-client/src/main/java/GZipDecompressor.java b/runescape-client/src/main/java/GZipDecompressor.java index 0eaef9e4b5..c681630a42 100644 --- a/runescape-client/src/main/java/GZipDecompressor.java +++ b/runescape-client/src/main/java/GZipDecompressor.java @@ -16,11 +16,11 @@ public class GZipDecompressor { garbageValue = "1000000" ) GZipDecompressor(int var1, int var2, int var3) { - } // L: 13 + } public GZipDecompressor() { - this(-1, 1000000, 1000000); // L: 10 - } // L: 11 + this(-1, 1000000, 1000000); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -29,22 +29,22 @@ public class GZipDecompressor { ) @Export("decompress") public void decompress(Buffer var1, byte[] var2) { - if (var1.array[var1.offset] == 31 && var1.array[var1.offset + 1] == -117) { // L: 16 - if (this.inflater == null) { // L: 17 + if (var1.array[var1.offset] == 31 && var1.array[var1.offset + 1] == -117) { + if (this.inflater == null) { this.inflater = new Inflater(true); } try { - this.inflater.setInput(var1.array, var1.offset + 10, var1.array.length - (var1.offset + 8 + 10)); // L: 19 - this.inflater.inflate(var2); // L: 20 - } catch (Exception var4) { // L: 22 - this.inflater.reset(); // L: 23 - throw new RuntimeException(""); // L: 24 + this.inflater.setInput(var1.array, var1.offset + 10, var1.array.length - (var1.offset + 8 + 10)); + this.inflater.inflate(var2); + } catch (Exception var4) { + this.inflater.reset(); + throw new RuntimeException(""); } - this.inflater.reset(); // L: 26 + this.inflater.reset(); } else { throw new RuntimeException(""); } - } // L: 27 + } } diff --git a/runescape-client/src/main/java/GameBuild.java b/runescape-client/src/main/java/GameBuild.java index 7c59bd2ab3..6ab74bd647 100644 --- a/runescape-client/src/main/java/GameBuild.java +++ b/runescape-client/src/main/java/GameBuild.java @@ -43,16 +43,16 @@ public class GameBuild { public final int buildId; static { - LIVE = new GameBuild("LIVE", 0); // L: 5 - BUILDLIVE = new GameBuild("BUILDLIVE", 3); // L: 6 - RC = new GameBuild("RC", 1); // L: 7 - WIP = new GameBuild("WIP", 2); // L: 8 + LIVE = new GameBuild("LIVE", 0); + BUILDLIVE = new GameBuild("BUILDLIVE", 3); + RC = new GameBuild("RC", 1); + WIP = new GameBuild("WIP", 2); } GameBuild(String var1, int var2) { - this.name = var1; // L: 13 - this.buildId = var2; // L: 14 - } // L: 15 + this.name = var1; + this.buildId = var2; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -60,9 +60,9 @@ public class GameBuild { garbageValue = "727628854" ) static void method5494(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 + var0.removeMouseListener(MouseHandler.MouseHandler_instance); + var0.removeMouseMotionListener(MouseHandler.MouseHandler_instance); + var0.removeFocusListener(MouseHandler.MouseHandler_instance); + MouseHandler.MouseHandler_currentButtonVolatile = 0; + } } diff --git a/runescape-client/src/main/java/GameEngine.java b/runescape-client/src/main/java/GameEngine.java index cefbdcb301..d343e289df 100644 --- a/runescape-client/src/main/java/GameEngine.java +++ b/runescape-client/src/main/java/GameEngine.java @@ -203,37 +203,37 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen static { gameEngine = null; GameEngine_redundantStartThreadCount = 0; - stopTimeMs = 0L; // L: 44 - isKilled = false; // L: 45 + stopTimeMs = 0L; + isKilled = false; cycleDurationMillis = 20; - fiveOrOne = 1; // L: 49 - fps = 0; // L: 50 - graphicsTickTimes = new long[32]; // L: 53 - clientTickTimes = new long[32]; // L: 55 - field204 = 500; // L: 73 - volatileFocus = true; // L: 82 - garbageCollectorLastCollectionTime = -1L; // L: 85 - garbageCollectorLastCheckTimeMs = -1L; // L: 86 + fiveOrOne = 1; + fps = 0; + graphicsTickTimes = new long[32]; + clientTickTimes = new long[32]; + field204 = 500; + volatileFocus = true; + garbageCollectorLastCollectionTime = -1L; + garbageCollectorLastCheckTimeMs = -1L; } protected GameEngine() { 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.field207 = 0L; // L: 76 - EventQueue var1 = null; // L: 89 + this.canvasX = 0; + this.canvasY = 0; + this.fullRedraw = true; + this.resizeCanvasNextFrame = false; + this.isCanvasInvalid = false; + this.field207 = 0L; + EventQueue var1 = null; try { - var1 = Toolkit.getDefaultToolkit().getSystemEventQueue(); // L: 91 - } catch (Throwable var3) { // L: 93 + var1 = Toolkit.getDefaultToolkit().getSystemEventQueue(); + } catch (Throwable var3) { } - this.eventQueue = var1; // L: 94 - class130.method2795(new DevicePcmPlayerProvider()); // L: 95 - } // L: 96 + this.eventQueue = var1; + class130.method2795(new DevicePcmPlayerProvider()); + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -242,13 +242,13 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen ) @Export("setMaxCanvasSize") protected final void setMaxCanvasSize(int var1, int var2) { - if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { // L: 99 + if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { this.method482(); } - this.maxCanvasWidth = var1; // L: 100 - this.maxCanvasHeight = var2; // L: 101 - } // L: 102 + this.maxCanvasWidth = var1; + this.maxCanvasHeight = var2; + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -257,17 +257,17 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen ) @Export("post") final void post(Object var1) { - if (this.eventQueue != null) { // L: 105 - for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { // L: 106 + if (this.eventQueue != null) { + for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { Bounds.method6608(1L); } if (var1 != null) { - this.eventQueue.postEvent(new ActionEvent(var1, 1001, "dummy")); // L: 107 + this.eventQueue.postEvent(new ActionEvent(var1, 1001, "dummy")); } } - } // L: 108 + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -276,12 +276,12 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen ) @Export("mouseWheel") protected class154 mouseWheel() { - if (this.mouseWheelHandler == null) { // L: 111 - this.mouseWheelHandler = new MouseWheelHandler(); // L: 112 - this.mouseWheelHandler.addTo(this.canvas); // L: 113 + if (this.mouseWheelHandler == null) { + this.mouseWheelHandler = new MouseWheelHandler(); + this.mouseWheelHandler.addTo(this.canvas); } - return this.mouseWheelHandler; // L: 115 + return this.mouseWheelHandler; } @ObfuscatedName("j") @@ -291,8 +291,8 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen ) @Export("setUpClipboard") protected void setUpClipboard() { - this.clipboard = this.getToolkit().getSystemClipboard(); // L: 119 - } // L: 120 + this.clipboard = this.getToolkit().getSystemClipboard(); + } @ObfuscatedName("w") @ObfuscatedSignature( @@ -300,8 +300,8 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen garbageValue = "1085024846" ) protected void method492(String var1) { - this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); // L: 123 - } // L: 124 + this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); + } @ObfuscatedName("n") @ObfuscatedSignature( @@ -310,9 +310,9 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen ) @Export("setUpKeyboard") protected final void setUpKeyboard() { - class132.method2810(); // L: 127 - DevicePcmPlayerProvider.method393(this.canvas); // L: 128 - } // L: 129 + class132.method2810(); + DevicePcmPlayerProvider.method393(this.canvas); + } @ObfuscatedName("r") @ObfuscatedSignature( @@ -320,8 +320,8 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen garbageValue = "-150976467" ) protected final void method472() { - class136.method2839(this.canvas); // L: 132 - } // L: 133 + class136.method2839(this.canvas); + } @ObfuscatedName("o") @ObfuscatedSignature( @@ -330,36 +330,36 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen ) @Export("resizeCanvas") final void resizeCanvas() { - Container var1 = this.container(); // L: 136 - if (var1 != null) { // L: 137 - Bounds var2 = this.getFrameContentBounds(); // L: 138 - this.contentWidth = Math.max(var2.highX, this.field197); // L: 139 - this.contentHeight = Math.max(var2.highY, this.field195); // L: 140 - if (this.contentWidth <= 0) { // L: 141 + Container var1 = this.container(); + if (var1 != null) { + Bounds var2 = this.getFrameContentBounds(); + this.contentWidth = Math.max(var2.highX, this.field197); + this.contentHeight = Math.max(var2.highY, this.field195); + if (this.contentWidth <= 0) { this.contentWidth = 1; } - if (this.contentHeight <= 0) { // L: 142 + if (this.contentHeight <= 0) { this.contentHeight = 1; } - class186.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); // L: 143 - BoundaryObject.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); // L: 144 - this.canvasX = (this.contentWidth - class186.canvasWidth) / 2; // L: 145 - this.canvasY = 0; // L: 146 - this.canvas.setSize(class186.canvasWidth, BoundaryObject.canvasHeight); // L: 147 - class19.rasterProvider = new RasterProvider(class186.canvasWidth, BoundaryObject.canvasHeight, this.canvas); // L: 148 - if (var1 == this.frame) { // L: 149 - Insets var3 = this.frame.getInsets(); // L: 150 - this.canvas.setLocation(var3.left + this.canvasX, var3.top + this.canvasY); // L: 151 + class186.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); + BoundaryObject.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); + this.canvasX = (this.contentWidth - class186.canvasWidth) / 2; + this.canvasY = 0; + this.canvas.setSize(class186.canvasWidth, BoundaryObject.canvasHeight); + class19.rasterProvider = new RasterProvider(class186.canvasWidth, BoundaryObject.canvasHeight, this.canvas); + if (var1 == this.frame) { + Insets var3 = this.frame.getInsets(); + this.canvas.setLocation(var3.left + this.canvasX, var3.top + this.canvasY); } else { - this.canvas.setLocation(this.canvasX, this.canvasY); // L: 153 + this.canvas.setLocation(this.canvasX, this.canvasY); } - this.fullRedraw = true; // L: 154 - this.resizeGame(); // L: 155 + this.fullRedraw = true; + this.resizeGame(); } - } // L: 156 + } @ObfuscatedName("v") @ObfuscatedSignature( @@ -376,43 +376,43 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen ) @Export("clearBackground") void clearBackground() { - int var1 = this.canvasX; // L: 161 - int var2 = this.canvasY; // L: 162 - int var3 = this.contentWidth - class186.canvasWidth - var1; // L: 163 - int var4 = this.contentHeight - BoundaryObject.canvasHeight - var2; // L: 164 - if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { // L: 165 + int var1 = this.canvasX; + int var2 = this.canvasY; + int var3 = this.contentWidth - class186.canvasWidth - var1; + int var4 = this.contentHeight - BoundaryObject.canvasHeight - var2; + if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { try { - Container var5 = this.container(); // L: 167 - int var6 = 0; // L: 168 - int var7 = 0; // L: 169 - if (var5 == this.frame) { // L: 170 - Insets var8 = this.frame.getInsets(); // L: 171 - var6 = var8.left; // L: 172 - var7 = var8.top; // L: 173 + Container var5 = this.container(); + int var6 = 0; + int var7 = 0; + if (var5 == this.frame) { + Insets var8 = this.frame.getInsets(); + var6 = var8.left; + var7 = var8.top; } - Graphics var10 = var5.getGraphics(); // L: 175 - var10.setColor(Color.black); // L: 176 + Graphics var10 = var5.getGraphics(); + var10.setColor(Color.black); if (var1 > 0) { - var10.fillRect(var6, var7, var1, this.contentHeight); // L: 177 + var10.fillRect(var6, var7, var1, this.contentHeight); } - if (var2 > 0) { // L: 178 + if (var2 > 0) { var10.fillRect(var6, var7, this.contentWidth, var2); } - if (var3 > 0) { // L: 179 + if (var3 > 0) { var10.fillRect(var6 + this.contentWidth - var3, var7, var3, this.contentHeight); } - if (var4 > 0) { // L: 180 + if (var4 > 0) { var10.fillRect(var6, var7 + this.contentHeight - var4, this.contentWidth, var4); } - } catch (Exception var9) { // L: 182 + } catch (Exception var9) { } } - } // L: 184 + } @ObfuscatedName("h") @ObfuscatedSignature( @@ -421,24 +421,24 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen ) @Export("replaceCanvas") final void replaceCanvas() { - java.awt.Canvas var1 = this.canvas; // L: 187 - var1.removeKeyListener(KeyHandler.KeyHandler_instance); // L: 189 - var1.removeFocusListener(KeyHandler.KeyHandler_instance); // L: 190 - KeyHandler.field120 = -1; // L: 191 - GameBuild.method5494(this.canvas); // L: 193 - if (this.mouseWheelHandler != null) { // L: 194 + java.awt.Canvas var1 = this.canvas; + var1.removeKeyListener(KeyHandler.KeyHandler_instance); + var1.removeFocusListener(KeyHandler.KeyHandler_instance); + KeyHandler.field120 = -1; + GameBuild.method5494(this.canvas); + if (this.mouseWheelHandler != null) { this.mouseWheelHandler.removeFrom(this.canvas); } - this.addCanvas(); // L: 195 - DevicePcmPlayerProvider.method393(this.canvas); // L: 196 - class136.method2839(this.canvas); // L: 197 - if (this.mouseWheelHandler != null) { // L: 198 + this.addCanvas(); + DevicePcmPlayerProvider.method393(this.canvas); + class136.method2839(this.canvas); + if (this.mouseWheelHandler != null) { this.mouseWheelHandler.addTo(this.canvas); } - this.method482(); // L: 199 - } // L: 200 + this.method482(); + } @ObfuscatedName("g") @ObfuscatedSignature( @@ -448,33 +448,33 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen @Export("startThread") protected final void startThread(int var1, int var2, int var3) { try { - if (gameEngine != null) { // L: 204 - ++GameEngine_redundantStartThreadCount; // L: 205 - if (GameEngine_redundantStartThreadCount >= 3) { // L: 206 - this.error("alreadyloaded"); // L: 207 - return; // L: 208 + if (gameEngine != null) { + ++GameEngine_redundantStartThreadCount; + if (GameEngine_redundantStartThreadCount >= 3) { + this.error("alreadyloaded"); + return; } - this.getAppletContext().showDocument(this.getDocumentBase(), "_self"); // L: 210 - return; // L: 211 + this.getAppletContext().showDocument(this.getDocumentBase(), "_self"); + return; } - gameEngine = this; // L: 213 - class186.canvasWidth = var1; // L: 214 - BoundaryObject.canvasHeight = var2; // L: 215 - RunException.RunException_revision = var3; // L: 216 - RunException.RunException_applet = this; // L: 217 - if (taskHandler == null) { // L: 218 + gameEngine = this; + class186.canvasWidth = var1; + BoundaryObject.canvasHeight = var2; + RunException.RunException_revision = var3; + RunException.RunException_applet = this; + if (taskHandler == null) { taskHandler = new TaskHandler(); } - taskHandler.newThreadTask(this, 1); // L: 219 - } catch (Exception var5) { // L: 221 - AccessFile.RunException_sendStackTrace((String)null, var5); // L: 222 - this.error("crash"); // L: 223 + taskHandler.newThreadTask(this, 1); + } catch (Exception var5) { + AccessFile.RunException_sendStackTrace((String)null, var5); + this.error("crash"); } - } // L: 225 + } @ObfuscatedName("e") @ObfuscatedSignature( @@ -483,48 +483,48 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen ) @Export("addCanvas") final synchronized void addCanvas() { - Container var1 = this.container(); // L: 228 - if (this.canvas != null) { // L: 229 - this.canvas.removeFocusListener(this); // L: 230 - var1.remove(this.canvas); // L: 231 + Container var1 = this.container(); + if (this.canvas != null) { + this.canvas.removeFocusListener(this); + var1.remove(this.canvas); } - class186.canvasWidth = Math.max(var1.getWidth(), this.field197); // L: 233 - BoundaryObject.canvasHeight = Math.max(var1.getHeight(), this.field195); // L: 234 + class186.canvasWidth = Math.max(var1.getWidth(), this.field197); + BoundaryObject.canvasHeight = Math.max(var1.getHeight(), this.field195); Insets var2; - if (this.frame != null) { // L: 235 - var2 = this.frame.getInsets(); // L: 236 - class186.canvasWidth -= var2.right + var2.left; // L: 237 - BoundaryObject.canvasHeight -= var2.top + var2.bottom; // L: 238 + if (this.frame != null) { + var2 = this.frame.getInsets(); + class186.canvasWidth -= var2.right + var2.left; + BoundaryObject.canvasHeight -= var2.top + var2.bottom; } - this.canvas = new Canvas(this); // L: 240 - var1.setBackground(Color.BLACK); // L: 241 - var1.setLayout((LayoutManager)null); // L: 242 - var1.add(this.canvas); // L: 243 - this.canvas.setSize(class186.canvasWidth, BoundaryObject.canvasHeight); // L: 244 - this.canvas.setVisible(true); // L: 245 - this.canvas.setBackground(Color.BLACK); // L: 246 - if (var1 == this.frame) { // L: 247 - var2 = this.frame.getInsets(); // L: 248 - this.canvas.setLocation(this.canvasX + var2.left, this.canvasY + var2.top); // L: 249 + this.canvas = new Canvas(this); + var1.setBackground(Color.BLACK); + var1.setLayout((LayoutManager)null); + var1.add(this.canvas); + this.canvas.setSize(class186.canvasWidth, BoundaryObject.canvasHeight); + this.canvas.setVisible(true); + this.canvas.setBackground(Color.BLACK); + if (var1 == this.frame) { + var2 = this.frame.getInsets(); + this.canvas.setLocation(this.canvasX + var2.left, this.canvasY + var2.top); } else { - this.canvas.setLocation(this.canvasX, this.canvasY); // L: 251 + this.canvas.setLocation(this.canvasX, this.canvasY); } - this.canvas.addFocusListener(this); // L: 252 - this.canvas.requestFocus(); // L: 253 - this.fullRedraw = true; // L: 254 - if (class19.rasterProvider != null && class186.canvasWidth == class19.rasterProvider.width && BoundaryObject.canvasHeight == class19.rasterProvider.height) { // L: 255 - ((RasterProvider)class19.rasterProvider).setComponent(this.canvas); // L: 256 - class19.rasterProvider.drawFull(0, 0); // L: 257 + this.canvas.addFocusListener(this); + this.canvas.requestFocus(); + this.fullRedraw = true; + if (class19.rasterProvider != null && class186.canvasWidth == class19.rasterProvider.width && BoundaryObject.canvasHeight == class19.rasterProvider.height) { + ((RasterProvider)class19.rasterProvider).setComponent(this.canvas); + class19.rasterProvider.drawFull(0, 0); } else { - class19.rasterProvider = new RasterProvider(class186.canvasWidth, BoundaryObject.canvasHeight, this.canvas); // L: 260 + class19.rasterProvider = new RasterProvider(class186.canvasWidth, BoundaryObject.canvasHeight, this.canvas); } - this.isCanvasInvalid = false; // L: 262 - this.field207 = Ignored.method6459(); // L: 263 - } // L: 264 + this.isCanvasInvalid = false; + this.field207 = Ignored.method6459(); + } @ObfuscatedName("a") @ObfuscatedSignature( @@ -533,21 +533,21 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen ) @Export("checkHost") protected final boolean checkHost() { - String var1 = this.getDocumentBase().getHost().toLowerCase(); // L: 267 - if (!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) { // L: 268 - if (!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) { // L: 269 - if (var1.endsWith("127.0.0.1")) { // L: 270 + String var1 = this.getDocumentBase().getHost().toLowerCase(); + if (!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) { + if (!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) { + if (var1.endsWith("127.0.0.1")) { return true; } else { - while (var1.length() > 0 && var1.charAt(var1.length() - 1) >= '0' && var1.charAt(var1.length() - 1) <= '9') { // L: 271 + while (var1.length() > 0 && var1.charAt(var1.length() - 1) >= '0' && var1.charAt(var1.length() - 1) <= '9') { var1 = var1.substring(0, var1.length() - 1); } - if (var1.endsWith("192.168.1.")) { // L: 272 + if (var1.endsWith("192.168.1.")) { return true; } else { - this.error("invalidhost"); // L: 273 - return false; // L: 274 + this.error("invalidhost"); + return false; } } } else { @@ -565,19 +565,19 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen ) @Export("clientTick") void clientTick() { - long var1 = Ignored.method6459(); // L: 327 - long var3 = clientTickTimes[ScriptFrame.field448]; // L: 328 - clientTickTimes[ScriptFrame.field448] = var1; // L: 329 - ScriptFrame.field448 = ScriptFrame.field448 + 1 & 31; // L: 330 - if (var3 != 0L && var1 > var3) { // L: 331 + long var1 = Ignored.method6459(); + long var3 = clientTickTimes[ScriptFrame.field448]; + clientTickTimes[ScriptFrame.field448] = var1; + ScriptFrame.field448 = ScriptFrame.field448 + 1 & 31; + if (var3 != 0L && var1 > var3) { } - synchronized(this) { // L: 332 - World.hasFocus = volatileFocus; // L: 333 - } // L: 334 + synchronized(this) { + World.hasFocus = volatileFocus; + } - this.doCycle(); // L: 335 - } // L: 336 + this.doCycle(); + } @ObfuscatedName("k") @ObfuscatedSignature( @@ -586,41 +586,41 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen ) @Export("graphicsTick") void graphicsTick() { - Container var1 = this.container(); // L: 339 - long var2 = Ignored.method6459(); // L: 340 - long var4 = graphicsTickTimes[field191]; // L: 341 - graphicsTickTimes[field191] = var2; // L: 342 - field191 = field191 + 1 & 31; // L: 343 - if (var4 != 0L && var2 > var4) { // L: 344 - int var6 = (int)(var2 - var4); // L: 345 - fps = ((var6 >> 1) + 32000) / var6; // L: 346 + Container var1 = this.container(); + long var2 = Ignored.method6459(); + long var4 = graphicsTickTimes[field191]; + graphicsTickTimes[field191] = var2; + field191 = field191 + 1 & 31; + if (var4 != 0L && var2 > var4) { + int var6 = (int)(var2 - var4); + fps = ((var6 >> 1) + 32000) / var6; } - if (++field204 - 1 > 50) { // L: 348 - field204 -= 50; // L: 349 - this.fullRedraw = true; // L: 350 - this.canvas.setSize(class186.canvasWidth, BoundaryObject.canvasHeight); // L: 351 - this.canvas.setVisible(true); // L: 352 - if (var1 == this.frame) { // L: 353 - Insets var7 = this.frame.getInsets(); // L: 354 - this.canvas.setLocation(this.canvasX + var7.left, this.canvasY + var7.top); // L: 355 + if (++field204 - 1 > 50) { + field204 -= 50; + this.fullRedraw = true; + this.canvas.setSize(class186.canvasWidth, BoundaryObject.canvasHeight); + this.canvas.setVisible(true); + if (var1 == this.frame) { + Insets var7 = this.frame.getInsets(); + this.canvas.setLocation(this.canvasX + var7.left, this.canvasY + var7.top); } else { - this.canvas.setLocation(this.canvasX, this.canvasY); // L: 357 + this.canvas.setLocation(this.canvasX, this.canvasY); } } - if (this.isCanvasInvalid) { // L: 359 + if (this.isCanvasInvalid) { this.replaceCanvas(); } - this.method594(); // L: 360 - this.draw(this.fullRedraw); // L: 361 - if (this.fullRedraw) { // L: 362 + this.method594(); + this.draw(this.fullRedraw); + if (this.fullRedraw) { this.clearBackground(); } - this.fullRedraw = false; // L: 363 - } // L: 364 + this.fullRedraw = false; + } @ObfuscatedName("f") @ObfuscatedSignature( @@ -628,13 +628,13 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen garbageValue = "1862280135" ) final void method594() { - Bounds var1 = this.getFrameContentBounds(); // L: 367 - if (this.contentWidth != var1.highX || this.contentHeight != var1.highY || this.resizeCanvasNextFrame) { // L: 368 - this.resizeCanvas(); // L: 369 - this.resizeCanvasNextFrame = false; // L: 370 + Bounds var1 = this.getFrameContentBounds(); + if (this.contentWidth != var1.highX || this.contentHeight != var1.highY || this.resizeCanvasNextFrame) { + this.resizeCanvas(); + this.resizeCanvasNextFrame = false; } - } // L: 372 + } @ObfuscatedName("l") @ObfuscatedSignature( @@ -642,8 +642,8 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen garbageValue = "73" ) final void method482() { - this.resizeCanvasNextFrame = true; // L: 375 - } // L: 376 + this.resizeCanvasNextFrame = true; + } @ObfuscatedName("q") @ObfuscatedSignature( @@ -652,36 +652,36 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen ) @Export("kill") final synchronized void kill() { - if (!isKilled) { // L: 379 - isKilled = true; // L: 380 + if (!isKilled) { + isKilled = true; try { - this.canvas.removeFocusListener(this); // L: 382 - } catch (Exception var5) { // L: 384 + this.canvas.removeFocusListener(this); + } catch (Exception var5) { } try { - this.kill0(); // L: 386 - } catch (Exception var4) { // L: 388 + this.kill0(); + } catch (Exception var4) { } - if (this.frame != null) { // L: 389 + if (this.frame != null) { try { - System.exit(0); // L: 391 - } catch (Throwable var3) { // L: 393 + System.exit(0); + } catch (Throwable var3) { } } - if (taskHandler != null) { // L: 395 + if (taskHandler != null) { try { - taskHandler.close(); // L: 397 - } catch (Exception var2) { // L: 399 + taskHandler.close(); + } catch (Exception var2) { } } - this.vmethod1151(); // L: 401 + this.vmethod1151(); } - } // L: 402 + } @ObfuscatedName("z") @ObfuscatedSignature( @@ -723,53 +723,53 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen @Export("drawInitial") protected final void drawInitial(int var1, String var2, boolean var3) { try { - Graphics var4 = this.canvas.getGraphics(); // L: 488 - if (class131.fontHelvetica13 == null) { // L: 489 - class131.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); // L: 490 - class114.loginScreenFontMetrics = this.canvas.getFontMetrics(class131.fontHelvetica13); // L: 491 + Graphics var4 = this.canvas.getGraphics(); + if (class131.fontHelvetica13 == null) { + class131.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); + class114.loginScreenFontMetrics = this.canvas.getFontMetrics(class131.fontHelvetica13); } - if (var3) { // L: 493 - var4.setColor(Color.black); // L: 494 - var4.fillRect(0, 0, class186.canvasWidth, BoundaryObject.canvasHeight); // L: 495 + if (var3) { + var4.setColor(Color.black); + var4.fillRect(0, 0, class186.canvasWidth, BoundaryObject.canvasHeight); } - Color var5 = new Color(140, 17, 17); // L: 497 + Color var5 = new Color(140, 17, 17); try { - if (class18.field97 == null) { // L: 499 + if (class18.field97 == null) { class18.field97 = this.canvas.createImage(304, 34); } - Graphics var6 = class18.field97.getGraphics(); // L: 500 - var6.setColor(var5); // L: 501 - var6.drawRect(0, 0, 303, 33); // L: 502 - var6.fillRect(2, 2, var1 * 3, 30); // L: 503 - var6.setColor(Color.black); // L: 504 - var6.drawRect(1, 1, 301, 31); // L: 505 - var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30); // L: 506 - var6.setFont(class131.fontHelvetica13); // L: 507 - var6.setColor(Color.white); // L: 508 - var6.drawString(var2, (304 - class114.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); // L: 509 - var4.drawImage(class18.field97, class186.canvasWidth / 2 - 152, BoundaryObject.canvasHeight / 2 - 18, (ImageObserver)null); // L: 510 - } catch (Exception var9) { // L: 512 - int var7 = class186.canvasWidth / 2 - 152; // L: 513 - int var8 = BoundaryObject.canvasHeight / 2 - 18; // L: 514 - var4.setColor(var5); // L: 515 - var4.drawRect(var7, var8, 303, 33); // L: 516 - var4.fillRect(var7 + 2, var8 + 2, var1 * 3, 30); // L: 517 - var4.setColor(Color.black); // L: 518 - var4.drawRect(var7 + 1, var8 + 1, 301, 31); // L: 519 - var4.fillRect(var1 * 3 + var7 + 2, var8 + 2, 300 - var1 * 3, 30); // L: 520 - var4.setFont(class131.fontHelvetica13); // L: 521 - var4.setColor(Color.white); // L: 522 - var4.drawString(var2, var7 + (304 - class114.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); // L: 523 + Graphics var6 = class18.field97.getGraphics(); + var6.setColor(var5); + var6.drawRect(0, 0, 303, 33); + var6.fillRect(2, 2, var1 * 3, 30); + var6.setColor(Color.black); + var6.drawRect(1, 1, 301, 31); + var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30); + var6.setFont(class131.fontHelvetica13); + var6.setColor(Color.white); + var6.drawString(var2, (304 - class114.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); + var4.drawImage(class18.field97, class186.canvasWidth / 2 - 152, BoundaryObject.canvasHeight / 2 - 18, (ImageObserver)null); + } catch (Exception var9) { + int var7 = class186.canvasWidth / 2 - 152; + int var8 = BoundaryObject.canvasHeight / 2 - 18; + var4.setColor(var5); + var4.drawRect(var7, var8, 303, 33); + var4.fillRect(var7 + 2, var8 + 2, var1 * 3, 30); + var4.setColor(Color.black); + var4.drawRect(var7 + 1, var8 + 1, 301, 31); + var4.fillRect(var1 * 3 + var7 + 2, var8 + 2, 300 - var1 * 3, 30); + var4.setFont(class131.fontHelvetica13); + var4.setColor(Color.white); + var4.drawString(var2, var7 + (304 - class114.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); } - } catch (Exception var10) { // L: 526 - this.canvas.repaint(); // L: 527 + } catch (Exception var10) { + this.canvas.repaint(); } - } // L: 529 + } @ObfuscatedName("ab") @ObfuscatedSignature( @@ -777,10 +777,10 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen garbageValue = "98" ) protected final void method498() { - class18.field97 = null; // L: 532 - class131.fontHelvetica13 = null; // L: 533 - class114.loginScreenFontMetrics = null; // L: 534 - } // L: 535 + class18.field97 = null; + class131.fontHelvetica13 = null; + class114.loginScreenFontMetrics = null; + } @ObfuscatedName("an") @ObfuscatedSignature( @@ -789,17 +789,17 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen ) @Export("error") protected void error(String var1) { - if (!this.hasErrored) { // L: 538 - this.hasErrored = true; // L: 539 - System.out.println("error_game_" + var1); // L: 540 + if (!this.hasErrored) { + this.hasErrored = true; + System.out.println("error_game_" + var1); try { - this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self"); // L: 542 - } catch (Exception var3) { // L: 544 + this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self"); + } catch (Exception var3) { } } - } // L: 545 + } @ObfuscatedName("ax") @ObfuscatedSignature( @@ -808,7 +808,7 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen ) @Export("container") Container container() { - return (Container)(this.frame != null ? this.frame : this); // L: 548 + return (Container)(this.frame != null ? this.frame : this); } @ObfuscatedName("am") @@ -818,16 +818,16 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen ) @Export("getFrameContentBounds") Bounds getFrameContentBounds() { - Container var1 = this.container(); // L: 553 - int var2 = Math.max(var1.getWidth(), this.field197); // L: 554 - int var3 = Math.max(var1.getHeight(), this.field195); // L: 555 - if (this.frame != null) { // L: 556 - Insets var4 = this.frame.getInsets(); // L: 557 - var2 -= var4.left + var4.right; // L: 558 - var3 -= var4.top + var4.bottom; // L: 559 + Container var1 = this.container(); + int var2 = Math.max(var1.getWidth(), this.field197); + int var3 = Math.max(var1.getHeight(), this.field195); + if (this.frame != null) { + Insets var4 = this.frame.getInsets(); + var2 -= var4.left + var4.right; + var3 -= var4.top + var4.bottom; } - return new Bounds(var2, var3); // L: 561 + return new Bounds(var2, var3); } @ObfuscatedName("az") @@ -837,7 +837,7 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen ) @Export("hasFrame") protected final boolean hasFrame() { - return this.frame != null; // L: 565 + return this.frame != null; } @ObfuscatedName("av") @@ -848,132 +848,132 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen protected abstract void vmethod1151(); public final synchronized void paint(Graphics var1) { - if (this == gameEngine && !isKilled) { // L: 438 - this.fullRedraw = true; // L: 439 - if (Ignored.method6459() - this.field207 > 1000L) { // L: 440 - Rectangle var2 = var1.getClipBounds(); // L: 441 + if (this == gameEngine && !isKilled) { + this.fullRedraw = true; + if (Ignored.method6459() - this.field207 > 1000L) { + Rectangle var2 = var1.getClipBounds(); if (var2 == null || var2.width >= class186.canvasWidth && var2.height >= BoundaryObject.canvasHeight) { - this.isCanvasInvalid = true; // L: 442 + this.isCanvasInvalid = true; } } } - } // L: 444 + } public final void destroy() { - if (this == gameEngine && !isKilled) { // L: 425 - stopTimeMs = Ignored.method6459(); // L: 426 - Bounds.method6608(5000L); // L: 427 - this.kill(); // L: 428 + if (this == gameEngine && !isKilled) { + stopTimeMs = Ignored.method6459(); + Bounds.method6608(5000L); + this.kill(); } - } // L: 429 + } public final void windowClosed(WindowEvent var1) { - } // L: 461 + } public final void windowDeactivated(WindowEvent var1) { - } // L: 469 + } public void run() { try { - if (TaskHandler.javaVendor != null) { // L: 279 - String var1 = TaskHandler.javaVendor.toLowerCase(); // L: 280 - if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) { // L: 281 - String var2 = NPC.javaVersion; // L: 282 - 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: 283 - this.error("wrongjava"); // L: 284 - return; // L: 285 + if (TaskHandler.javaVendor != null) { + String var1 = TaskHandler.javaVendor.toLowerCase(); + if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) { + String var2 = NPC.javaVersion; + if (var2.equals("1.1") || var2.startsWith("1.1.") || var2.equals("1.2") || var2.startsWith("1.2.") || var2.equals("1.3") || var2.startsWith("1.3.") || var2.equals("1.4") || var2.startsWith("1.4.") || var2.equals("1.5") || var2.startsWith("1.5.") || var2.equals("1.6.0")) { + this.error("wrongjava"); + return; } - if (var2.startsWith("1.6.0_")) { // L: 287 + if (var2.startsWith("1.6.0_")) { int var3; - for (var3 = 6; var3 < var2.length() && class277.isDigit(var2.charAt(var3)); ++var3) { // L: 288 289 + for (var3 = 6; var3 < var2.length() && class277.isDigit(var2.charAt(var3)); ++var3) { } - String var4 = var2.substring(6, var3); // L: 290 - if (ClanSettings.isNumber(var4) && ClanChannelMember.method2778(var4) < 10) { // L: 291 - this.error("wrongjava"); // L: 292 - return; // L: 293 + String var4 = var2.substring(6, var3); + if (ClanSettings.isNumber(var4) && ClanChannelMember.method2778(var4) < 10) { + this.error("wrongjava"); + return; } } - fiveOrOne = 5; // L: 296 + fiveOrOne = 5; } } - this.setFocusCycleRoot(true); // L: 299 - this.addCanvas(); // L: 300 - this.setUp(); // L: 301 + this.setFocusCycleRoot(true); + this.addCanvas(); + this.setUp(); Object var8; try { - var8 = new NanoClock(); // L: 305 - } catch (Throwable var6) { // L: 307 - var8 = new MilliClock(); // L: 308 + var8 = new NanoClock(); + } catch (Throwable var6) { + var8 = new MilliClock(); } - class91.clock = (Clock)var8; // L: 311 + class91.clock = (Clock)var8; - while (0L == stopTimeMs || Ignored.method6459() < stopTimeMs) { // L: 312 - gameCyclesToDo = class91.clock.wait(cycleDurationMillis, fiveOrOne); // L: 313 + while (0L == stopTimeMs || Ignored.method6459() < stopTimeMs) { + gameCyclesToDo = class91.clock.wait(cycleDurationMillis, fiveOrOne); - for (int var5 = 0; var5 < gameCyclesToDo; ++var5) { // L: 314 + for (int var5 = 0; var5 < gameCyclesToDo; ++var5) { this.clientTick(); } - this.graphicsTick(); // L: 315 - this.post(this.canvas); // L: 316 + this.graphicsTick(); + this.post(this.canvas); } - } catch (Exception var7) { // L: 319 - AccessFile.RunException_sendStackTrace((String)null, var7); // L: 320 - this.error("crash"); // L: 321 + } catch (Exception var7) { + AccessFile.RunException_sendStackTrace((String)null, var7); + this.error("crash"); } - this.kill(); // L: 323 - } // L: 324 + this.kill(); + } public final void stop() { - if (this == gameEngine && !isKilled) { // L: 419 - stopTimeMs = Ignored.method6459() + 4000L; // L: 420 + if (this == gameEngine && !isKilled) { + stopTimeMs = Ignored.method6459() + 4000L; } - } // L: 421 + } public final void update(Graphics var1) { - this.paint(var1); // L: 433 - } // L: 434 + this.paint(var1); + } public final void focusGained(FocusEvent var1) { - volatileFocus = true; // L: 448 - this.fullRedraw = true; // L: 449 - } // L: 450 + volatileFocus = true; + this.fullRedraw = true; + } public final void focusLost(FocusEvent var1) { - volatileFocus = false; // L: 454 - } // L: 455 + volatileFocus = false; + } public final void windowOpened(WindowEvent var1) { - } // L: 478 + } public final void windowActivated(WindowEvent var1) { - } // L: 458 + } public final void windowDeiconified(WindowEvent var1) { - } // L: 472 + } public abstract void init(); public final void windowIconified(WindowEvent var1) { - } // L: 475 + } public final void windowClosing(WindowEvent var1) { - this.destroy(); // L: 465 - } // L: 466 + this.destroy(); + } public final void start() { - if (this == gameEngine && !isKilled) { // L: 413 - stopTimeMs = 0L; // L: 414 + if (this == gameEngine && !isKilled) { + stopTimeMs = 0L; } - } // L: 415 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -982,40 +982,40 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen ) @Export("getFile") public static File getFile(String var0) { - if (!FileSystem.FileSystem_hasPermissions) { // L: 22 + if (!FileSystem.FileSystem_hasPermissions) { throw new RuntimeException(""); } else { - File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); // L: 23 - if (var1 != null) { // L: 24 + File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); + if (var1 != null) { return var1; } else { - File var2 = new File(class125.FileSystem_cacheDir, var0); // L: 25 - RandomAccessFile var3 = null; // L: 26 + File var2 = new File(class125.FileSystem_cacheDir, var0); + RandomAccessFile var3 = null; try { - File var4 = new File(var2.getParent()); // L: 28 - if (!var4.exists()) { // L: 29 + File var4 = new File(var2.getParent()); + if (!var4.exists()) { 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 + var3 = new RandomAccessFile(var2, "rw"); + int var5 = var3.read(); + var3.seek(0L); + var3.write(var5); + var3.seek(0L); + var3.close(); + FileSystem.FileSystem_cacheFiles.put(var0, var2); + return var2; } } catch (Exception var8) { try { - if (var3 != null) { // L: 41 - var3.close(); // L: 42 - var3 = null; // L: 43 + if (var3 != null) { + var3.close(); + var3 = null; } - } catch (Exception var7) { // L: 46 + } catch (Exception var7) { } - throw new RuntimeException(); // L: 48 + throw new RuntimeException(); } } } @@ -1028,344 +1028,344 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen ) static int method581(int var0, Script var1, boolean var2) { int var3; - if (var0 == 6600) { // L: 3908 - var3 = class20.Client_plane; // L: 3909 - int var15 = (class340.localPlayer.x >> 7) + class131.baseX; // L: 3910 - int var8 = (class340.localPlayer.y >> 7) + TileItem.baseY; // L: 3911 - WorldMapRectangle.getWorldMap().method6870(var3, var15, var8, true); // L: 3912 - return 1; // L: 3913 + if (var0 == 6600) { + var3 = class20.Client_plane; + int var15 = (class340.localPlayer.x >> 7) + class131.baseX; + int var8 = (class340.localPlayer.y >> 7) + TileItem.baseY; + WorldMapRectangle.getWorldMap().method6870(var3, var15, var8, true); + return 1; } else { WorldMapArea var9; - if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { // L: 3915 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3916 - String var16 = ""; // L: 3917 - var9 = WorldMapRectangle.getWorldMap().getMapArea(var3); // L: 3918 - if (var9 != null) { // L: 3919 - var16 = var9.getExternalName(); // L: 3920 + if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + String var16 = ""; + var9 = WorldMapRectangle.getWorldMap().getMapArea(var3); + if (var9 != null) { + var16 = var9.getExternalName(); } - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var16; // L: 3922 - return 1; // L: 3923 - } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { // L: 3925 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3926 - WorldMapRectangle.getWorldMap().setCurrentMapAreaId(var3); // L: 3927 - return 1; // L: 3928 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { // L: 3930 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().getZoomLevel(); // L: 3931 - return 1; // L: 3932 - } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { // L: 3934 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3935 - WorldMapRectangle.getWorldMap().setZoomPercentage(var3); // L: 3936 - return 1; // L: 3937 - } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { // L: 3939 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().isCacheLoaded() ? 1 : 0; // L: 3940 - return 1; // L: 3941 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var16; + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + WorldMapRectangle.getWorldMap().setCurrentMapAreaId(var3); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().getZoomLevel(); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + WorldMapRectangle.getWorldMap().setZoomPercentage(var3); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().isCacheLoaded() ? 1 : 0; + return 1; } else { Coord var14; - if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { // L: 3943 - var14 = new Coord(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 3944 - WorldMapRectangle.getWorldMap().setWorldMapPositionTarget(var14.x, var14.y); // L: 3945 - return 1; // L: 3946 - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { // L: 3948 - var14 = new Coord(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 3949 - WorldMapRectangle.getWorldMap().setWorldMapPositionTargetInstant(var14.x, var14.y); // L: 3950 - return 1; // L: 3951 - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { // L: 3953 - var14 = new Coord(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 3954 - WorldMapRectangle.getWorldMap().jumpToSourceCoord(var14.plane, var14.x, var14.y); // L: 3955 - return 1; // L: 3956 - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { // L: 3958 - var14 = new Coord(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 3959 - WorldMapRectangle.getWorldMap().jumpToSourceCoordInstant(var14.plane, var14.x, var14.y); // L: 3960 - return 1; // L: 3961 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { // L: 3963 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().getDisplayX(); // L: 3964 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().getDisplayY(); // L: 3965 - return 1; // L: 3966 + if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { + var14 = new Coord(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); + WorldMapRectangle.getWorldMap().setWorldMapPositionTarget(var14.x, var14.y); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { + var14 = new Coord(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); + WorldMapRectangle.getWorldMap().setWorldMapPositionTargetInstant(var14.x, var14.y); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { + var14 = new Coord(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); + WorldMapRectangle.getWorldMap().jumpToSourceCoord(var14.plane, var14.x, var14.y); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { + var14 = new Coord(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); + WorldMapRectangle.getWorldMap().jumpToSourceCoordInstant(var14.plane, var14.x, var14.y); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().getDisplayX(); + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().getDisplayY(); + return 1; } else { WorldMapArea var11; - if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { // L: 3968 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3969 - var11 = WorldMapRectangle.getWorldMap().getMapArea(var3); // L: 3970 - if (var11 == null) { // L: 3971 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3972 + if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + var11 = WorldMapRectangle.getWorldMap().getMapArea(var3); + if (var11 == null) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var11.getOrigin().packed(); // L: 3975 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var11.getOrigin().packed(); } - return 1; // L: 3977 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { // L: 3979 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3980 - var11 = WorldMapRectangle.getWorldMap().getMapArea(var3); // L: 3981 - if (var11 == null) { // L: 3982 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3983 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3984 + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + var11 = WorldMapRectangle.getWorldMap().getMapArea(var3); + if (var11 == null) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (var11.getRegionHighX() - var11.getRegionLowX() + 1) * 64; // L: 3987 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (var11.getRegionHighY() - var11.getRegionLowY() + 1) * 64; // L: 3988 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (var11.getRegionHighX() - var11.getRegionLowX() + 1) * 64; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (var11.getRegionHighY() - var11.getRegionLowY() + 1) * 64; } - return 1; // L: 3990 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { // L: 3992 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3993 - var11 = WorldMapRectangle.getWorldMap().getMapArea(var3); // L: 3994 - if (var11 == null) { // L: 3995 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3996 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3997 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3998 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3999 + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + var11 = WorldMapRectangle.getWorldMap().getMapArea(var3); + if (var11 == null) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var11.getRegionLowX() * 64; // L: 4002 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var11.getRegionLowY() * 64; // L: 4003 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var11.getRegionHighX() * 64 + 64 - 1; // L: 4004 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var11.getRegionHighY() * 64 + 64 - 1; // L: 4005 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var11.getRegionLowX() * 64; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var11.getRegionLowY() * 64; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var11.getRegionHighX() * 64 + 64 - 1; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var11.getRegionHighY() * 64 + 64 - 1; } - return 1; // L: 4007 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { // L: 4009 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 4010 - var11 = WorldMapRectangle.getWorldMap().getMapArea(var3); // L: 4011 - if (var11 == null) { // L: 4012 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4013 + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + var11 = WorldMapRectangle.getWorldMap().getMapArea(var3); + if (var11 == null) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var11.getZoom(); // L: 4016 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var11.getZoom(); } - return 1; // L: 4018 - } else if (var0 == 6615) { // L: 4020 - var14 = WorldMapRectangle.getWorldMap().getDisplayCoord(); // L: 4021 - if (var14 == null) { // L: 4022 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4023 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4024 + return 1; + } else if (var0 == 6615) { + var14 = WorldMapRectangle.getWorldMap().getDisplayCoord(); + if (var14 == null) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var14.x; // L: 4027 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var14.y; // L: 4028 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var14.x; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var14.y; } - return 1; // L: 4030 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { // L: 4032 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().currentMapAreaId(); // L: 4033 - return 1; // L: 4034 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { // L: 4036 - var14 = new Coord(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 4037 - var11 = WorldMapRectangle.getWorldMap().getCurrentMapArea(); // L: 4038 - if (var11 == null) { // L: 4039 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4040 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4041 - return 1; // L: 4042 + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().currentMapAreaId(); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { + var14 = new Coord(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); + var11 = WorldMapRectangle.getWorldMap().getCurrentMapArea(); + if (var11 == null) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; + return 1; } else { - int[] var12 = var11.position(var14.plane, var14.x, var14.y); // L: 4044 - if (var12 == null) { // L: 4045 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4046 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4047 + int[] var12 = var11.position(var14.plane, var14.x, var14.y); + if (var12 == null) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var12[0]; // L: 4050 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var12[1]; // L: 4051 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var12[0]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var12[1]; } - return 1; // L: 4053 + return 1; } } else { Coord var5; - if (var0 == 6618) { // L: 4055 - var14 = new Coord(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 4056 - var11 = WorldMapRectangle.getWorldMap().getCurrentMapArea(); // L: 4057 - if (var11 == null) { // L: 4058 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4059 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4060 - return 1; // L: 4061 + if (var0 == 6618) { + var14 = new Coord(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); + var11 = WorldMapRectangle.getWorldMap().getCurrentMapArea(); + if (var11 == null) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; + return 1; } else { - var5 = var11.coord(var14.x, var14.y); // L: 4063 - if (var5 == null) { // L: 4064 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4065 + var5 = var11.coord(var14.x, var14.y); + if (var5 == null) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.packed(); // L: 4068 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.packed(); } - return 1; // L: 4070 + return 1; } } else { Coord var10; - if (var0 == 6619) { // L: 4072 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 4073 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 4074 - var10 = new Coord(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]); // L: 4075 - SoundCache.method831(var3, var10, false); // L: 4076 - return 1; // L: 4077 - } else if (var0 == 6620) { // L: 4079 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 4080 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 4081 - var10 = new Coord(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]); // L: 4082 - SoundCache.method831(var3, var10, true); // L: 4083 - return 1; // L: 4084 - } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { // L: 4086 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 4087 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 4088 - var10 = new Coord(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]); // L: 4089 - var9 = WorldMapRectangle.getWorldMap().getMapArea(var3); // L: 4090 - if (var9 == null) { // L: 4091 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 4092 - return 1; // L: 4093 + if (var0 == 6619) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var10 = new Coord(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]); + SoundCache.method831(var3, var10, false); + return 1; + } else if (var0 == 6620) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var10 = new Coord(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]); + SoundCache.method831(var3, var10, true); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var10 = new Coord(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]); + var9 = WorldMapRectangle.getWorldMap().getMapArea(var3); + if (var9 == null) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + return 1; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.containsCoord(var10.plane, var10.x, var10.y) ? 1 : 0; // L: 4095 - return 1; // L: 4096 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.containsCoord(var10.plane, var10.x, var10.y) ? 1 : 0; + return 1; } - } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { // L: 4098 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().getDisplayWith(); // L: 4099 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().getDisplayHeight(); // L: 4100 - return 1; // L: 4101 - } else if (var0 == 6623) { // L: 4103 - var14 = new Coord(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 4104 - var11 = WorldMapRectangle.getWorldMap().mapAreaAtCoord(var14.plane, var14.x, var14.y); // L: 4105 - if (var11 == null) { // L: 4106 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4107 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().getDisplayWith(); + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().getDisplayHeight(); + return 1; + } else if (var0 == 6623) { + var14 = new Coord(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); + var11 = WorldMapRectangle.getWorldMap().mapAreaAtCoord(var14.plane, var14.x, var14.y); + if (var11 == null) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var11.getId(); // L: 4110 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var11.getId(); } - return 1; // L: 4112 - } else if (var0 == 6624) { // L: 4114 - WorldMapRectangle.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 4115 - return 1; // L: 4116 - } else if (var0 == 6625) { // L: 4118 - WorldMapRectangle.getWorldMap().resetMaxFlashCount(); // L: 4119 - return 1; // L: 4120 - } else if (var0 == 6626) { // L: 4122 - WorldMapRectangle.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 4123 - return 1; // L: 4124 - } else if (var0 == 6627) { // L: 4126 - WorldMapRectangle.getWorldMap().resetCyclesPerFlash(); // L: 4127 - return 1; // L: 4128 + return 1; + } else if (var0 == 6624) { + WorldMapRectangle.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); + return 1; + } else if (var0 == 6625) { + WorldMapRectangle.getWorldMap().resetMaxFlashCount(); + return 1; + } else if (var0 == 6626) { + WorldMapRectangle.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); + return 1; + } else if (var0 == 6627) { + WorldMapRectangle.getWorldMap().resetCyclesPerFlash(); + return 1; } else { boolean var13; - if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { // L: 4130 - var13 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 4131 - WorldMapRectangle.getWorldMap().setPerpetualFlash(var13); // L: 4132 - return 1; // L: 4133 - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { // L: 4135 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 4136 - WorldMapRectangle.getWorldMap().flashElement(var3); // L: 4137 - return 1; // L: 4138 - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { // L: 4140 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 4141 - WorldMapRectangle.getWorldMap().flashCategory(var3); // L: 4142 - return 1; // L: 4143 - } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { // L: 4145 - WorldMapRectangle.getWorldMap().stopCurrentFlashes(); // L: 4146 - return 1; // L: 4147 - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { // L: 4149 - var13 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 4150 - WorldMapRectangle.getWorldMap().setElementsDisabled(var13); // L: 4151 - return 1; // L: 4152 + if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { + var13 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + WorldMapRectangle.getWorldMap().setPerpetualFlash(var13); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + WorldMapRectangle.getWorldMap().flashElement(var3); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + WorldMapRectangle.getWorldMap().flashCategory(var3); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { + WorldMapRectangle.getWorldMap().stopCurrentFlashes(); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { + var13 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + WorldMapRectangle.getWorldMap().setElementsDisabled(var13); + return 1; } else { boolean var7; - if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { // L: 4154 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 4155 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 4156 - var7 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1] == 1; // L: 4157 - WorldMapRectangle.getWorldMap().disableElement(var3, var7); // L: 4158 - return 1; // L: 4159 - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { // L: 4161 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 4162 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 4163 - var7 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1] == 1; // L: 4164 - WorldMapRectangle.getWorldMap().setCategoryDisabled(var3, var7); // L: 4165 - return 1; // L: 4166 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { // L: 4168 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().getElementsDisabled() ? 1 : 0; // L: 4169 - return 1; // L: 4170 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { // L: 4172 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 4173 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().isElementDisabled(var3) ? 1 : 0; // L: 4174 - return 1; // L: 4175 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { // L: 4177 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 4178 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; // L: 4179 - return 1; // L: 4180 - } else if (var0 == 6638) { // L: 4182 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 4183 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 4184 - var10 = new Coord(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]); // L: 4185 - var5 = WorldMapRectangle.getWorldMap().method6988(var3, var10); // L: 4186 - if (var5 == null) { // L: 4187 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4188 + if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1] == 1; + WorldMapRectangle.getWorldMap().disableElement(var3, var7); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1] == 1; + WorldMapRectangle.getWorldMap().setCategoryDisabled(var3, var7); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().getElementsDisabled() ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().isElementDisabled(var3) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; + return 1; + } else if (var0 == 6638) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var10 = new Coord(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]); + var5 = WorldMapRectangle.getWorldMap().method6988(var3, var10); + if (var5 == null) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.packed(); // L: 4191 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.packed(); } - return 1; // L: 4193 + return 1; } else { AbstractWorldMapIcon var6; - if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { // L: 4195 - var6 = WorldMapRectangle.getWorldMap().iconStart(); // L: 4196 - if (var6 == null) { // L: 4197 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4198 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4199 + if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { + var6 = WorldMapRectangle.getWorldMap().iconStart(); + if (var6 == null) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4202 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4203 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var6.getElement(); + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var6.coord2.packed(); } - return 1; // L: 4205 - } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { // L: 4207 - var6 = WorldMapRectangle.getWorldMap().iconNext(); // L: 4208 - if (var6 == null) { // L: 4209 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4210 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4211 + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { + var6 = WorldMapRectangle.getWorldMap().iconNext(); + if (var6 == null) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4214 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4215 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var6.getElement(); + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var6.coord2.packed(); } - return 1; // L: 4217 + return 1; } else { WorldMapElement var4; - if (var0 == ScriptOpcodes.MEC_TEXT) { // L: 4219 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 4220 - var4 = class78.WorldMapElement_get(var3); // L: 4221 - if (var4.name == null) { // L: 4222 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 4223 + if (var0 == ScriptOpcodes.MEC_TEXT) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + var4 = class78.WorldMapElement_get(var3); + if (var4.name == null) { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.name; // L: 4226 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.name; } - return 1; // L: 4228 - } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { // L: 4230 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 4231 - var4 = class78.WorldMapElement_get(var3); // L: 4232 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.textSize; // L: 4233 - return 1; // L: 4234 - } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { // L: 4236 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 4237 - var4 = class78.WorldMapElement_get(var3); // L: 4238 - if (var4 == null) { // L: 4239 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4240 + return 1; + } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + var4 = class78.WorldMapElement_get(var3); + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.textSize; + return 1; + } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + var4 = class78.WorldMapElement_get(var3); + if (var4 == null) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.category; // L: 4243 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.category; } - return 1; // L: 4245 - } else if (var0 == ScriptOpcodes.MEC_SPRITE) { // L: 4247 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 4248 - var4 = class78.WorldMapElement_get(var3); // L: 4249 - if (var4 == null) { // L: 4250 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4251 + return 1; + } else if (var0 == ScriptOpcodes.MEC_SPRITE) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + var4 = class78.WorldMapElement_get(var3); + if (var4 == null) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.sprite1; // L: 4254 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.sprite1; } - return 1; // L: 4256 - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { // L: 4258 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = FileSystem.worldMapEvent.mapElement; // L: 4259 - return 1; // L: 4260 - } else if (var0 == 6698) { // L: 4262 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = FileSystem.worldMapEvent.coord1.packed(); // L: 4263 - return 1; // L: 4264 - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { // L: 4266 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = FileSystem.worldMapEvent.coord2.packed(); // L: 4267 - return 1; // L: 4268 + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = FileSystem.worldMapEvent.mapElement; + return 1; + } else if (var0 == 6698) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = FileSystem.worldMapEvent.coord1.packed(); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = FileSystem.worldMapEvent.coord2.packed(); + return 1; } else { - return 2; // L: 4270 + return 2; } } } diff --git a/runescape-client/src/main/java/GameObject.java b/runescape-client/src/main/java/GameObject.java index 3f0034a4be..dcab46eb97 100644 --- a/runescape-client/src/main/java/GameObject.java +++ b/runescape-client/src/main/java/GameObject.java @@ -104,9 +104,9 @@ public final class GameObject { int flags; GameObject() { - this.tag = 0L; // L: 16 - this.flags = 0; // L: 17 - } // L: 19 + this.tag = 0L; + this.flags = 0; + } @ObfuscatedName("aa") @ObfuscatedSignature( @@ -114,32 +114,32 @@ public final class GameObject { garbageValue = "210014678" ) static int method4341(int var0, Script var1, boolean var2) { - if (var0 != 6700 && var0 != 6702 && var0 != 6704 && var0 != 6706 && var0 != 6708) { // L: 4274 - if (var0 != 6701 && var0 != 6703 && var0 != 6705 && var0 != 6707 && var0 != 6709) { // L: 4279 - if (var0 == 6750) { // L: 4283 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 4284 - return 1; // L: 4285 - } else if (var0 != 6751 && var0 != 6752 && var0 != 6753) { // L: 4287 - if (var0 == 6754) { // L: 4291 - int var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 4292 - NPCComposition var4 = WorldMapLabelSize.getNpcDefinition(var3); // L: 4293 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; // L: 4294 - return 1; // L: 4295 + if (var0 != 6700 && var0 != 6702 && var0 != 6704 && var0 != 6706 && var0 != 6708) { + if (var0 != 6701 && var0 != 6703 && var0 != 6705 && var0 != 6707 && var0 != 6709) { + if (var0 == 6750) { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + return 1; + } else if (var0 != 6751 && var0 != 6752 && var0 != 6753) { + if (var0 == 6754) { + int var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + NPCComposition var4 = WorldMapLabelSize.getNpcDefinition(var3); + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; + return 1; } else { - return 2; // L: 4297 + return 2; } } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4288 - return 1; // L: 4289 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; + return 1; } } else { - --IsaacCipher.Interpreter_intStackSize; // L: 4280 - return 1; // L: 4281 + --IsaacCipher.Interpreter_intStackSize; + return 1; } } else { - IsaacCipher.Interpreter_intStackSize -= 2; // L: 4275 - --class13.Interpreter_stringStackSize; // L: 4276 - return 1; // L: 4277 + IsaacCipher.Interpreter_intStackSize -= 2; + --class13.Interpreter_stringStackSize; + return 1; } } } diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index 86a3cb1a11..e467977fb0 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -36,21 +36,21 @@ public class GrandExchangeEvent { descriptor = "(Lpi;BI)V" ) GrandExchangeEvent(Buffer var1, byte var2, int var3) { - this.offerName = var1.readStringCp1252NullTerminated(); // L: 111 - this.previousOfferName = var1.readStringCp1252NullTerminated(); // L: 112 - this.world = var1.readUnsignedShort(); // L: 113 - this.age = var1.readLong(); // L: 114 - int var4 = var1.readInt(); // L: 115 - int var5 = var1.readInt(); // L: 116 - this.grandExchangeOffer = new GrandExchangeOffer(); // L: 117 - this.grandExchangeOffer.method5765(2); // L: 118 - this.grandExchangeOffer.method5766(var2); // L: 119 - this.grandExchangeOffer.unitPrice = var4; // L: 120 - this.grandExchangeOffer.totalQuantity = var5; // L: 121 - this.grandExchangeOffer.currentQuantity = 0; // L: 122 - this.grandExchangeOffer.currentPrice = 0; // L: 123 - this.grandExchangeOffer.id = var3; // L: 124 - } // L: 125 + this.offerName = var1.readStringCp1252NullTerminated(); + this.previousOfferName = var1.readStringCp1252NullTerminated(); + this.world = var1.readUnsignedShort(); + this.age = var1.readLong(); + int var4 = var1.readInt(); + int var5 = var1.readInt(); + this.grandExchangeOffer = new GrandExchangeOffer(); + this.grandExchangeOffer.method5765(2); + this.grandExchangeOffer.method5766(var2); + this.grandExchangeOffer.unitPrice = var4; + this.grandExchangeOffer.totalQuantity = var5; + this.grandExchangeOffer.currentQuantity = 0; + this.grandExchangeOffer.currentPrice = 0; + this.grandExchangeOffer.id = var3; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -59,7 +59,7 @@ public class GrandExchangeEvent { ) @Export("getOfferName") public String getOfferName() { - return this.offerName; // L: 128 + return this.offerName; } @ObfuscatedName("b") @@ -69,7 +69,7 @@ public class GrandExchangeEvent { ) @Export("getPreviousOfferName") public String getPreviousOfferName() { - return this.previousOfferName; // L: 132 + return this.previousOfferName; } @ObfuscatedName("c") @@ -78,18 +78,18 @@ public class GrandExchangeEvent { garbageValue = "3161" ) static void method5760() { - for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 30 - if (var0.stream1 != null) { // L: 31 - class281.pcmStreamMixer.removeSubStream(var0.stream1); // L: 32 - var0.stream1 = null; // L: 33 + for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var0.stream1 != null) { + class281.pcmStreamMixer.removeSubStream(var0.stream1); + var0.stream1 = null; } - if (var0.stream2 != null) { // L: 35 - class281.pcmStreamMixer.removeSubStream(var0.stream2); // L: 36 - var0.stream2 = null; // L: 37 + if (var0.stream2 != null) { + class281.pcmStreamMixer.removeSubStream(var0.stream2); + var0.stream2 = null; } } - ObjectSound.objectSounds.clear(); // L: 40 - } // L: 41 + ObjectSound.objectSounds.clear(); + } } diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java index f1eac06998..83b19b64dc 100644 --- a/runescape-client/src/main/java/GrandExchangeEvents.java +++ b/runescape-client/src/main/java/GrandExchangeEvents.java @@ -27,35 +27,35 @@ public class GrandExchangeEvents { public final List events; static { - GrandExchangeEvents_ageComparator = new GrandExchangeOfferAgeComparator(); // L: 11 + GrandExchangeEvents_ageComparator = new GrandExchangeOfferAgeComparator(); new GrandExchangeOfferWorldComparator(); - GrandExchangeEvents_priceComparator = new GrandExchangeOfferUnitPriceComparator(); // L: 41 - GrandExchangeEvents_nameComparator = new GrandExchangeOfferNameComparator(); // L: 54 + GrandExchangeEvents_priceComparator = new GrandExchangeOfferUnitPriceComparator(); + GrandExchangeEvents_nameComparator = new GrandExchangeOfferNameComparator(); GrandExchangeEvents_quantityComparator = new GrandExchangeOfferTotalQuantityComparator(); - } // L: 67 + } @ObfuscatedSignature( descriptor = "(Lpi;Z)V", garbageValue = "1" ) public GrandExchangeEvents(Buffer var1, boolean var2) { - int var3 = var1.readUnsignedShort(); // L: 82 - boolean var4 = var1.readUnsignedByte() == 1; // L: 83 + int var3 = var1.readUnsignedShort(); + boolean var4 = var1.readUnsignedByte() == 1; byte var5; - if (var4) { // L: 85 + if (var4) { var5 = 1; } else { - var5 = 0; // L: 86 + var5 = 0; } - int var6 = var1.readUnsignedShort(); // L: 87 - this.events = new ArrayList(var6); // L: 88 + int var6 = var1.readUnsignedShort(); + this.events = new ArrayList(var6); - for (int var7 = 0; var7 < var6; ++var7) { // L: 89 - this.events.add(new GrandExchangeEvent(var1, var5, var3)); // L: 90 + for (int var7 = 0; var7 < var6; ++var7) { + this.events.add(new GrandExchangeEvent(var1, var5, var3)); } - } // L: 92 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -64,13 +64,13 @@ public class GrandExchangeEvents { ) @Export("sort") public void sort(Comparator var1, boolean var2) { - if (var2) { // L: 95 - Collections.sort(this.events, var1); // L: 96 + if (var2) { + Collections.sort(this.events, var1); } else { - Collections.sort(this.events, Collections.reverseOrder(var1)); // L: 99 + Collections.sort(this.events, Collections.reverseOrder(var1)); } - } // L: 101 + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -78,11 +78,11 @@ public class GrandExchangeEvents { garbageValue = "40" ) public static void method5716() { - if (KeyHandler.KeyHandler_instance != null) { // L: 161 - synchronized(KeyHandler.KeyHandler_instance) { // L: 162 - KeyHandler.KeyHandler_instance = null; // L: 163 - } // L: 164 + if (KeyHandler.KeyHandler_instance != null) { + synchronized(KeyHandler.KeyHandler_instance) { + KeyHandler.KeyHandler_instance = null; + } } - } // L: 166 + } } diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java index 5c1f469a0d..3cf012b820 100644 --- a/runescape-client/src/main/java/GrandExchangeOffer.java +++ b/runescape-client/src/main/java/GrandExchangeOffer.java @@ -42,20 +42,20 @@ public class GrandExchangeOffer { public int currentPrice; public GrandExchangeOffer() { - } // L: 13 + } @ObfuscatedSignature( descriptor = "(Lpi;Z)V", garbageValue = "0" ) public GrandExchangeOffer(Buffer var1, boolean var2) { - this.state = var1.readByte(); // L: 16 - this.id = var1.readUnsignedShort(); // L: 17 - this.unitPrice = var1.readInt(); // L: 18 - this.totalQuantity = var1.readInt(); // L: 19 - this.currentQuantity = var1.readInt(); // L: 20 - this.currentPrice = var1.readInt(); // L: 21 - } // L: 22 + this.state = var1.readByte(); + this.id = var1.readUnsignedShort(); + this.unitPrice = var1.readInt(); + this.totalQuantity = var1.readInt(); + this.currentQuantity = var1.readInt(); + this.currentPrice = var1.readInt(); + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -64,7 +64,7 @@ public class GrandExchangeOffer { ) @Export("status") public int status() { - return this.state & 7; // L: 50 + return this.state & 7; } @ObfuscatedName("m") @@ -74,7 +74,7 @@ public class GrandExchangeOffer { ) @Export("type") public int type() { - return (this.state & 8) == 8 ? 1 : 0; // L: 54 + return (this.state & 8) == 8 ? 1 : 0; } @ObfuscatedName("t") @@ -83,9 +83,9 @@ public class GrandExchangeOffer { garbageValue = "2147483647" ) void method5765(int var1) { - this.state &= -8; // L: 58 - this.state = (byte)(this.state | var1 & 7); // L: 59 - } // L: 60 + this.state &= -8; + this.state = (byte)(this.state | var1 & 7); + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -93,10 +93,10 @@ public class GrandExchangeOffer { garbageValue = "-435429796" ) void method5766(int var1) { - this.state &= -9; // L: 63 + this.state &= -9; if (var1 == 1) { - this.state = (byte)(this.state | 8); // L: 64 + this.state = (byte)(this.state | 8); } - } // L: 65 + } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java index 367457b624..353d8e5427 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java @@ -23,15 +23,15 @@ final class GrandExchangeOfferAgeComparator implements Comparator { ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - return var1.age < var2.age ? -1 : (var1.age == var2.age ? 0 : 1); // L: 13 + return var1.age < var2.age ? -1 : (var1.age == var2.age ? 0 : 1); } 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); } public boolean equals(Object var1) { - return super.equals(var1); // L: 21 + return super.equals(var1); } @ObfuscatedName("ii") @@ -41,104 +41,104 @@ final class GrandExchangeOfferAgeComparator implements Comparator { ) @Export("addNpcToMenu") static final void addNpcToMenu(NPC var0, int var1, int var2, int var3) { - NPCComposition var4 = var0.definition; // L: 10241 - if (Client.menuOptionsCount < 400) { // L: 10242 - if (var4.transforms != null) { // L: 10243 + NPCComposition var4 = var0.definition; + if (Client.menuOptionsCount < 400) { + if (var4.transforms != null) { var4 = var4.transform(); } - if (var4 != null) { // L: 10244 - if (var4.isInteractable) { // L: 10245 - if (!var4.isFollower || Client.followerIndex == var1) { // L: 10246 - String var5 = var4.name; // L: 10247 + if (var4 != null) { + if (var4.isInteractable) { + if (!var4.isFollower || Client.followerIndex == var1) { + String var5 = var4.name; int var6; - if (var4.combatLevel != 0 && var0.field1119 != 0) { // L: 10248 - var6 = var0.field1119 != -1 ? var0.field1119 * 658677507 * 787891115 : var4.combatLevel * -73157727 * -2058162079; // L: 10249 - var5 = var5 + Tiles.method2108(var6, class340.localPlayer.combatLevel) + " " + " (" + "level-" + var6 + ")"; // L: 10250 + if (var4.combatLevel != 0 && var0.field1119 != 0) { + var6 = var0.field1119 != -1 ? var0.field1119 * 658677507 * 787891115 : var4.combatLevel * -73157727 * -2058162079; + var5 = var5 + Tiles.method2108(var6, class340.localPlayer.combatLevel) + " " + " (" + "level-" + var6 + ")"; } - if (var4.isFollower && Client.followerOpsLowPriority) { // L: 10252 - class11.insertMenuItemNoShift("Examine", UserComparator5.colorStartTag(16776960) + var5, 1003, var1, var2, var3); // L: 10253 + if (var4.isFollower && Client.followerOpsLowPriority) { + class11.insertMenuItemNoShift("Examine", UserComparator5.colorStartTag(16776960) + var5, 1003, var1, var2, var3); } - if (Client.isItemSelected == 1) { // L: 10256 - class11.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator5.colorStartTag(16776960) + var5, 7, var1, var2, var3); // L: 10257 - } else if (Client.isSpellSelected) { // L: 10260 - if ((class91.selectedSpellFlags & 2) == 2) { // L: 10261 - class11.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator5.colorStartTag(16776960) + var5, 8, var1, var2, var3); // L: 10262 + if (Client.isItemSelected == 1) { + class11.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator5.colorStartTag(16776960) + var5, 7, var1, var2, var3); + } else if (Client.isSpellSelected) { + if ((class91.selectedSpellFlags & 2) == 2) { + class11.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator5.colorStartTag(16776960) + var5, 8, var1, var2, var3); } } else { - var6 = var4.isFollower && Client.followerOpsLowPriority ? 2000 : 0; // L: 10267 - String[] var7 = var4.actions; // L: 10268 + var6 = var4.isFollower && Client.followerOpsLowPriority ? 2000 : 0; + String[] var7 = var4.actions; int var8; int var9; - if (var7 != null) { // L: 10269 - for (var8 = 4; var8 >= 0; --var8) { // L: 10270 - if (var7[var8] != null && !var7[var8].equalsIgnoreCase("Attack")) { // L: 10271 - var9 = 0; // L: 10272 - if (var8 == 0) { // L: 10273 + if (var7 != null) { + for (var8 = 4; var8 >= 0; --var8) { + if (var7[var8] != null && !var7[var8].equalsIgnoreCase("Attack")) { + var9 = 0; + if (var8 == 0) { var9 = var6 + 9; } - if (var8 == 1) { // L: 10274 + if (var8 == 1) { var9 = var6 + 10; } - if (var8 == 2) { // L: 10275 + if (var8 == 2) { var9 = var6 + 11; } - if (var8 == 3) { // L: 10276 + if (var8 == 3) { var9 = var6 + 12; } - if (var8 == 4) { // L: 10277 + if (var8 == 4) { var9 = var6 + 13; } - class11.insertMenuItemNoShift(var7[var8], UserComparator5.colorStartTag(16776960) + var5, var9, var1, var2, var3); // L: 10278 + class11.insertMenuItemNoShift(var7[var8], UserComparator5.colorStartTag(16776960) + var5, var9, var1, var2, var3); } } } - if (var7 != null) { // L: 10283 - for (var8 = 4; var8 >= 0; --var8) { // L: 10284 - if (var7[var8] != null && var7[var8].equalsIgnoreCase("Attack")) { // L: 10285 - short var10 = 0; // L: 10286 - if (AttackOption.AttackOption_hidden != Client.npcAttackOption) { // L: 10287 - if (AttackOption.AttackOption_alwaysRightClick == Client.npcAttackOption || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var4.combatLevel > class340.localPlayer.combatLevel) { // L: 10288 - var10 = 2000; // L: 10289 + if (var7 != null) { + for (var8 = 4; var8 >= 0; --var8) { + if (var7[var8] != null && var7[var8].equalsIgnoreCase("Attack")) { + short var10 = 0; + if (AttackOption.AttackOption_hidden != Client.npcAttackOption) { + if (AttackOption.AttackOption_alwaysRightClick == Client.npcAttackOption || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var4.combatLevel > class340.localPlayer.combatLevel) { + var10 = 2000; } - var9 = 0; // L: 10291 - if (var8 == 0) { // L: 10292 + var9 = 0; + if (var8 == 0) { var9 = var10 + 9; } - if (var8 == 1) { // L: 10293 + if (var8 == 1) { var9 = var10 + 10; } - if (var8 == 2) { // L: 10294 + if (var8 == 2) { var9 = var10 + 11; } - if (var8 == 3) { // L: 10295 + if (var8 == 3) { var9 = var10 + 12; } - if (var8 == 4) { // L: 10296 + if (var8 == 4) { var9 = var10 + 13; } - class11.insertMenuItemNoShift(var7[var8], UserComparator5.colorStartTag(16776960) + var5, var9, var1, var2, var3); // L: 10297 + class11.insertMenuItemNoShift(var7[var8], UserComparator5.colorStartTag(16776960) + var5, var9, var1, var2, var3); } } } } - if (!var4.isFollower || !Client.followerOpsLowPriority) { // L: 10302 - class11.insertMenuItemNoShift("Examine", UserComparator5.colorStartTag(16776960) + var5, 1003, var1, var2, var3); // L: 10303 + if (!var4.isFollower || !Client.followerOpsLowPriority) { + class11.insertMenuItemNoShift("Examine", UserComparator5.colorStartTag(16776960) + var5, 1003, var1, var2, var3); } } @@ -146,5 +146,5 @@ final class GrandExchangeOfferAgeComparator implements Comparator { } } } - } // L: 10307 + } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java index ab42c829f6..26c5df9dca 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java @@ -14,15 +14,15 @@ final class GrandExchangeOfferNameComparator implements Comparator { ) @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 boolean equals(Object var1) { - return super.equals(var1); // L: 64 + return super.equals(var1); } 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); } @ObfuscatedName("m") @@ -31,6 +31,6 @@ final class GrandExchangeOfferNameComparator implements Comparator { garbageValue = "640641737" ) public static int method5727(int var0) { - return class378.field4237[var0 & 16383]; // L: 37 + return class378.field4237[var0 & 16383]; } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java index 4e2e087834..a6bc2953d1 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java @@ -12,7 +12,7 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator { boolean filterWorlds; GrandExchangeOfferOwnWorldComparator() { - } // L: 12774 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -21,29 +21,29 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator { ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - if (var2.world == var1.world) { // L: 12777 + if (var2.world == var1.world) { return 0; } else { - if (this.filterWorlds) { // L: 12778 - if (Client.worldId == var1.world) { // L: 12779 + if (this.filterWorlds) { + if (Client.worldId == var1.world) { return -1; } - if (var2.world == Client.worldId) { // L: 12780 + if (var2.world == Client.worldId) { return 1; } } - return var1.world < var2.world ? -1 : 1; // L: 12782 + return var1.world < var2.world ? -1 : 1; } } public boolean equals(Object var1) { - return super.equals(var1); // L: 12790 + return super.equals(var1); } public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 12786 + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } @ObfuscatedName("c") @@ -52,16 +52,16 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator { garbageValue = "2109757925" ) public static byte[] method1147(Object var0, boolean var1) { - if (var0 == null) { // L: 8 + if (var0 == null) { return null; - } else if (var0 instanceof byte[]) { // L: 9 - byte[] var3 = (byte[])((byte[])var0); // L: 10 - return var1 ? TaskHandler.method3047(var3) : var3; // L: 11 - } else if (var0 instanceof AbstractByteArrayCopier) { // L: 14 - AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; // L: 15 - return var2.get(); // L: 16 + } else if (var0 instanceof byte[]) { + byte[] var3 = (byte[])((byte[])var0); + return var1 ? TaskHandler.method3047(var3) : var3; + } else if (var0 instanceof AbstractByteArrayCopier) { + AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; + return var2.get(); } else { - throw new IllegalArgumentException(); // L: 18 + throw new IllegalArgumentException(); } } @@ -71,24 +71,24 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator { garbageValue = "48029406" ) static final void method1148() { - class1.method12(class127.field1498, class117.field1433, class33.field243); // L: 4528 - SecureRandomFuture.method2025(class142.field1615, ApproximateRouteStrategy.field460); // L: 4529 - if (UserComparator7.cameraX == class127.field1498 && AbstractByteArrayCopier.cameraY == class117.field1433 && class33.field243 == UserComparator10.cameraZ && class142.field1615 == UserComparator7.cameraPitch && ApproximateRouteStrategy.field460 == class379.cameraYaw) { // L: 4530 - Client.field724 = false; // L: 4531 - Client.isCameraLocked = false; // L: 4532 - PlayerComposition.field3193 = 0; // L: 4533 - MusicPatchNode.field3150 = 0; // L: 4534 - ModeWhere.field3951 = 0; // L: 4535 - WorldMapSection1.field2755 = 0; // L: 4536 - ChatChannel.field956 = 0; // L: 4537 - ItemComposition.field2012 = 0; // L: 4538 - Renderable.field2358 = 0; // L: 4539 - class167.field1811 = 0; // L: 4540 - VarpDefinition.field1748 = 0; // L: 4541 - UserComparator9.field1335 = 0; // L: 4542 + class1.method12(class127.field1498, class117.field1433, class33.field243); + SecureRandomFuture.method2025(class142.field1615, ApproximateRouteStrategy.field460); + if (UserComparator7.cameraX == class127.field1498 && AbstractByteArrayCopier.cameraY == class117.field1433 && class33.field243 == UserComparator10.cameraZ && class142.field1615 == UserComparator7.cameraPitch && ApproximateRouteStrategy.field460 == class379.cameraYaw) { + Client.field724 = false; + Client.isCameraLocked = false; + PlayerComposition.field3193 = 0; + MusicPatchNode.field3150 = 0; + ModeWhere.field3951 = 0; + WorldMapSection1.field2755 = 0; + ChatChannel.field956 = 0; + ItemComposition.field2012 = 0; + Renderable.field2358 = 0; + class167.field1811 = 0; + VarpDefinition.field1748 = 0; + UserComparator9.field1335 = 0; } - } // L: 4545 + } @ObfuscatedName("hm") @ObfuscatedSignature( @@ -97,69 +97,69 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator { ) @Export("updateNpcs") static final void updateNpcs(boolean var0, PacketBuffer var1) { - Client.field597 = 0; // L: 8272 - Client.field520 = 0; // L: 8273 - PacketBuffer var2 = Client.packetWriter.packetBuffer; // L: 8275 - var2.importIndex(); // L: 8276 - int var3 = var2.readBits(8); // L: 8277 + Client.field597 = 0; + Client.field520 = 0; + PacketBuffer var2 = Client.packetWriter.packetBuffer; + var2.importIndex(); + int var3 = var2.readBits(8); int var4; - if (var3 < Client.npcCount) { // L: 8278 - for (var4 = var3; var4 < Client.npcCount; ++var4) { // L: 8279 + if (var3 < Client.npcCount) { + for (var4 = var3; var4 < Client.npcCount; ++var4) { Client.field598[++Client.field597 - 1] = Client.npcIndices[var4]; } } - if (var3 > Client.npcCount) { // L: 8281 + if (var3 > Client.npcCount) { throw new RuntimeException(""); } else { - Client.npcCount = 0; // L: 8282 + Client.npcCount = 0; int var5; int var7; int var8; int var9; int var10; - for (var4 = 0; var4 < var3; ++var4) { // L: 8283 - var5 = Client.npcIndices[var4]; // L: 8284 - NPC var16 = Client.npcs[var5]; // L: 8285 - var7 = var2.readBits(1); // L: 8286 - if (var7 == 0) { // L: 8287 - Client.npcIndices[++Client.npcCount - 1] = var5; // L: 8288 - var16.npcCycle = Client.cycle; // L: 8289 + for (var4 = 0; var4 < var3; ++var4) { + var5 = Client.npcIndices[var4]; + NPC var16 = Client.npcs[var5]; + var7 = var2.readBits(1); + if (var7 == 0) { + Client.npcIndices[++Client.npcCount - 1] = var5; + var16.npcCycle = Client.cycle; } else { - var8 = var2.readBits(2); // L: 8292 - if (var8 == 0) { // L: 8293 - Client.npcIndices[++Client.npcCount - 1] = var5; // L: 8294 - var16.npcCycle = Client.cycle; // L: 8295 - Client.field605[++Client.field520 - 1] = var5; // L: 8296 - } else if (var8 == 1) { // L: 8299 - Client.npcIndices[++Client.npcCount - 1] = var5; // L: 8300 - var16.npcCycle = Client.cycle; // L: 8301 - var9 = var2.readBits(3); // L: 8302 - var16.method2319(var9, class185.field2123); // L: 8303 - var10 = var2.readBits(1); // L: 8304 - if (var10 == 1) { // L: 8305 + var8 = var2.readBits(2); + if (var8 == 0) { + Client.npcIndices[++Client.npcCount - 1] = var5; + var16.npcCycle = Client.cycle; + Client.field605[++Client.field520 - 1] = var5; + } else if (var8 == 1) { + Client.npcIndices[++Client.npcCount - 1] = var5; + var16.npcCycle = Client.cycle; + var9 = var2.readBits(3); + var16.method2319(var9, class185.field2123); + var10 = var2.readBits(1); + if (var10 == 1) { Client.field605[++Client.field520 - 1] = var5; } - } else if (var8 == 2) { // L: 8308 - Client.npcIndices[++Client.npcCount - 1] = var5; // L: 8309 - var16.npcCycle = Client.cycle; // L: 8310 - if (var2.readBits(1) == 1) { // L: 8311 - var9 = var2.readBits(3); // L: 8312 - var16.method2319(var9, class185.field2122); // L: 8313 - var10 = var2.readBits(3); // L: 8314 - var16.method2319(var10, class185.field2122); // L: 8315 + } else if (var8 == 2) { + Client.npcIndices[++Client.npcCount - 1] = var5; + var16.npcCycle = Client.cycle; + if (var2.readBits(1) == 1) { + var9 = var2.readBits(3); + var16.method2319(var9, class185.field2122); + var10 = var2.readBits(3); + var16.method2319(var10, class185.field2122); } else { - var9 = var2.readBits(3); // L: 8318 - var16.method2319(var9, class185.field2120); // L: 8319 + var9 = var2.readBits(3); + var16.method2319(var9, class185.field2120); } - var9 = var2.readBits(1); // L: 8321 - if (var9 == 1) { // L: 8322 + var9 = var2.readBits(1); + if (var9 == 1) { Client.field605[++Client.field520 - 1] = var5; } - } else if (var8 == 3) { // L: 8325 - Client.field598[++Client.field597 - 1] = var5; // L: 8326 + } else if (var8 == 3) { + Client.field598[++Client.field597 - 1] = var5; } } } @@ -167,307 +167,307 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator { int var6; int var14; NPC var15; - while (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { // L: 8333 - var14 = var1.readBits(15); // L: 8334 - if (var14 == 32767) { // L: 8335 + while (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { + var14 = var1.readBits(15); + if (var14 == 32767) { break; } - boolean var17 = false; // L: 8336 - if (Client.npcs[var14] == null) { // L: 8337 - Client.npcs[var14] = new NPC(); // L: 8338 - var17 = true; // L: 8339 + boolean var17 = false; + if (Client.npcs[var14] == null) { + Client.npcs[var14] = new NPC(); + var17 = true; } - var15 = Client.npcs[var14]; // L: 8341 - Client.npcIndices[++Client.npcCount - 1] = var14; // L: 8342 - var15.npcCycle = Client.cycle; // L: 8343 - if (class12.field72) { // L: 8347 - boolean var18 = var1.readBits(1) == 1; // L: 8348 - if (var18) { // L: 8349 - var1.readBits(32); // L: 8350 + var15 = Client.npcs[var14]; + Client.npcIndices[++Client.npcCount - 1] = var14; + var15.npcCycle = Client.cycle; + if (class12.field72) { + boolean var18 = var1.readBits(1) == 1; + if (var18) { + var1.readBits(32); } - var9 = var1.readBits(1); // L: 8352 - if (var9 == 1) { // L: 8353 + var9 = var1.readBits(1); + if (var9 == 1) { Client.field605[++Client.field520 - 1] = var14; } - var10 = Client.defaultRotations[var1.readBits(3)]; // L: 8354 - if (var17) { // L: 8355 + var10 = Client.defaultRotations[var1.readBits(3)]; + if (var17) { var15.orientation = var15.rotation = var10; } - if (var0) { // L: 8356 - var7 = var1.readBits(8); // L: 8357 - if (var7 > 127) { // L: 8358 + if (var0) { + var7 = var1.readBits(8); + if (var7 > 127) { var7 -= 256; } } else { - var7 = var1.readBits(5); // L: 8361 - if (var7 > 15) { // L: 8362 + var7 = var1.readBits(5); + if (var7 > 15) { var7 -= 32; } } - var5 = var1.readBits(1); // L: 8364 - var15.definition = WorldMapLabelSize.getNpcDefinition(var1.readBits(14)); // L: 8365 - if (var0) { // L: 8366 - var6 = var1.readBits(8); // L: 8367 - if (var6 > 127) { // L: 8368 + var5 = var1.readBits(1); + var15.definition = WorldMapLabelSize.getNpcDefinition(var1.readBits(14)); + if (var0) { + var6 = var1.readBits(8); + if (var6 > 127) { var6 -= 256; } } else { - var6 = var1.readBits(5); // L: 8371 - if (var6 > 15) { // L: 8372 + var6 = var1.readBits(5); + if (var6 > 15) { var6 -= 32; } } } else { - var5 = var1.readBits(1); // L: 8376 - var15.definition = WorldMapLabelSize.getNpcDefinition(var1.readBits(14)); // L: 8377 - var8 = var1.readBits(1); // L: 8378 - if (var8 == 1) { // L: 8379 + var5 = var1.readBits(1); + var15.definition = WorldMapLabelSize.getNpcDefinition(var1.readBits(14)); + var8 = var1.readBits(1); + if (var8 == 1) { Client.field605[++Client.field520 - 1] = var14; } - if (var0) { // L: 8380 - var6 = var1.readBits(8); // L: 8381 - if (var6 > 127) { // L: 8382 + if (var0) { + var6 = var1.readBits(8); + if (var6 > 127) { var6 -= 256; } } else { - var6 = var1.readBits(5); // L: 8385 - if (var6 > 15) { // L: 8386 + var6 = var1.readBits(5); + if (var6 > 15) { var6 -= 32; } } - boolean var19 = var1.readBits(1) == 1; // L: 8388 - if (var19) { // L: 8389 - var1.readBits(32); // L: 8390 + boolean var19 = var1.readBits(1) == 1; + if (var19) { + var1.readBits(32); } - if (var0) { // L: 8392 - var7 = var1.readBits(8); // L: 8393 - if (var7 > 127) { // L: 8394 + if (var0) { + var7 = var1.readBits(8); + if (var7 > 127) { var7 -= 256; } } else { - var7 = var1.readBits(5); // L: 8397 - if (var7 > 15) { // L: 8398 + var7 = var1.readBits(5); + if (var7 > 15) { var7 -= 32; } } - var10 = Client.defaultRotations[var1.readBits(3)]; // L: 8400 - if (var17) { // L: 8401 + var10 = Client.defaultRotations[var1.readBits(3)]; + if (var17) { var15.orientation = var15.rotation = var10; } } - var15.field1120 = var15.definition.size; // L: 8403 - var15.field1149 = var15.definition.rotation; // L: 8404 - if (var15.field1149 == 0) { // L: 8405 + var15.field1120 = var15.definition.size; + var15.field1149 = var15.definition.rotation; + if (var15.field1149 == 0) { var15.rotation = 0; } - var15.walkSequence = var15.definition.walkSequence; // L: 8406 - var15.walkBackSequence = var15.definition.walkBackSequence; // L: 8407 - var15.walkLeftSequence = var15.definition.walkLeftSequence; // L: 8408 - var15.walkRightSequence = var15.definition.walkRightSequence; // L: 8409 - var15.idleSequence = var15.definition.idleSequence; // L: 8410 - var15.turnLeftSequence = var15.definition.turnLeftSequence; // L: 8411 - var15.turnRightSequence = var15.definition.turnRightSequence; // L: 8412 - var15.method2315(class340.localPlayer.pathX[0] + var6, class340.localPlayer.pathY[0] + var7, var5 == 1); // L: 8413 + var15.walkSequence = var15.definition.walkSequence; + var15.walkBackSequence = var15.definition.walkBackSequence; + var15.walkLeftSequence = var15.definition.walkLeftSequence; + var15.walkRightSequence = var15.definition.walkRightSequence; + var15.idleSequence = var15.definition.idleSequence; + var15.turnLeftSequence = var15.definition.turnLeftSequence; + var15.turnRightSequence = var15.definition.turnRightSequence; + var15.method2315(class340.localPlayer.pathX[0] + var6, class340.localPlayer.pathY[0] + var7, var5 == 1); } - var1.exportIndex(); // L: 8415 + var1.exportIndex(); - for (var14 = 0; var14 < Client.field520; ++var14) { // L: 8418 - var3 = Client.field605[var14]; // L: 8419 - var15 = Client.npcs[var3]; // L: 8420 - var5 = var1.readUnsignedByte(); // L: 8421 - if (class12.field72 && (var5 & 4) != 0) { // L: 8422 - var6 = var1.readUnsignedByte(); // L: 8423 - var5 += var6 << 8; // L: 8424 + for (var14 = 0; var14 < Client.field520; ++var14) { + var3 = Client.field605[var14]; + var15 = Client.npcs[var3]; + var5 = var1.readUnsignedByte(); + if (class12.field72 && (var5 & 4) != 0) { + var6 = var1.readUnsignedByte(); + var5 += var6 << 8; } - if ((var5 & 8) != 0) { // L: 8426 - var6 = var1.method7401(); // L: 8427 - var7 = var1.method7403(); // L: 8428 - if (class12.field72) { // L: 8429 - var15.field1118 = var1.method7394() == 1; // L: 8430 + if ((var5 & 8) != 0) { + var6 = var1.method7401(); + var7 = var1.method7403(); + if (class12.field72) { + var15.field1118 = var1.method7394() == 1; } - var8 = var15.x - (var6 - class131.baseX - class131.baseX) * 64; // L: 8432 - var9 = var15.y - (var7 - TileItem.baseY - TileItem.baseY) * 64; // L: 8433 - if (var8 != 0 || var9 != 0) { // L: 8434 + var8 = var15.x - (var6 - class131.baseX - class131.baseX) * 64; + var9 = var15.y - (var7 - TileItem.baseY - TileItem.baseY) * 64; + if (var8 != 0 || var9 != 0) { var15.field1122 = (int)(Math.atan2((double)var8, (double)var9) * 325.949D) & 2047; } } - if ((var5 & 1) != 0) { // L: 8436 - var6 = var1.method7392(); // L: 8437 + if ((var5 & 1) != 0) { + var6 = var1.method7392(); int var11; int var12; - if (var6 > 0) { // L: 8438 - for (var7 = 0; var7 < var6; ++var7) { // L: 8439 - var9 = -1; // L: 8441 - var10 = -1; // L: 8442 - var11 = -1; // L: 8443 - var8 = var1.readUShortSmart(); // L: 8444 - if (var8 == 32767) { // L: 8445 - var8 = var1.readUShortSmart(); // L: 8446 - var10 = var1.readUShortSmart(); // L: 8447 - var9 = var1.readUShortSmart(); // L: 8448 - var11 = var1.readUShortSmart(); // L: 8449 - } else if (var8 != 32766) { // L: 8451 - var10 = var1.readUShortSmart(); // L: 8452 + if (var6 > 0) { + for (var7 = 0; var7 < var6; ++var7) { + var9 = -1; + var10 = -1; + var11 = -1; + var8 = var1.readUShortSmart(); + if (var8 == 32767) { + var8 = var1.readUShortSmart(); + var10 = var1.readUShortSmart(); + var9 = var1.readUShortSmart(); + var11 = var1.readUShortSmart(); + } else if (var8 != 32766) { + var10 = var1.readUShortSmart(); } else { - var8 = -1; // L: 8454 + var8 = -1; } - var12 = var1.readUShortSmart(); // L: 8455 - var15.addHitSplat(var8, var10, var9, var11, Client.cycle, var12); // L: 8456 + var12 = var1.readUShortSmart(); + var15.addHitSplat(var8, var10, var9, var11, Client.cycle, var12); } } - var7 = var1.method7520(); // L: 8459 - if (var7 > 0) { // L: 8460 - for (var8 = 0; var8 < var7; ++var8) { // L: 8461 - var9 = var1.readUShortSmart(); // L: 8462 - var10 = var1.readUShortSmart(); // L: 8463 - if (var10 != 32767) { // L: 8464 - var11 = var1.readUShortSmart(); // L: 8465 - var12 = var1.method7392(); // L: 8466 - int var13 = var10 > 0 ? var1.method7394() : var12; // L: 8467 - var15.addHealthBar(var9, Client.cycle, var10, var11, var12, var13); // L: 8468 + var7 = var1.method7520(); + if (var7 > 0) { + for (var8 = 0; var8 < var7; ++var8) { + var9 = var1.readUShortSmart(); + var10 = var1.readUShortSmart(); + if (var10 != 32767) { + var11 = var1.readUShortSmart(); + var12 = var1.method7392(); + int var13 = var10 > 0 ? var1.method7394() : var12; + var15.addHealthBar(var9, Client.cycle, var10, var11, var12, var13); } else { - var15.removeHealthBar(var9); // L: 8470 + var15.removeHealthBar(var9); } } } } - if ((var5 & 16) != 0) { // L: 8474 - var15.overheadText = var1.readStringCp1252NullTerminated(); // L: 8475 - var15.overheadTextCyclesRemaining = 100; // L: 8476 + if ((var5 & 16) != 0) { + var15.overheadText = var1.readStringCp1252NullTerminated(); + var15.overheadTextCyclesRemaining = 100; } - if ((var5 & 2) != 0) { // L: 8478 - var15.spotAnimation = var1.method7403(); // L: 8479 - var6 = var1.method7412(); // L: 8480 - var15.field1131 = var6 >> 16; // L: 8481 - var15.field1130 = (var6 & 65535) + Client.cycle; // L: 8482 - var15.spotAnimationFrame = 0; // L: 8483 - var15.spotAnimationFrameCycle = 0; // L: 8484 - if (var15.field1130 > Client.cycle) { // L: 8485 + if ((var5 & 2) != 0) { + var15.spotAnimation = var1.method7403(); + var6 = var1.method7412(); + var15.field1131 = var6 >> 16; + var15.field1130 = (var6 & 65535) + Client.cycle; + var15.spotAnimationFrame = 0; + var15.spotAnimationFrameCycle = 0; + if (var15.field1130 > Client.cycle) { var15.spotAnimationFrame = -1; } - if (var15.spotAnimation == 65535) { // L: 8486 + if (var15.spotAnimation == 65535) { var15.spotAnimation = -1; } } - if ((var5 & 512) != 0) { // L: 8488 - var15.field1119 = var1.method7411(); // L: 8489 + if ((var5 & 512) != 0) { + var15.field1119 = var1.method7411(); } - if ((var5 & 64) != 0) { // L: 8491 - var6 = var1.method7403(); // L: 8492 - if (var6 == 65535) { // L: 8493 + if ((var5 & 64) != 0) { + var6 = var1.method7403(); + if (var6 == 65535) { var6 = -1; } - var7 = var1.method7394(); // L: 8494 - if (var6 == var15.sequence && var6 != -1) { // L: 8495 - var8 = UserComparator5.SequenceDefinition_get(var6).field2078; // L: 8496 - if (var8 == 1) { // L: 8497 - var15.sequenceFrame = 0; // L: 8498 - var15.sequenceFrameCycle = 0; // L: 8499 - var15.sequenceDelay = var7; // L: 8500 - var15.field1126 = 0; // L: 8501 + var7 = var1.method7394(); + if (var6 == var15.sequence && var6 != -1) { + var8 = UserComparator5.SequenceDefinition_get(var6).field2078; + if (var8 == 1) { + var15.sequenceFrame = 0; + var15.sequenceFrameCycle = 0; + var15.sequenceDelay = var7; + var15.field1126 = 0; } - if (var8 == 2) { // L: 8503 - var15.field1126 = 0; // L: 8504 + if (var8 == 2) { + var15.field1126 = 0; } - } else if (var6 == -1 || var15.sequence == -1 || UserComparator5.SequenceDefinition_get(var6).field2092 >= UserComparator5.SequenceDefinition_get(var15.sequence).field2092) { // L: 8507 - var15.sequence = var6; // L: 8508 - var15.sequenceFrame = 0; // L: 8509 - var15.sequenceFrameCycle = 0; // L: 8510 - var15.sequenceDelay = var7; // L: 8511 - var15.field1126 = 0; // L: 8512 - var15.field1098 = var15.pathLength; // L: 8513 + } else if (var6 == -1 || var15.sequence == -1 || UserComparator5.SequenceDefinition_get(var6).field2092 >= UserComparator5.SequenceDefinition_get(var15.sequence).field2092) { + var15.sequence = var6; + var15.sequenceFrame = 0; + var15.sequenceFrameCycle = 0; + var15.sequenceDelay = var7; + var15.field1126 = 0; + var15.field1098 = var15.pathLength; } } - if (class12.field72 && (var5 & 1024) != 0 || !class12.field72 && (var5 & 4) != 0) { // L: 8517 - var15.field1132 = var1.method7396(); // L: 8518 - var15.field1134 = var1.readByte(); // L: 8519 - var15.field1133 = var1.method7396(); // L: 8520 - var15.field1135 = var1.readByte(); // L: 8521 - var15.field1136 = var1.method7403() + Client.cycle; // L: 8522 - var15.field1157 = var1.readUnsignedShort() + Client.cycle; // L: 8523 - var15.field1138 = var1.method7403(); // L: 8524 - var15.pathLength = 1; // L: 8525 - var15.field1098 = 0; // L: 8526 - var15.field1132 += var15.pathX[0]; // L: 8527 - var15.field1134 += var15.pathY[0]; // L: 8528 - var15.field1133 += var15.pathX[0]; // L: 8529 - var15.field1135 += var15.pathY[0]; // L: 8530 + if (class12.field72 && (var5 & 1024) != 0 || !class12.field72 && (var5 & 4) != 0) { + var15.field1132 = var1.method7396(); + var15.field1134 = var1.readByte(); + var15.field1133 = var1.method7396(); + var15.field1135 = var1.readByte(); + var15.field1136 = var1.method7403() + Client.cycle; + var15.field1157 = var1.readUnsignedShort() + Client.cycle; + var15.field1138 = var1.method7403(); + var15.pathLength = 1; + var15.field1098 = 0; + var15.field1132 += var15.pathX[0]; + var15.field1134 += var15.pathY[0]; + var15.field1133 += var15.pathX[0]; + var15.field1135 += var15.pathY[0]; } - if ((var5 & 128) != 0) { // L: 8532 - var15.targetIndex = var1.method7401(); // L: 8533 - if (var15.targetIndex == 65535) { // L: 8534 + if ((var5 & 128) != 0) { + var15.targetIndex = var1.method7401(); + if (var15.targetIndex == 65535) { var15.targetIndex = -1; } } - if ((var5 & 256) != 0) { // L: 8536 - var15.field1141 = Client.cycle + var1.readUnsignedShort(); // L: 8537 - var15.field1140 = Client.cycle + var1.method7401(); // L: 8538 - var15.field1143 = var1.readByte(); // L: 8539 - var15.field1144 = var1.method7396(); // L: 8540 - var15.field1095 = var1.method7396(); // L: 8541 - var15.field1146 = (byte)var1.readUnsignedByte(); // L: 8542 + if ((var5 & 256) != 0) { + var15.field1141 = Client.cycle + var1.readUnsignedShort(); + var15.field1140 = Client.cycle + var1.method7401(); + var15.field1143 = var1.readByte(); + var15.field1144 = var1.method7396(); + var15.field1095 = var1.method7396(); + var15.field1146 = (byte)var1.readUnsignedByte(); } - if ((var5 & 32) != 0) { // L: 8544 - var15.definition = WorldMapLabelSize.getNpcDefinition(var1.method7401()); // L: 8545 - var15.field1120 = var15.definition.size; // L: 8546 - var15.field1149 = var15.definition.rotation; // L: 8547 - var15.walkSequence = var15.definition.walkSequence; // L: 8548 - var15.walkBackSequence = var15.definition.walkBackSequence; // L: 8549 - var15.walkLeftSequence = var15.definition.walkLeftSequence; // L: 8550 - var15.walkRightSequence = var15.definition.walkRightSequence; // L: 8551 - var15.idleSequence = var15.definition.idleSequence; // L: 8552 - var15.turnLeftSequence = var15.definition.turnLeftSequence; // L: 8553 - var15.turnRightSequence = var15.definition.turnRightSequence; // L: 8554 + if ((var5 & 32) != 0) { + var15.definition = WorldMapLabelSize.getNpcDefinition(var1.method7401()); + var15.field1120 = var15.definition.size; + var15.field1149 = var15.definition.rotation; + var15.walkSequence = var15.definition.walkSequence; + var15.walkBackSequence = var15.definition.walkBackSequence; + var15.walkLeftSequence = var15.definition.walkLeftSequence; + var15.walkRightSequence = var15.definition.walkRightSequence; + var15.idleSequence = var15.definition.idleSequence; + var15.turnLeftSequence = var15.definition.turnLeftSequence; + var15.turnRightSequence = var15.definition.turnRightSequence; } } - for (var14 = 0; var14 < Client.field597; ++var14) { // L: 8558 - var3 = Client.field598[var14]; // L: 8559 - if (Client.npcs[var3].npcCycle != Client.cycle) { // L: 8560 - Client.npcs[var3].definition = null; // L: 8561 - Client.npcs[var3] = null; // L: 8562 + for (var14 = 0; var14 < Client.field597; ++var14) { + var3 = Client.field598[var14]; + if (Client.npcs[var3].npcCycle != Client.cycle) { + Client.npcs[var3].definition = null; + Client.npcs[var3] = null; } } - if (var1.offset != Client.packetWriter.serverPacketLength) { // L: 8565 + if (var1.offset != Client.packetWriter.serverPacketLength) { throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength); } else { - for (var14 = 0; var14 < Client.npcCount; ++var14) { // L: 8566 - if (Client.npcs[Client.npcIndices[var14]] == null) { // L: 8567 - throw new RuntimeException(var14 + "," + Client.npcCount); // L: 8568 + for (var14 = 0; var14 < Client.npcCount; ++var14) { + if (Client.npcs[Client.npcIndices[var14]] == null) { + throw new RuntimeException(var14 + "," + Client.npcCount); } } } } - } // L: 8571 + } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java index a318084e07..fa583b4cb1 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java @@ -14,15 +14,15 @@ final class GrandExchangeOfferTotalQuantityComparator implements Comparator { ) @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 + return var1.grandExchangeOffer.totalQuantity < var2.grandExchangeOffer.totalQuantity ? -1 : (var2.grandExchangeOffer.totalQuantity == var1.grandExchangeOffer.totalQuantity ? 0 : 1); } public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 73 + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } public boolean equals(Object var1) { - return super.equals(var1); // L: 77 + return super.equals(var1); } @ObfuscatedName("c") @@ -31,8 +31,8 @@ final class GrandExchangeOfferTotalQuantityComparator implements Comparator { garbageValue = "-1737768501" ) public static void method5725(AbstractArchive var0, AbstractArchive var1) { - KitDefinition.KitDefinition_archive = var0; // L: 27 - KitDefinition.KitDefinition_modelsArchive = var1; // L: 28 - KitDefinition.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); // L: 29 - } // L: 30 + KitDefinition.KitDefinition_archive = var0; + KitDefinition.KitDefinition_modelsArchive = var1; + KitDefinition.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); + } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java index 8a2639c756..ccd32d2a51 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java @@ -14,14 +14,14 @@ final class GrandExchangeOfferUnitPriceComparator implements Comparator { ) @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 + return var1.grandExchangeOffer.unitPrice < var2.grandExchangeOffer.unitPrice ? -1 : (var2.grandExchangeOffer.unitPrice == var1.grandExchangeOffer.unitPrice ? 0 : 1); } public boolean equals(Object var1) { - return super.equals(var1); // L: 51 + return super.equals(var1); } public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 47 + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java index e1a8130a05..a92a7a7dea 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java @@ -14,14 +14,14 @@ final class GrandExchangeOfferWorldComparator implements Comparator { ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - return var1.world < var2.world ? -1 : (var2.world == var1.world ? 0 : 1); // L: 28 + return var1.world < var2.world ? -1 : (var2.world == var1.world ? 0 : 1); } public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 32 + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } public boolean equals(Object var1) { - return super.equals(var1); // L: 36 + return super.equals(var1); } } diff --git a/runescape-client/src/main/java/GraphicsDefaults.java b/runescape-client/src/main/java/GraphicsDefaults.java index 61b74e90c3..400c030e9c 100644 --- a/runescape-client/src/main/java/GraphicsDefaults.java +++ b/runescape-client/src/main/java/GraphicsDefaults.java @@ -73,17 +73,17 @@ public class GraphicsDefaults { public int field4172; public GraphicsDefaults() { - this.compass = -1; // L: 7 - this.field4163 = -1; // L: 8 - this.mapScenes = -1; // L: 9 - this.headIconsPk = -1; // L: 10 - this.field4166 = -1; // L: 11 - this.field4173 = -1; // L: 12 - this.field4169 = -1; // L: 13 - this.field4168 = -1; // L: 14 - this.field4170 = -1; // L: 15 - this.field4171 = -1; // L: 16 - this.field4172 = -1; // L: 17 + this.compass = -1; + this.field4163 = -1; + this.mapScenes = -1; + this.headIconsPk = -1; + this.field4166 = -1; + this.field4173 = -1; + this.field4169 = -1; + this.field4168 = -1; + this.field4170 = -1; + this.field4171 = -1; + this.field4172 = -1; } @ObfuscatedName("c") @@ -93,31 +93,31 @@ public class GraphicsDefaults { ) @Export("decode") public void decode(AbstractArchive var1) { - byte[] var2 = var1.takeFileFlat(DefaultsGroup.field4160.group); // L: 20 - Buffer var3 = new Buffer(var2); // L: 21 + byte[] var2 = var1.takeFileFlat(DefaultsGroup.field4160.group); + Buffer var3 = new Buffer(var2); while (true) { - int var4 = var3.readUnsignedByte(); // L: 23 - if (var4 == 0) { // L: 24 + int var4 = var3.readUnsignedByte(); + if (var4 == 0) { return; } - switch(var4) { // L: 25 + switch(var4) { case 1: var3.readMedium(); - break; // L: 43 + break; case 2: - this.compass = var3.method7400(); // L: 28 - this.field4163 = var3.method7400(); // L: 29 - this.mapScenes = var3.method7400(); // L: 30 - this.headIconsPk = var3.method7400(); // L: 31 - this.field4166 = var3.method7400(); // L: 32 - this.field4173 = var3.method7400(); // L: 33 - this.field4169 = var3.method7400(); // L: 34 - this.field4168 = var3.method7400(); // L: 35 - this.field4170 = var3.method7400(); // L: 36 - this.field4171 = var3.method7400(); // L: 37 - this.field4172 = var3.method7400(); // L: 38 + this.compass = var3.method7400(); + this.field4163 = var3.method7400(); + this.mapScenes = var3.method7400(); + this.headIconsPk = var3.method7400(); + this.field4166 = var3.method7400(); + this.field4173 = var3.method7400(); + this.field4169 = var3.method7400(); + this.field4168 = var3.method7400(); + this.field4170 = var3.method7400(); + this.field4171 = var3.method7400(); + this.field4172 = var3.method7400(); } } } @@ -125,32 +125,32 @@ public class GraphicsDefaults { @ObfuscatedName("p") @Export("base37DecodeLong") public static String base37DecodeLong(long var0) { - if (var0 > 0L && var0 < 6582952005840035281L) { // L: 49 - if (0L == var0 % 37L) { // L: 50 + if (var0 > 0L && var0 < 6582952005840035281L) { + if (0L == var0 % 37L) { return null; } else { - int var2 = 0; // L: 51 + int var2 = 0; - for (long var3 = var0; var3 != 0L; var3 /= 37L) { // L: 52 53 55 - ++var2; // L: 54 + for (long var3 = var0; var3 != 0L; var3 /= 37L) { + ++var2; } 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 = class332.base37Table[(int)(var6 - 37L * var0)]; // 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 + for (var5 = new StringBuilder(var2); var0 != 0L; var5.append(var8)) { + long var6 = var0; + var0 /= 37L; + var8 = class332.base37Table[(int)(var6 - 37L * var0)]; + if (var8 == '_') { + int var9 = var5.length() - 1; + var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); + var8 = 160; } } - var5.reverse(); // L: 69 - var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); // L: 70 - return var5.toString(); // L: 71 + var5.reverse(); + var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); + return var5.toString(); } } else { return null; diff --git a/runescape-client/src/main/java/GraphicsObject.java b/runescape-client/src/main/java/GraphicsObject.java index f0edcd1c5f..5335655669 100644 --- a/runescape-client/src/main/java/GraphicsObject.java +++ b/runescape-client/src/main/java/GraphicsObject.java @@ -72,24 +72,24 @@ public class GraphicsObject extends Renderable { boolean isFinished; GraphicsObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - this.frame = 0; // L: 16 - this.frameCycle = 0; // L: 17 - this.isFinished = false; // L: 18 - this.id = var1; // L: 21 - this.plane = var2; // L: 22 - this.x = var3; // L: 23 - this.y = var4; // L: 24 - this.height = var5; // L: 25 - this.cycleStart = var7 + var6; // L: 26 - int var8 = AccessFile.SpotAnimationDefinition_get(this.id).sequence; // L: 27 - if (var8 != -1) { // L: 28 - this.isFinished = false; // L: 29 - this.sequenceDefinition = UserComparator5.SequenceDefinition_get(var8); // L: 30 + this.frame = 0; + this.frameCycle = 0; + this.isFinished = false; + this.id = var1; + this.plane = var2; + this.x = var3; + this.y = var4; + this.height = var5; + this.cycleStart = var7 + var6; + int var8 = AccessFile.SpotAnimationDefinition_get(this.id).sequence; + if (var8 != -1) { + this.isFinished = false; + this.sequenceDefinition = UserComparator5.SequenceDefinition_get(var8); } else { - this.isFinished = true; // L: 32 + this.isFinished = true; } - } // L: 33 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -98,20 +98,20 @@ public class GraphicsObject extends Renderable { ) @Export("advance") final void advance(int var1) { - if (!this.isFinished) { // L: 36 - this.frameCycle += var1; // L: 37 - if (!this.sequenceDefinition.method3690()) { // L: 38 + if (!this.isFinished) { + this.frameCycle += var1; + if (!this.sequenceDefinition.method3690()) { while (this.frameCycle > this.sequenceDefinition.frameLengths[this.frame]) { this.frameCycle -= this.sequenceDefinition.frameLengths[this.frame]; ++this.frame; if (this.frame >= this.sequenceDefinition.frameIds.length) { - this.isFinished = true; // L: 43 + this.isFinished = true; break; } } } else { this.frame += var1; - if (this.frame >= this.sequenceDefinition.method3647()) { // L: 50 + if (this.frame >= this.sequenceDefinition.method3647()) { this.isFinished = true; } } @@ -128,7 +128,7 @@ public class GraphicsObject extends Renderable { protected final Model getModel() { SpotAnimationDefinition var1 = AccessFile.SpotAnimationDefinition_get(this.id); Model var2; - if (!this.isFinished) { // L: 57 + if (!this.isFinished) { var2 = var1.getModel(this.frame); } else { var2 = var1.getModel(-1); @@ -144,34 +144,34 @@ public class GraphicsObject extends Renderable { ) @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 + ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var4 == null) { + var4 = new ItemContainer(); + ItemContainer.itemContainers.put(var4, (long)var0); } - if (var4.ids.length <= var1) { // L: 44 - int[] var5 = new int[var1 + 1]; // L: 45 - int[] var6 = new int[var1 + 1]; // L: 46 + if (var4.ids.length <= var1) { + int[] var5 = new int[var1 + 1]; + int[] var6 = new int[var1 + 1]; int var7; - for (var7 = 0; var7 < var4.ids.length; ++var7) { // L: 47 - var5[var7] = var4.ids[var7]; // L: 48 - var6[var7] = var4.quantities[var7]; // L: 49 + for (var7 = 0; var7 < var4.ids.length; ++var7) { + var5[var7] = var4.ids[var7]; + var6[var7] = var4.quantities[var7]; } - for (var7 = var4.ids.length; var7 < var1; ++var7) { // L: 51 - var5[var7] = -1; // L: 52 - var6[var7] = 0; // L: 53 + for (var7 = var4.ids.length; var7 < var1; ++var7) { + var5[var7] = -1; + var6[var7] = 0; } - var4.ids = var5; // L: 55 - var4.quantities = var6; // L: 56 + var4.ids = var5; + var4.quantities = var6; } - var4.ids[var1] = var2; // L: 58 - var4.quantities[var1] = var3; // L: 59 - } // L: 60 + var4.ids[var1] = var2; + var4.quantities[var1] = var3; + } @ObfuscatedName("j") @ObfuscatedSignature( @@ -179,11 +179,11 @@ public class GraphicsObject extends Renderable { garbageValue = "-76" ) public static void method1956() { - if (NetCache.NetCache_socket != null) { // L: 266 + if (NetCache.NetCache_socket != null) { NetCache.NetCache_socket.close(); } - } // L: 267 + } @ObfuscatedName("kl") @ObfuscatedSignature( @@ -191,10 +191,10 @@ public class GraphicsObject extends Renderable { garbageValue = "54739776" ) static final void method1955(int var0) { - if (class242.loadInterface(var0)) { // L: 12070 - class328.drawModelComponents(MouseRecorder.Widget_interfaceComponents[var0], -1); // L: 12071 + if (class242.loadInterface(var0)) { + class328.drawModelComponents(MouseRecorder.Widget_interfaceComponents[var0], -1); } - } // L: 12072 + } public GraphicsObject() { } diff --git a/runescape-client/src/main/java/HealthBar.java b/runescape-client/src/main/java/HealthBar.java index 6515f2b275..b9be189a3b 100644 --- a/runescape-client/src/main/java/HealthBar.java +++ b/runescape-client/src/main/java/HealthBar.java @@ -29,9 +29,9 @@ public class HealthBar extends Node { descriptor = "(Lfd;)V" ) HealthBar(HealthBarDefinition var1) { - this.updates = new IterableNodeDeque(); // L: 12 - this.definition = var1; // L: 15 - } // L: 16 + this.updates = new IterableNodeDeque(); + this.definition = var1; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -40,34 +40,34 @@ public class HealthBar extends Node { ) @Export("put") void put(int var1, int var2, int var3, int var4) { - HealthBarUpdate var5 = null; // L: 19 - int var6 = 0; // L: 20 + HealthBarUpdate var5 = null; + int var6 = 0; - for (HealthBarUpdate var7 = (HealthBarUpdate)this.updates.last(); var7 != null; var7 = (HealthBarUpdate)this.updates.previous()) { // L: 21 - ++var6; // L: 22 - if (var7.cycle == var1) { // L: 23 - var7.set(var1, var2, var3, var4); // L: 24 - return; // L: 25 + for (HealthBarUpdate var7 = (HealthBarUpdate)this.updates.last(); var7 != null; var7 = (HealthBarUpdate)this.updates.previous()) { + ++var6; + if (var7.cycle == var1) { + var7.set(var1, var2, var3, var4); + return; } - if (var7.cycle <= var1) { // L: 27 + if (var7.cycle <= var1) { var5 = var7; } } - if (var5 == null) { // L: 29 - if (var6 < 4) { // L: 30 + if (var5 == null) { + if (var6 < 4) { this.updates.addLast(new HealthBarUpdate(var1, var2, var3, var4)); } } else { - IterableNodeDeque.IterableNodeDeque_addBefore(new HealthBarUpdate(var1, var2, var3, var4), var5); // L: 33 + IterableNodeDeque.IterableNodeDeque_addBefore(new HealthBarUpdate(var1, var2, var3, var4), var5); if (var6 >= 4) { - this.updates.last().remove(); // L: 34 + this.updates.last().remove(); } } - } // L: 31 35 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -76,18 +76,18 @@ public class HealthBar extends Node { ) @Export("get") HealthBarUpdate get(int var1) { - HealthBarUpdate var2 = (HealthBarUpdate)this.updates.last(); // L: 38 - if (var2 != null && var2.cycle <= var1) { // L: 39 - for (HealthBarUpdate var3 = (HealthBarUpdate)this.updates.previous(); var3 != null && var3.cycle <= var1; var3 = (HealthBarUpdate)this.updates.previous()) { // L: 40 41 - var2.remove(); // L: 42 - var2 = var3; // L: 43 + HealthBarUpdate var2 = (HealthBarUpdate)this.updates.last(); + if (var2 != null && var2.cycle <= var1) { + for (HealthBarUpdate var3 = (HealthBarUpdate)this.updates.previous(); var3 != null && var3.cycle <= var1; var3 = (HealthBarUpdate)this.updates.previous()) { + var2.remove(); + var2 = var3; } - if (this.definition.int5 + var2.cycle + var2.cycleOffset > var1) { // L: 47 + if (this.definition.int5 + var2.cycle + var2.cycleOffset > var1) { return var2; } else { - var2.remove(); // L: 49 - return null; // L: 50 + var2.remove(); + return null; } } else { return null; @@ -101,7 +101,7 @@ public class HealthBar extends Node { ) @Export("isEmpty") boolean isEmpty() { - return this.updates.method5915(); // L: 55 + return this.updates.method5915(); } @ObfuscatedName("p") @@ -110,16 +110,16 @@ public class HealthBar extends Node { garbageValue = "2114195084" ) static void method2311() { - if (Login.Login_username == null || Login.Login_username.length() <= 0) { // L: 300 - if (SecureRandomFuture.clientPreferences.rememberedUsername != null) { // L: 301 - Login.Login_username = SecureRandomFuture.clientPreferences.rememberedUsername; // L: 302 - Client.Login_isUsernameRemembered = true; // L: 303 + if (Login.Login_username == null || Login.Login_username.length() <= 0) { + if (SecureRandomFuture.clientPreferences.rememberedUsername != null) { + Login.Login_username = SecureRandomFuture.clientPreferences.rememberedUsername; + Client.Login_isUsernameRemembered = true; } else { - Client.Login_isUsernameRemembered = false; // L: 305 + Client.Login_isUsernameRemembered = false; } } - } // L: 306 + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -127,7 +127,7 @@ public class HealthBar extends Node { garbageValue = "2115145690" ) static char method2313(char var0) { - return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0; // L: 61 62 + return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0; } @ObfuscatedName("iq") @@ -137,18 +137,18 @@ public class HealthBar extends Node { ) @Export("Widget_runOnTargetLeave") static void Widget_runOnTargetLeave() { - if (Client.isSpellSelected) { // L: 9881 - Widget var0 = class126.getWidgetChild(class20.selectedSpellWidget, Client.selectedSpellChildIndex); // L: 9882 - if (var0 != null && var0.onTargetLeave != null) { // L: 9883 - ScriptEvent var1 = new ScriptEvent(); // L: 9884 - var1.widget = var0; // L: 9885 - var1.args = var0.onTargetLeave; // L: 9886 - class285.runScriptEvent(var1); // L: 9887 + if (Client.isSpellSelected) { + Widget var0 = class126.getWidgetChild(class20.selectedSpellWidget, Client.selectedSpellChildIndex); + if (var0 != null && var0.onTargetLeave != null) { + ScriptEvent var1 = new ScriptEvent(); + var1.widget = var0; + var1.args = var0.onTargetLeave; + class285.runScriptEvent(var1); } - Client.field633 = -1; // L: 9889 - Client.isSpellSelected = false; // L: 9890 - SecureRandomCallable.invalidateWidget(var0); // L: 9891 + Client.field633 = -1; + Client.isSpellSelected = false; + SecureRandomCallable.invalidateWidget(var0); } - } // L: 9892 + } } diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java index 08f145d2e0..30e9f8fc37 100644 --- a/runescape-client/src/main/java/HealthBarDefinition.java +++ b/runescape-client/src/main/java/HealthBarDefinition.java @@ -83,21 +83,21 @@ public class HealthBarDefinition extends DualNode { public int widthPadding; static { - HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64); // L: 14 - field1795 = new EvictingDualNodeHashTable(64); // L: 15 + HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64); + field1795 = new EvictingDualNodeHashTable(64); } HealthBarDefinition() { - this.int1 = 255; // L: 19 - this.int2 = 255; // L: 20 - this.int3 = -1; // L: 21 - this.field1798 = 1; // L: 22 - this.int5 = 70; // L: 23 - this.frontSpriteID = -1; // L: 24 - this.backSpriteID = -1; // L: 25 - this.width = 30; // L: 26 - this.widthPadding = 0; // L: 27 - } // L: 29 + this.int1 = 255; + this.int2 = 255; + this.int3 = -1; + this.field1798 = 1; + this.int5 = 70; + this.frontSpriteID = -1; + this.backSpriteID = -1; + this.width = 30; + this.widthPadding = 0; + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -107,12 +107,12 @@ public class HealthBarDefinition extends DualNode { @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 48 - if (var2 == 0) { // L: 49 - return; // L: 52 + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; } - this.decodeNext(var1, var2); // L: 50 + this.decodeNext(var1, var2); } } @@ -123,52 +123,51 @@ public class HealthBarDefinition extends DualNode { ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 55 - var1.readUnsignedShort(); // L: 56 - } else if (var2 == 2) { // L: 58 + if (var2 == 1) { + var1.readUnsignedShort(); + } else if (var2 == 2) { this.int1 = var1.readUnsignedByte(); - } else if (var2 == 3) { // L: 59 + } else if (var2 == 3) { 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 + } else if (var2 == 6) { + var1.readUnsignedByte(); + } else if (var2 == 7) { this.frontSpriteID = var1.method7400(); - } else if (var2 == 8) { // L: 66 + } else if (var2 == 8) { this.backSpriteID = var1.method7400(); - } else if (var2 == 11) { // L: 67 + } 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("t") @ObfuscatedSignature( descriptor = "(I)Lpl;", garbageValue = "-1857525750" ) - @Export("getFrontSprite") - public SpritePixels getFrontSprite() { - if (this.frontSpriteID < 0) { // L: 74 + public SpritePixels method3239() { + if (this.frontSpriteID < 0) { return null; } else { - SpritePixels var1 = (SpritePixels)field1795.get((long)this.frontSpriteID); // L: 75 + SpritePixels var1 = (SpritePixels)field1795.get((long)this.frontSpriteID); if (var1 != null) { - return var1; // L: 76 + return var1; } else { - var1 = class6.SpriteBuffer_getSprite(field1802, this.frontSpriteID, 0); // L: 77 + var1 = class6.SpriteBuffer_getSprite(field1802, this.frontSpriteID, 0); if (var1 != null) { - field1795.put(var1, (long)this.frontSpriteID); // L: 78 + field1795.put(var1, (long)this.frontSpriteID); } - return var1; // L: 80 + return var1; } } } @@ -178,21 +177,21 @@ public class HealthBarDefinition extends DualNode { descriptor = "(I)Lpl;", garbageValue = "-1451649947" ) - @Export("getBackSprite") - public SpritePixels getBackSprite() { - if (this.backSpriteID < 0) { // L: 84 + @Export("getFrontSprite") + public SpritePixels getFrontSprite() { + if (this.backSpriteID < 0) { return null; } else { - SpritePixels var1 = (SpritePixels)field1795.get((long)this.backSpriteID); // L: 85 - if (var1 != null) { // L: 86 + SpritePixels var1 = (SpritePixels)field1795.get((long)this.backSpriteID); + if (var1 != null) { return var1; } else { - var1 = class6.SpriteBuffer_getSprite(field1802, this.backSpriteID, 0); // L: 87 - if (var1 != null) { // L: 88 + var1 = class6.SpriteBuffer_getSprite(field1802, this.backSpriteID, 0); + if (var1 != null) { field1795.put(var1, (long)this.backSpriteID); } - return var1; // L: 90 + return var1; } } } @@ -204,6 +203,6 @@ public class HealthBarDefinition extends DualNode { ) @Export("isCharAlphabetic") public static boolean isCharAlphabetic(char var0) { - return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 144 + return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; } } diff --git a/runescape-client/src/main/java/HealthBarUpdate.java b/runescape-client/src/main/java/HealthBarUpdate.java index b8b7e86b14..5826aa268d 100644 --- a/runescape-client/src/main/java/HealthBarUpdate.java +++ b/runescape-client/src/main/java/HealthBarUpdate.java @@ -39,11 +39,11 @@ public class HealthBarUpdate extends Node { int cycleOffset; HealthBarUpdate(int var1, int var2, int var3, int var4) { - this.cycle = var1; // L: 12 - this.health = var2; // L: 13 - this.health2 = var3; // L: 14 - this.cycleOffset = var4; // L: 15 - } // L: 16 + this.cycle = var1; + this.health = var2; + this.health2 = var3; + this.cycleOffset = var4; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -52,9 +52,9 @@ public class HealthBarUpdate extends Node { ) @Export("set") void set(int var1, int var2, int var3, int var4) { - this.cycle = var1; // L: 19 - this.health = var2; // L: 20 - this.health2 = var3; // L: 21 - this.cycleOffset = var4; // L: 22 - } // L: 23 + this.cycle = var1; + this.health = var2; + this.health2 = var3; + this.cycleOffset = var4; + } } diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index 424015075e..7fe94478e9 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -128,17 +128,17 @@ public class HitSplatDefinition extends DualNode { int transformVarp; static { - HitSplatDefinition_cachedSprites = new EvictingDualNodeHashTable(64); // L: 18 - HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(64); // L: 19 - HealthBarDefinition_cached = new EvictingDualNodeHashTable(20); // L: 20 + HitSplatDefinition_cachedSprites = new EvictingDualNodeHashTable(64); + HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(64); + HealthBarDefinition_cached = new EvictingDualNodeHashTable(20); } HitSplatDefinition() { - this.fontId = -1; // L: 26 - this.textColor = 16777215; // L: 27 + this.fontId = -1; + this.textColor = 16777215; this.field1934 = 70; - this.field1935 = -1; // L: 29 - this.field1936 = -1; // L: 30 + this.field1935 = -1; + this.field1936 = -1; this.field1937 = -1; this.field1938 = -1; this.field1929 = 0; @@ -149,7 +149,7 @@ public class HitSplatDefinition extends DualNode { this.field1944 = 0; this.transformVarbit = -1; this.transformVarp = -1; - } // L: 43 + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -159,12 +159,12 @@ public class HitSplatDefinition extends DualNode { @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 63 - if (var2 == 0) { // L: 64 - return; // L: 67 + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; } - this.decodeNext(var1, var2); // L: 65 + this.decodeNext(var1, var2); } } @@ -175,67 +175,67 @@ public class HitSplatDefinition extends DualNode { ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 70 + if (var2 == 1) { this.fontId = var1.method7400(); - } else if (var2 == 2) { // L: 71 + } else if (var2 == 2) { this.textColor = var1.readMedium(); - } else if (var2 == 3) { // L: 72 + } else if (var2 == 3) { this.field1935 = var1.method7400(); - } else if (var2 == 4) { // L: 73 + } else if (var2 == 4) { this.field1937 = var1.method7400(); - } else if (var2 == 5) { // L: 74 + } else if (var2 == 5) { this.field1936 = var1.method7400(); - } else if (var2 == 6) { // L: 75 + } else if (var2 == 6) { this.field1938 = var1.method7400(); - } else if (var2 == 7) { // L: 76 + } else if (var2 == 7) { this.field1929 = var1.readShort(); - } else if (var2 == 8) { // L: 77 + } else if (var2 == 8) { this.field1942 = var1.readStringCp1252NullCircumfixed(); - } else if (var2 == 9) { // L: 78 + } else if (var2 == 9) { this.field1934 = var1.readUnsignedShort(); - } else if (var2 == 10) { // L: 79 + } else if (var2 == 10) { this.field1940 = var1.readShort(); - } else if (var2 == 11) { // L: 80 + } else if (var2 == 11) { this.field1943 = 0; - } else if (var2 == 12) { // L: 81 + } else if (var2 == 12) { this.field1946 = var1.readUnsignedByte(); - } else if (var2 == 13) { // L: 82 + } else if (var2 == 13) { this.field1944 = var1.readShort(); } else if (var2 == 14) { - this.field1943 = var1.readUnsignedShort(); // L: 83 - } else if (var2 == 17 || var2 == 18) { // L: 84 - this.transformVarbit = var1.readUnsignedShort(); // L: 85 - if (this.transformVarbit == 65535) { // L: 86 + this.field1943 = var1.readUnsignedShort(); + } else if (var2 == 17 || var2 == 18) { + this.transformVarbit = var1.readUnsignedShort(); + if (this.transformVarbit == 65535) { this.transformVarbit = -1; } - this.transformVarp = var1.readUnsignedShort(); // L: 87 - if (this.transformVarp == 65535) { // L: 88 + this.transformVarp = var1.readUnsignedShort(); + if (this.transformVarp == 65535) { this.transformVarp = -1; } - int var3 = -1; // L: 89 - if (var2 == 18) { // L: 90 - var3 = var1.readUnsignedShort(); // L: 91 - if (var3 == 65535) { // L: 92 + int var3 = -1; + if (var2 == 18) { + var3 = var1.readUnsignedShort(); + if (var3 == 65535) { var3 = -1; } } - int var4 = var1.readUnsignedByte(); // L: 94 - this.transforms = new int[var4 + 2]; // L: 95 + int var4 = var1.readUnsignedByte(); + this.transforms = new int[var4 + 2]; - for (int var5 = 0; var5 <= var4; ++var5) { // L: 96 - this.transforms[var5] = var1.readUnsignedShort(); // L: 97 - if (this.transforms[var5] == 65535) { // L: 98 + for (int var5 = 0; var5 <= var4; ++var5) { + this.transforms[var5] = var1.readUnsignedShort(); + if (this.transforms[var5] == 65535) { this.transforms[var5] = -1; } } - this.transforms[var4 + 1] = var3; // L: 100 + this.transforms[var4 + 1] = var3; } - } // L: 103 + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -244,21 +244,21 @@ public class HitSplatDefinition extends DualNode { ) @Export("transform") public final HitSplatDefinition transform() { - int var1 = -1; // L: 106 - if (this.transformVarbit != -1) { // L: 107 + int var1 = -1; + if (this.transformVarbit != -1) { var1 = class273.getVarbit(this.transformVarbit); - } else if (this.transformVarp != -1) { // L: 108 + } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } int var2; - if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 110 - var2 = this.transforms[var1]; // L: 111 + if (var1 >= 0 && var1 < this.transforms.length - 1) { + var2 = this.transforms[var1]; } else { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? UserComparator6.method2554(var2) : null; // L: 112 113 + return var2 != -1 ? UserComparator6.method2554(var2) : null; } @ObfuscatedName("s") @@ -332,19 +332,19 @@ public class HitSplatDefinition extends DualNode { garbageValue = "1542636708" ) public SpritePixels method3453() { - if (this.field1937 < 0) { // L: 147 + if (this.field1937 < 0) { return null; } else { SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedFonts.get((long)this.field1937); if (var1 != null) { - return var1; // L: 149 + return var1; } else { - var1 = class6.SpriteBuffer_getSprite(field1939, this.field1937, 0); // L: 150 - if (var1 != null) { // L: 151 + var1 = class6.SpriteBuffer_getSprite(field1939, this.field1937, 0); + if (var1 != null) { HitSplatDefinition_cachedFonts.put(var1, (long)this.field1937); } - return var1; // L: 153 + return var1; } } } @@ -355,19 +355,19 @@ public class HitSplatDefinition extends DualNode { garbageValue = "-2015320605" ) public SpritePixels method3454() { - if (this.field1938 < 0) { // L: 157 + if (this.field1938 < 0) { return null; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedFonts.get((long)this.field1938); // L: 158 + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedFonts.get((long)this.field1938); if (var1 != null) { - return var1; // L: 159 + return var1; } else { - var1 = class6.SpriteBuffer_getSprite(field1939, this.field1938, 0); // L: 160 - if (var1 != null) { // L: 161 + var1 = class6.SpriteBuffer_getSprite(field1939, this.field1938, 0); + if (var1 != null) { HitSplatDefinition_cachedFonts.put(var1, (long)this.field1938); } - return var1; // L: 163 + return var1; } } } @@ -379,38 +379,38 @@ public class HitSplatDefinition extends DualNode { ) @Export("getFont") public Font getFont() { - if (this.fontId == -1) { // L: 167 + if (this.fontId == -1) { return null; } else { - Font var1 = (Font)HealthBarDefinition_cached.get((long)this.fontId); // L: 168 - if (var1 != null) { // L: 169 + Font var1 = (Font)HealthBarDefinition_cached.get((long)this.fontId); + if (var1 != null) { return var1; } else { - AbstractArchive var3 = field1939; // L: 171 - AbstractArchive var4 = HitSplatDefinition_fontsArchive; // L: 172 - int var5 = this.fontId; // L: 173 + AbstractArchive var3 = field1939; + AbstractArchive var4 = HitSplatDefinition_fontsArchive; + int var5 = this.fontId; Font var2; - if (!class147.method3009(var3, var5, 0)) { // L: 175 - var2 = null; // L: 176 + if (!class147.method3009(var3, var5, 0)) { + var2 = null; } else { - byte[] var7 = var4.takeFile(var5, 0); // L: 180 + byte[] var7 = var4.takeFile(var5, 0); Font var6; - if (var7 == null) { // L: 182 - var6 = null; // L: 183 + if (var7 == null) { + var6 = null; } else { - Font var8 = new Font(var7, class141.SpriteBuffer_xOffsets, RouteStrategy.SpriteBuffer_yOffsets, class432.SpriteBuffer_spriteWidths, class330.SpriteBuffer_spriteHeights, class432.SpriteBuffer_spritePalette, class369.SpriteBuffer_pixels); // L: 186 - UserComparator3.method2529(); // L: 187 - var6 = var8; // L: 188 + Font var8 = new Font(var7, class141.SpriteBuffer_xOffsets, RouteStrategy.SpriteBuffer_yOffsets, class432.SpriteBuffer_spriteWidths, class330.SpriteBuffer_spriteHeights, class432.SpriteBuffer_spritePalette, class369.SpriteBuffer_pixels); + UserComparator3.method2529(); + var6 = var8; } - var2 = var6; // L: 190 + var2 = var6; } - if (var2 != null) { // L: 193 + if (var2 != null) { HealthBarDefinition_cached.put(var2, (long)this.fontId); } - return var2; // L: 195 + return var2; } } } @@ -423,30 +423,30 @@ public class HitSplatDefinition extends DualNode { @Export("getPacketBufferNode") public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { PacketBufferNode var2; - if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { // L: 24 - var2 = new PacketBufferNode(); // L: 25 + if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { + var2 = new PacketBufferNode(); } else { - var2 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 28 + var2 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; } - var2.clientPacket = var0; // L: 31 - var2.clientPacketLength = var0.length; // L: 32 + var2.clientPacket = var0; + var2.clientPacketLength = var0.length; if (var2.clientPacketLength == -1) { - var2.packetBuffer = new PacketBuffer(260); // L: 33 - } else if (var2.clientPacketLength == -2) { // L: 34 + var2.packetBuffer = new PacketBuffer(260); + } else if (var2.clientPacketLength == -2) { var2.packetBuffer = new PacketBuffer(10000); } else if (var2.clientPacketLength <= 18) { - var2.packetBuffer = new PacketBuffer(20); // L: 35 - } else if (var2.clientPacketLength <= 98) { // L: 36 + var2.packetBuffer = new PacketBuffer(20); + } else if (var2.clientPacketLength <= 98) { var2.packetBuffer = new PacketBuffer(100); } else { - var2.packetBuffer = new PacketBuffer(260); // L: 37 + var2.packetBuffer = new PacketBuffer(260); } - var2.packetBuffer.setIsaacCipher(var1); // L: 38 - var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); // L: 39 - var2.index = 0; // L: 40 - return var2; // L: 41 + var2.packetBuffer.setIsaacCipher(var1); + var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); + var2.index = 0; + return var2; } @ObfuscatedName("s") @@ -456,71 +456,71 @@ public class HitSplatDefinition extends DualNode { ) @Export("encodeStringCp1252") public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { - int var5 = var2 - var1; // L: 115 + int var5 = var2 - var1; - for (int var6 = 0; var6 < var5; ++var6) { // L: 116 - char var7 = var0.charAt(var6 + var1); // L: 117 - if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { // L: 118 + for (int var6 = 0; var6 < var5; ++var6) { + char var7 = var0.charAt(var6 + var1); + if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { var3[var6 + var4] = (byte)var7; - } else if (var7 == 8364) { // L: 119 + } else if (var7 == 8364) { var3[var6 + var4] = -128; - } else if (var7 == 8218) { // L: 120 + } else if (var7 == 8218) { var3[var6 + var4] = -126; - } else if (var7 == 402) { // L: 121 + } else if (var7 == 402) { var3[var6 + var4] = -125; - } else if (var7 == 8222) { // L: 122 + } else if (var7 == 8222) { var3[var6 + var4] = -124; - } else if (var7 == 8230) { // L: 123 + } else if (var7 == 8230) { var3[var6 + var4] = -123; - } else if (var7 == 8224) { // L: 124 + } else if (var7 == 8224) { var3[var6 + var4] = -122; - } else if (var7 == 8225) { // L: 125 + } else if (var7 == 8225) { var3[var6 + var4] = -121; - } else if (var7 == 710) { // L: 126 + } else if (var7 == 710) { var3[var6 + var4] = -120; - } else if (var7 == 8240) { // L: 127 + } else if (var7 == 8240) { var3[var6 + var4] = -119; - } else if (var7 == 352) { // L: 128 + } else if (var7 == 352) { var3[var6 + var4] = -118; - } else if (var7 == 8249) { // L: 129 + } else if (var7 == 8249) { var3[var6 + var4] = -117; - } else if (var7 == 338) { // L: 130 + } else if (var7 == 338) { var3[var6 + var4] = -116; - } else if (var7 == 381) { // L: 131 + } else if (var7 == 381) { var3[var6 + var4] = -114; - } else if (var7 == 8216) { // L: 132 + } else if (var7 == 8216) { var3[var6 + var4] = -111; - } else if (var7 == 8217) { // L: 133 + } else if (var7 == 8217) { var3[var6 + var4] = -110; - } else if (var7 == 8220) { // L: 134 + } else if (var7 == 8220) { var3[var6 + var4] = -109; - } else if (var7 == 8221) { // L: 135 + } else if (var7 == 8221) { var3[var6 + var4] = -108; - } else if (var7 == 8226) { // L: 136 + } else if (var7 == 8226) { var3[var6 + var4] = -107; - } else if (var7 == 8211) { // L: 137 + } else if (var7 == 8211) { var3[var6 + var4] = -106; } else if (var7 == 8212) { - var3[var6 + var4] = -105; // L: 138 - } else if (var7 == 732) { // L: 139 + var3[var6 + var4] = -105; + } else if (var7 == 732) { var3[var6 + var4] = -104; - } else if (var7 == 8482) { // L: 140 + } else if (var7 == 8482) { var3[var6 + var4] = -103; - } else if (var7 == 353) { // L: 141 + } else if (var7 == 353) { var3[var6 + var4] = -102; - } else if (var7 == 8250) { // L: 142 + } else if (var7 == 8250) { var3[var6 + var4] = -101; - } else if (var7 == 339) { // L: 143 + } else if (var7 == 339) { var3[var6 + var4] = -100; - } else if (var7 == 382) { // L: 144 + } else if (var7 == 382) { var3[var6 + var4] = -98; - } else if (var7 == 376) { // L: 145 + } else if (var7 == 376) { var3[var6 + var4] = -97; } else { - var3[var6 + var4] = 63; // L: 146 + var3[var6 + var4] = 63; } } - return var5; // L: 148 + return var5; } } diff --git a/runescape-client/src/main/java/HorizontalAlignment.java b/runescape-client/src/main/java/HorizontalAlignment.java index 77d33549ed..f7f302880c 100644 --- a/runescape-client/src/main/java/HorizontalAlignment.java +++ b/runescape-client/src/main/java/HorizontalAlignment.java @@ -44,9 +44,9 @@ public enum HorizontalAlignment implements MouseWheel { final int id; HorizontalAlignment(int var3, int var4) { - this.value = var3; // L: 18 - this.id = var4; // L: 19 - } // L: 20 + this.value = var3; + this.id = var4; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -55,7 +55,7 @@ public enum HorizontalAlignment implements MouseWheel { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 24 + return this.id; } @ObfuscatedName("c") @@ -65,44 +65,44 @@ public enum HorizontalAlignment implements MouseWheel { ) @Export("updatePlayer") static final void updatePlayer(PacketBuffer var0) { - var0.importIndex(); // L: 37 - int var1 = Client.localPlayerIndex; // L: 38 - Player var2 = class340.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 - class131.baseX; // L: 45 - var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); // L: 46 - var2.pathY[0] = var6 - TileItem.baseY; // L: 47 - var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); // L: 48 - class20.Client_plane = var2.plane = var4; // L: 49 - if (Players.field1248[var1] != null) { // L: 50 + var0.importIndex(); + int var1 = Client.localPlayerIndex; + Player var2 = class340.localPlayer = Client.players[var1] = new Player(); + var2.index = var1; + int var3 = var0.readBits(30); + byte var4 = (byte)(var3 >> 28); + int var5 = var3 >> 14 & 16383; + int var6 = var3 & 16383; + var2.pathX[0] = var5 - class131.baseX; + var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); + var2.pathY[0] = var6 - TileItem.baseY; + var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); + class20.Client_plane = var2.plane = var4; + if (Players.field1248[var1] != null) { var2.read(Players.field1248[var1]); } - Players.Players_count = 0; // L: 51 - Players.Players_indices[++Players.Players_count - 1] = var1; // L: 52 - Players.field1243[var1] = 0; // L: 53 - Players.Players_emptyIdxCount = 0; // L: 54 + Players.Players_count = 0; + Players.Players_indices[++Players.Players_count - 1] = var1; + Players.field1243[var1] = 0; + Players.Players_emptyIdxCount = 0; - 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.field1243[var7] = 0; // L: 65 + for (int var7 = 1; var7 < 2048; ++var7) { + if (var1 != var7) { + int var8 = var0.readBits(18); + int var9 = var8 >> 16; + int var10 = var8 >> 8 & 597; + int var11 = var8 & 597; + Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28); + Players.Players_orientations[var7] = 0; + Players.Players_targetIndices[var7] = -1; + Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7; + Players.field1243[var7] = 0; } } - var0.exportIndex(); // L: 67 - } // L: 68 + var0.exportIndex(); + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -110,23 +110,23 @@ public enum HorizontalAlignment implements MouseWheel { garbageValue = "-2046579641" ) static void method3294(Float var0, Float var1) { - if (var0 + class112.field1361 < 1.3333334F) { // L: 314 - float var2 = var0 - 2.0F; // L: 315 - float var3 = var0 - 1.0F; // L: 316 - float var4 = (float)Math.sqrt((double)(var2 * var2 - 4.0F * var3 * var3)); // L: 317 - float var5 = (var4 + -var2) * 0.5F; // L: 318 - if (var1 + class112.field1361 > var5) { // L: 319 - var1 = var5 - class112.field1361; // L: 320 + if (var0 + class112.field1361 < 1.3333334F) { + float var2 = var0 - 2.0F; + float var3 = var0 - 1.0F; + float var4 = (float)Math.sqrt((double)(var2 * var2 - 4.0F * var3 * var3)); + float var5 = (var4 + -var2) * 0.5F; + if (var1 + class112.field1361 > var5) { + var1 = var5 - class112.field1361; } else { - var5 = 0.5F * (-var2 - var4); // L: 323 - if (var1 < class112.field1361 + var5) { // L: 324 - var1 = class112.field1361 + var5; // L: 325 + var5 = 0.5F * (-var2 - var4); + if (var1 < class112.field1361 + var5) { + var1 = class112.field1361 + var5; } } } else { - var0 = 1.3333334F - class112.field1361; // L: 330 - var1 = 0.33333334F - class112.field1361; // L: 331 + var0 = 1.3333334F - class112.field1361; + var1 = 0.33333334F - class112.field1361; } - } // L: 333 + } } diff --git a/runescape-client/src/main/java/Huffman.java b/runescape-client/src/main/java/Huffman.java index 85160a7150..4db4eb0c75 100644 --- a/runescape-client/src/main/java/Huffman.java +++ b/runescape-client/src/main/java/Huffman.java @@ -27,87 +27,87 @@ public class Huffman { int[] keys; public Huffman(byte[] var1) { - int var2 = var1.length; // L: 9 - this.masks = new int[var2]; // L: 10 - this.bits = var1; // L: 11 - int[] var3 = new int[33]; // L: 12 - this.keys = new int[8]; // L: 13 - int var4 = 0; // L: 14 + int var2 = var1.length; + this.masks = new int[var2]; + this.bits = var1; + int[] var3 = new int[33]; + this.keys = new int[8]; + int var4 = 0; - for (int var5 = 0; var5 < var2; ++var5) { // L: 15 - byte var6 = var1[var5]; // L: 16 - if (var6 != 0) { // L: 17 - int var7 = 1 << 32 - var6; // L: 18 - int var8 = var3[var6]; // L: 19 - this.masks[var5] = var8; // L: 20 + for (int var5 = 0; var5 < var2; ++var5) { + byte var6 = var1[var5]; + if (var6 != 0) { + int var7 = 1 << 32 - var6; + int var8 = var3[var6]; + this.masks[var5] = var8; int var9; int var10; int var11; int var12; - if ((var8 & var7) != 0) { // L: 22 + if ((var8 & var7) != 0) { var9 = var3[var6 - 1]; } else { - var9 = var8 | var7; // L: 24 + var9 = var8 | var7; - for (var10 = var6 - 1; var10 >= 1; --var10) { // L: 25 - var11 = var3[var10]; // L: 26 - if (var8 != var11) { // L: 27 + for (var10 = var6 - 1; var10 >= 1; --var10) { + var11 = var3[var10]; + if (var8 != var11) { break; } - var12 = 1 << 32 - var10; // L: 28 - if ((var11 & var12) != 0) { // L: 29 - var3[var10] = var3[var10 - 1]; // L: 30 + var12 = 1 << 32 - var10; + if ((var11 & var12) != 0) { + var3[var10] = var3[var10 - 1]; break; } - var3[var10] = var11 | var12; // L: 33 + var3[var10] = var11 | var12; } } - var3[var6] = var9; // L: 38 + var3[var6] = var9; - for (var10 = var6 + 1; var10 <= 32; ++var10) { // L: 39 - if (var8 == var3[var10]) { // L: 40 + for (var10 = var6 + 1; var10 <= 32; ++var10) { + if (var8 == var3[var10]) { var3[var10] = var9; } } - var10 = 0; // L: 42 + var10 = 0; - for (var11 = 0; var11 < var6; ++var11) { // L: 43 - var12 = Integer.MIN_VALUE >>> var11; // L: 44 - if ((var8 & var12) != 0) { // L: 45 - if (this.keys[var10] == 0) { // L: 46 + for (var11 = 0; var11 < var6; ++var11) { + var12 = Integer.MIN_VALUE >>> var11; + if ((var8 & var12) != 0) { + if (this.keys[var10] == 0) { this.keys[var10] = var4; } - var10 = this.keys[var10]; // L: 47 + var10 = this.keys[var10]; } else { - ++var10; // L: 49 + ++var10; } - if (var10 >= this.keys.length) { // L: 50 - int[] var13 = new int[this.keys.length * 2]; // L: 51 + if (var10 >= this.keys.length) { + int[] var13 = new int[this.keys.length * 2]; - for (int var14 = 0; var14 < this.keys.length; ++var14) { // L: 52 + for (int var14 = 0; var14 < this.keys.length; ++var14) { var13[var14] = this.keys[var14]; } - this.keys = var13; // L: 53 + this.keys = var13; } - var12 >>>= 1; // L: 55 + var12 >>>= 1; } - this.keys[var10] = ~var5; // L: 57 - if (var10 >= var4) { // L: 58 + this.keys[var10] = ~var5; + if (var10 >= var4) { var4 = var10 + 1; } } } - } // L: 60 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -116,48 +116,48 @@ public class Huffman { ) @Export("compress") int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) { - int var6 = 0; // L: 63 - int var7 = var5 << 3; // L: 64 + int var6 = 0; + int var7 = var5 << 3; - for (var3 += var2; var2 < var3; ++var2) { // L: 65 66 - int var8 = var1[var2] & 255; // L: 67 - int var9 = this.masks[var8]; // L: 68 - byte var10 = this.bits[var8]; // L: 69 - if (var10 == 0) { // L: 70 + for (var3 += var2; var2 < var3; ++var2) { + int var8 = var1[var2] & 255; + int var9 = this.masks[var8]; + byte var10 = this.bits[var8]; + if (var10 == 0) { throw new RuntimeException("" + var8); } - int var11 = var7 >> 3; // L: 71 - int var12 = var7 & 7; // L: 72 - var6 &= -var12 >> 31; // L: 73 - int var13 = (var10 + var12 - 1 >> 3) + var11; // L: 74 - var12 += 24; // L: 76 - var4[var11] = (byte)(var6 |= var9 >>> var12); // L: 77 - if (var11 < var13) { // L: 78 - ++var11; // L: 79 - var12 -= 8; // L: 80 - var4[var11] = (byte)(var6 = var9 >>> var12); // L: 81 - if (var11 < var13) { // L: 82 - ++var11; // L: 83 - var12 -= 8; // L: 84 - var4[var11] = (byte)(var6 = var9 >>> var12); // L: 85 - if (var11 < var13) { // L: 86 - ++var11; // L: 87 - var12 -= 8; // L: 88 - var4[var11] = (byte)(var6 = var9 >>> var12); // L: 89 - if (var11 < var13) { // L: 90 - ++var11; // L: 91 - var12 -= 8; // L: 92 - var4[var11] = (byte)(var6 = var9 << -var12); // L: 93 + int var11 = var7 >> 3; + int var12 = var7 & 7; + var6 &= -var12 >> 31; + int var13 = (var10 + var12 - 1 >> 3) + var11; + var12 += 24; + var4[var11] = (byte)(var6 |= var9 >>> var12); + if (var11 < var13) { + ++var11; + var12 -= 8; + var4[var11] = (byte)(var6 = var9 >>> var12); + if (var11 < var13) { + ++var11; + var12 -= 8; + var4[var11] = (byte)(var6 = var9 >>> var12); + if (var11 < var13) { + ++var11; + var12 -= 8; + var4[var11] = (byte)(var6 = var9 >>> var12); + if (var11 < var13) { + ++var11; + var12 -= 8; + var4[var11] = (byte)(var6 = var9 << -var12); } } } } - var7 += var10; // L: 95 + var7 += var10; } - return (var7 + 7 >> 3) - var5; // L: 97 + return (var7 + 7 >> 3) - var5; } @ObfuscatedName("b") @@ -167,140 +167,140 @@ public class Huffman { ) @Export("decompress") int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) { - if (var5 == 0) { // L: 101 + if (var5 == 0) { return 0; } else { - int var6 = 0; // L: 102 - var5 += var4; // L: 103 + int var6 = 0; + var5 += var4; int var7 = var2; while (true) { - byte var8 = var1[var7]; // L: 106 - if (var8 < 0) { // L: 108 + byte var8 = var1[var7]; + if (var8 < 0) { var6 = this.keys[var6]; } else { - ++var6; // L: 109 + ++var6; } int var9; - if ((var9 = this.keys[var6]) < 0) { // L: 110 - var3[var4++] = (byte)(~var9); // L: 111 - if (var4 >= var5) { // L: 112 + if ((var9 = this.keys[var6]) < 0) { + var3[var4++] = (byte)(~var9); + if (var4 >= var5) { break; } - var6 = 0; // L: 113 + var6 = 0; } - if ((var8 & 64) != 0) { // L: 115 + if ((var8 & 64) != 0) { var6 = this.keys[var6]; } else { - ++var6; // L: 116 + ++var6; } - if ((var9 = this.keys[var6]) < 0) { // L: 117 - var3[var4++] = (byte)(~var9); // L: 118 - if (var4 >= var5) { // L: 119 + if ((var9 = this.keys[var6]) < 0) { + var3[var4++] = (byte)(~var9); + if (var4 >= var5) { break; } - var6 = 0; // L: 120 + var6 = 0; } - if ((var8 & 32) != 0) { // L: 122 + if ((var8 & 32) != 0) { var6 = this.keys[var6]; } else { - ++var6; // L: 123 + ++var6; } - if ((var9 = this.keys[var6]) < 0) { // L: 124 - var3[var4++] = (byte)(~var9); // L: 125 - if (var4 >= var5) { // L: 126 + if ((var9 = this.keys[var6]) < 0) { + var3[var4++] = (byte)(~var9); + if (var4 >= var5) { break; } - var6 = 0; // L: 127 + var6 = 0; } - if ((var8 & 16) != 0) { // L: 129 + if ((var8 & 16) != 0) { var6 = this.keys[var6]; } else { - ++var6; // L: 130 + ++var6; } - if ((var9 = this.keys[var6]) < 0) { // L: 131 - var3[var4++] = (byte)(~var9); // L: 132 - if (var4 >= var5) { // L: 133 + if ((var9 = this.keys[var6]) < 0) { + var3[var4++] = (byte)(~var9); + if (var4 >= var5) { break; } - var6 = 0; // L: 134 + var6 = 0; } - if ((var8 & 8) != 0) { // L: 136 + if ((var8 & 8) != 0) { var6 = this.keys[var6]; } else { - ++var6; // L: 137 + ++var6; } - if ((var9 = this.keys[var6]) < 0) { // L: 138 - var3[var4++] = (byte)(~var9); // L: 139 - if (var4 >= var5) { // L: 140 + if ((var9 = this.keys[var6]) < 0) { + var3[var4++] = (byte)(~var9); + if (var4 >= var5) { break; } - var6 = 0; // L: 141 + var6 = 0; } - if ((var8 & 4) != 0) { // L: 143 + if ((var8 & 4) != 0) { var6 = this.keys[var6]; } else { - ++var6; // L: 144 + ++var6; } - if ((var9 = this.keys[var6]) < 0) { // L: 145 - var3[var4++] = (byte)(~var9); // L: 146 - if (var4 >= var5) { // L: 147 + if ((var9 = this.keys[var6]) < 0) { + var3[var4++] = (byte)(~var9); + if (var4 >= var5) { break; } - var6 = 0; // L: 148 + var6 = 0; } - if ((var8 & 2) != 0) { // L: 150 + if ((var8 & 2) != 0) { var6 = this.keys[var6]; } else { - ++var6; // L: 151 + ++var6; } - if ((var9 = this.keys[var6]) < 0) { // L: 152 - var3[var4++] = (byte)(~var9); // L: 153 - if (var4 >= var5) { // L: 154 + if ((var9 = this.keys[var6]) < 0) { + var3[var4++] = (byte)(~var9); + if (var4 >= var5) { break; } - var6 = 0; // L: 155 + var6 = 0; } if ((var8 & 1) != 0) { - var6 = this.keys[var6]; // L: 157 + var6 = this.keys[var6]; } else { - ++var6; // L: 158 + ++var6; } - if ((var9 = this.keys[var6]) < 0) { // L: 159 - var3[var4++] = (byte)(~var9); // L: 160 - if (var4 >= var5) { // L: 161 + if ((var9 = this.keys[var6]) < 0) { + var3[var4++] = (byte)(~var9); + if (var4 >= var5) { break; } - var6 = 0; // L: 162 + var6 = 0; } - ++var7; // L: 105 + ++var7; } - return var7 + 1 - var2; // L: 165 + return var7 + 1 - var2; } } } diff --git a/runescape-client/src/main/java/IgnoreList.java b/runescape-client/src/main/java/IgnoreList.java index f07b67257e..7b61327206 100644 --- a/runescape-client/src/main/java/IgnoreList.java +++ b/runescape-client/src/main/java/IgnoreList.java @@ -22,9 +22,9 @@ public class IgnoreList extends UserList { descriptor = "(Low;)V" ) public IgnoreList(LoginType var1) { - super(400); // L: 13 - this.loginType = var1; // L: 14 - } // L: 15 + super(400); + this.loginType = var1; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -33,7 +33,7 @@ public class IgnoreList extends UserList { ) @Export("newInstance") User newInstance() { - return new Ignored(); // L: 19 + return new Ignored(); } @ObfuscatedName("b") @@ -43,7 +43,7 @@ public class IgnoreList extends UserList { ) @Export("newTypedArray") User[] newTypedArray(int var1) { - return new Ignored[var1]; // L: 24 + return new Ignored[var1]; } @ObfuscatedName("p") @@ -54,42 +54,42 @@ public class IgnoreList extends UserList { @Export("read") public void read(Buffer var1, int var2) { while (true) { - 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 && var8 != var7) { // L: 38 - if (var7 != null) { // L: 39 - this.remove(var8); // L: 40 + if (var1.offset < var2) { + int var3 = var1.readUnsignedByte(); + boolean var4 = (var3 & 1) == 1; + Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); + Username var6 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); + var1.readStringCp1252NullTerminated(); + if (var5 != null && var5.hasCleanName()) { + Ignored var7 = (Ignored)this.getByCurrentUsername(var5); + if (var4) { + Ignored var8 = (Ignored)this.getByCurrentUsername(var6); + if (var8 != null && var8 != var7) { + if (var7 != null) { + this.remove(var8); } else { - var7 = var8; // L: 43 + var7 = var8; } } } - if (var7 != null) { // L: 47 - this.changeName(var7, var5, var6); // L: 48 + if (var7 != null) { + this.changeName(var7, var5, var6); continue; } - 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 + if (this.getSize() < 400) { + int var9 = this.getSize(); + var7 = (Ignored)this.addLast(var5, var6); + var7.id = var9; } continue; } - throw new IllegalStateException(); // L: 56 + throw new IllegalStateException(); } - return; // L: 57 + return; } } @@ -100,48 +100,48 @@ public class IgnoreList extends UserList { ) static String method6267(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 + if (var0 instanceof RunException) { + RunException var2 = (RunException)var0; + var1 = var2.message + " | "; + var0 = var2.throwable; } else { - var1 = ""; // L: 72 + var1 = ""; } - 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 + StringWriter var12 = new StringWriter(); + PrintWriter var3 = new PrintWriter(var12); + var0.printStackTrace(var3); + var3.close(); + String var4 = var12.toString(); + BufferedReader var5 = new BufferedReader(new StringReader(var4)); + String var6 = var5.readLine(); while (true) { while (true) { - String var7 = var5.readLine(); // L: 81 - if (var7 == null) { // L: 82 - var1 = var1 + "| " + var6; // L: 100 - return var1; // L: 101 + String var7 = var5.readLine(); + if (var7 == null) { + var1 = var1 + "| " + var6; + return var1; } - 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 + int var8 = var7.indexOf(40); + int var9 = var7.indexOf(41, var8 + 1); + if (var8 >= 0 && var9 >= 0) { + String var10 = var7.substring(var8 + 1, var9); + int var11 = var10.indexOf(".java:"); + if (var11 >= 0) { + var10 = var10.substring(0, var11) + var10.substring(var11 + 5); + var1 = var1 + var10 + ' '; + continue; } - var7 = var7.substring(0, var8); // L: 93 + var7 = var7.substring(0, var8); } - 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 + var7 = var7.trim(); + var7 = var7.substring(var7.lastIndexOf(32) + 1); + var7 = var7.substring(var7.lastIndexOf(9) + 1); + var1 = var1 + var7 + ' '; } } } diff --git a/runescape-client/src/main/java/Ignored.java b/runescape-client/src/main/java/Ignored.java index 71d4f6219b..5d9258dc47 100644 --- a/runescape-client/src/main/java/Ignored.java +++ b/runescape-client/src/main/java/Ignored.java @@ -21,7 +21,7 @@ public class Ignored extends User { int id; Ignored() { - } // L: 6 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -30,7 +30,7 @@ public class Ignored extends User { ) @Export("compareTo_ignored") int compareTo_ignored(Ignored var1) { - return this.id - var1.id; // L: 9 + return this.id - var1.id; } @ObfuscatedName("b") @@ -40,11 +40,11 @@ public class Ignored extends User { ) @Export("compareTo_user") public int compareTo_user(User var1) { - return this.compareTo_ignored((Ignored)var1); // L: 13 + return this.compareTo_ignored((Ignored)var1); } public int compareTo(Object var1) { - return this.compareTo_ignored((Ignored)var1); // L: 17 + return this.compareTo_ignored((Ignored)var1); } @ObfuscatedName("c") @@ -53,12 +53,12 @@ public class Ignored extends User { garbageValue = "-376840192" ) public static final synchronized long method6459() { - long var0 = System.currentTimeMillis(); // L: 14 - if (var0 < class415.field4466) { // L: 15 - class415.field4467 += class415.field4466 - var0; // L: 16 + long var0 = System.currentTimeMillis(); + if (var0 < class415.field4466) { + class415.field4467 += class415.field4466 - var0; } - class415.field4466 = var0; // L: 18 - return var0 + class415.field4467; // L: 19 + class415.field4466 = var0; + return var0 + class415.field4467; } } diff --git a/runescape-client/src/main/java/IndexedSprite.java b/runescape-client/src/main/java/IndexedSprite.java index f3f246ad53..1e8218d4a3 100644 --- a/runescape-client/src/main/java/IndexedSprite.java +++ b/runescape-client/src/main/java/IndexedSprite.java @@ -33,242 +33,242 @@ public final class IndexedSprite extends Rasterizer2D { @ObfuscatedName("c") @Export("normalize") public void normalize() { - if (this.subWidth != this.width || this.subHeight != this.height) { // L: 18 - byte[] var1 = new byte[this.width * this.height]; // L: 19 - int var2 = 0; // L: 20 + if (this.subWidth != this.width || this.subHeight != this.height) { + byte[] var1 = new byte[this.width * this.height]; + int var2 = 0; - for (int var3 = 0; var3 < this.subHeight; ++var3) { // L: 21 - for (int var4 = 0; var4 < this.subWidth; ++var4) { // L: 22 - var1[var4 + (var3 + this.yOffset) * this.width + this.xOffset] = this.pixels[var2++]; // L: 23 + for (int var3 = 0; var3 < this.subHeight; ++var3) { + for (int var4 = 0; var4 < this.subWidth; ++var4) { + var1[var4 + (var3 + this.yOffset) * this.width + this.xOffset] = this.pixels[var2++]; } } - this.pixels = var1; // L: 26 - this.subWidth = this.width; // L: 27 - this.subHeight = this.height; // L: 28 - this.xOffset = 0; // L: 29 - this.yOffset = 0; // L: 30 + this.pixels = var1; + this.subWidth = this.width; + this.subHeight = this.height; + this.xOffset = 0; + this.yOffset = 0; } - } // L: 31 + } @ObfuscatedName("b") @Export("shiftColors") public void shiftColors(int var1, int var2, int var3) { - for (int var4 = 0; var4 < this.palette.length; ++var4) { // L: 34 - int var5 = this.palette[var4] >> 16 & 255; // L: 35 - var5 += var1; // L: 36 - if (var5 < 0) { // L: 37 + for (int var4 = 0; var4 < this.palette.length; ++var4) { + int var5 = this.palette[var4] >> 16 & 255; + var5 += var1; + if (var5 < 0) { var5 = 0; - } else if (var5 > 255) { // L: 38 + } else if (var5 > 255) { var5 = 255; } - int var6 = this.palette[var4] >> 8 & 255; // L: 39 - var6 += var2; // L: 40 - if (var6 < 0) { // L: 41 + int var6 = this.palette[var4] >> 8 & 255; + var6 += var2; + if (var6 < 0) { var6 = 0; - } else if (var6 > 255) { // L: 42 + } else if (var6 > 255) { var6 = 255; } - int var7 = this.palette[var4] & 255; // L: 43 - var7 += var3; // L: 44 - if (var7 < 0) { // L: 45 + int var7 = this.palette[var4] & 255; + var7 += var3; + if (var7 < 0) { var7 = 0; - } else if (var7 > 255) { // L: 46 + } else if (var7 > 255) { var7 = 255; } - this.palette[var4] = var7 + (var6 << 8) + (var5 << 16); // L: 47 + this.palette[var4] = var7 + (var6 << 8) + (var5 << 16); } - } // L: 49 + } @ObfuscatedName("p") @Export("drawAt") public void drawAt(int var1, int var2) { - var1 += this.xOffset; // L: 52 - var2 += this.yOffset; // L: 53 - int var3 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 54 - int var4 = 0; // L: 55 - int var5 = this.subHeight; // L: 56 - int var6 = this.subWidth; // L: 57 - int var7 = Rasterizer2D.Rasterizer2D_width - var6; // L: 58 - int var8 = 0; // L: 59 + var1 += this.xOffset; + var2 += this.yOffset; + int var3 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; + int var4 = 0; + int var5 = this.subHeight; + int var6 = this.subWidth; + int var7 = Rasterizer2D.Rasterizer2D_width - var6; + int var8 = 0; int var9; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 60 - var9 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 61 - var5 -= var9; // L: 62 - var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 63 - var4 += var9 * var6; // L: 64 - var3 += var9 * Rasterizer2D.Rasterizer2D_width; // L: 65 + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + var9 = Rasterizer2D.Rasterizer2D_yClipStart - var2; + var5 -= var9; + var2 = Rasterizer2D.Rasterizer2D_yClipStart; + var4 += var9 * var6; + var3 += var9 * Rasterizer2D.Rasterizer2D_width; } - if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 67 + if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { var5 -= var5 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 68 - var9 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 69 - var6 -= var9; // L: 70 - var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 71 - var4 += var9; // L: 72 - var3 += var9; // L: 73 - var8 += var9; // L: 74 - var7 += var9; // L: 75 + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + var9 = Rasterizer2D.Rasterizer2D_xClipStart - var1; + var6 -= var9; + var1 = Rasterizer2D.Rasterizer2D_xClipStart; + var4 += var9; + var3 += var9; + var8 += var9; + var7 += var9; } - if (var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 77 - var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 78 - var6 -= var9; // L: 79 - var8 += var9; // L: 80 - var7 += var9; // L: 81 + if (var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; + var6 -= var9; + var8 += var9; + var7 += var9; } - if (var6 > 0 && var5 > 0) { // L: 83 - IndexedSprite_two(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var4, var3, var6, var5, var7, var8); // L: 84 + if (var6 > 0 && var5 > 0) { + IndexedSprite_two(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var4, var3, var6, var5, var7, var8); } - } // L: 85 + } @ObfuscatedName("t") public void method7732(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 - int var8 = 0; // L: 119 - int var9 = this.width; // L: 120 - int var10 = this.height; // L: 121 - int var11 = (var9 << 16) / var3; // L: 122 - int var12 = (var10 << 16) / var4; // L: 123 + int var5 = this.subWidth; + int var6 = this.subHeight; + int var7 = 0; + int var8 = 0; + int var9 = this.width; + int var10 = this.height; + int var11 = (var9 << 16) / var3; + int var12 = (var10 << 16) / var4; int var13; - if (this.xOffset > 0) { // L: 124 - var13 = (var11 + (this.xOffset << 16) - 1) / var11; // L: 125 - var1 += var13; // L: 126 - var7 += var13 * var11 - (this.xOffset << 16); // L: 127 + if (this.xOffset > 0) { + var13 = (var11 + (this.xOffset << 16) - 1) / var11; + var1 += var13; + var7 += var13 * var11 - (this.xOffset << 16); } - if (this.yOffset > 0) { // L: 129 - var13 = (var12 + (this.yOffset << 16) - 1) / var12; // L: 130 - var2 += var13; // L: 131 - var8 += var13 * var12 - (this.yOffset << 16); // L: 132 + if (this.yOffset > 0) { + var13 = (var12 + (this.yOffset << 16) - 1) / var12; + var2 += var13; + var8 += var13 * var12 - (this.yOffset << 16); } - if (var5 < var9) { // L: 134 + if (var5 < var9) { var3 = (var11 + ((var5 << 16) - var7) - 1) / var11; } - if (var6 < var10) { // L: 135 + if (var6 < var10) { var4 = (var12 + ((var6 << 16) - var8) - 1) / var12; } - var13 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 136 - int var14 = Rasterizer2D.Rasterizer2D_width - var3; // L: 137 - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 138 + var13 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; + int var14 = Rasterizer2D.Rasterizer2D_width - var3; + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } int var15; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 139 - var15 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 140 - var4 -= var15; // L: 141 - var13 += var15 * Rasterizer2D.Rasterizer2D_width; // L: 142 - var8 += var12 * var15; // L: 143 + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + var15 = Rasterizer2D.Rasterizer2D_yClipStart - var2; + var4 -= var15; + var13 += var15 * Rasterizer2D.Rasterizer2D_width; + var8 += var12 * var15; } - if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 145 - var15 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 146 - var3 -= var15; // L: 147 - var14 += var15; // L: 148 + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var15 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; + var3 -= var15; + var14 += var15; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 150 - var15 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 151 - var3 -= var15; // L: 152 - var13 += var15; // L: 153 - var7 += var11 * var15; // L: 154 - var14 += var15; // L: 155 + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + var15 = Rasterizer2D.Rasterizer2D_xClipStart - var1; + var3 -= var15; + var13 += var15; + var7 += var11 * var15; + var14 += var15; } - IndexedSprite_something(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var7, var8, var13, var14, var3, var4, var11, var12, var5); // L: 157 - } // L: 158 + IndexedSprite_something(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var7, var8, var13, var14, var3, var4, var11, var12, var5); + } @ObfuscatedName("m") @Export("IndexedSprite_two") static void IndexedSprite_two(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8) { - int var9 = -(var5 >> 2); // L: 88 - var5 = -(var5 & 3); // L: 89 + int var9 = -(var5 >> 2); + var5 = -(var5 & 3); - for (int var10 = -var6; var10 < 0; ++var10) { // L: 90 + for (int var10 = -var6; var10 < 0; ++var10) { int var11; byte var12; - for (var11 = var9; var11 < 0; ++var11) { // L: 91 - var12 = var1[var3++]; // L: 92 + for (var11 = var9; var11 < 0; ++var11) { + var12 = var1[var3++]; if (var12 != 0) { - var0[var4++] = var2[var12 & 255]; // L: 93 - } else { - ++var4; // L: 94 - } - - var12 = var1[var3++]; // L: 95 - if (var12 != 0) { // L: 96 var0[var4++] = var2[var12 & 255]; } else { - ++var4; // L: 97 + ++var4; } - var12 = var1[var3++]; // L: 98 - if (var12 != 0) { // L: 99 + var12 = var1[var3++]; + if (var12 != 0) { var0[var4++] = var2[var12 & 255]; } else { - ++var4; // L: 100 + ++var4; } - var12 = var1[var3++]; // L: 101 - if (var12 != 0) { // L: 102 + var12 = var1[var3++]; + if (var12 != 0) { var0[var4++] = var2[var12 & 255]; } else { - ++var4; // L: 103 + ++var4; + } + + var12 = var1[var3++]; + if (var12 != 0) { + var0[var4++] = var2[var12 & 255]; + } else { + ++var4; } } - for (var11 = var5; var11 < 0; ++var11) { // L: 105 - var12 = var1[var3++]; // L: 106 - if (var12 != 0) { // L: 107 + for (var11 = var5; var11 < 0; ++var11) { + var12 = var1[var3++]; + if (var12 != 0) { var0[var4++] = var2[var12 & 255]; } else { - ++var4; // L: 108 + ++var4; } } - var4 += var7; // L: 110 - var3 += var8; // L: 111 + var4 += var7; + var3 += var8; } - } // L: 113 + } @ObfuscatedName("s") @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 + int var12 = var3; - for (int var13 = -var8; var13 < 0; ++var13) { // L: 162 - int var14 = var11 * (var4 >> 16); // L: 163 + for (int var13 = -var8; var13 < 0; ++var13) { + int var14 = var11 * (var4 >> 16); - for (int var15 = -var7; var15 < 0; ++var15) { // L: 164 - byte var16 = var1[(var3 >> 16) + var14]; // L: 165 - if (var16 != 0) { // L: 166 + for (int var15 = -var7; var15 < 0; ++var15) { + byte var16 = var1[(var3 >> 16) + var14]; + if (var16 != 0) { var0[var5++] = var2[var16 & 255]; } else { - ++var5; // L: 167 + ++var5; } - var3 += var9; // L: 168 + var3 += var9; } - var4 += var10; // L: 170 - var3 = var12; // L: 171 - var5 += var6; // L: 172 + var4 += var10; + var3 = var12; + var5 += var6; } - } // L: 174 + } } diff --git a/runescape-client/src/main/java/Instrument.java b/runescape-client/src/main/java/Instrument.java index f5c1d2eb45..3522170fd1 100644 --- a/runescape-client/src/main/java/Instrument.java +++ b/runescape-client/src/main/java/Instrument.java @@ -114,76 +114,76 @@ public class Instrument { int offset; static { - Instrument_noise = new int[32768]; // L: 31 - Random var0 = new Random(0L); // L: 32 + Instrument_noise = new int[32768]; + Random var0 = new Random(0L); int var1; - for (var1 = 0; var1 < 32768; ++var1) { // L: 33 - Instrument_noise[var1] = (var0.nextInt() & 2) - 1; // L: 34 + for (var1 = 0; var1 < 32768; ++var1) { + Instrument_noise[var1] = (var0.nextInt() & 2) - 1; } - Instrument_sine = new int[32768]; // L: 36 + Instrument_sine = new int[32768]; - for (var1 = 0; var1 < 32768; ++var1) { // L: 37 - Instrument_sine[var1] = (int)(Math.sin((double)var1 / 5215.1903D) * 16384.0D); // L: 38 + for (var1 = 0; var1 < 32768; ++var1) { + Instrument_sine[var1] = (int)(Math.sin((double)var1 / 5215.1903D) * 16384.0D); } - Instrument_samples = new int[220500]; // L: 40 - Instrument_phases = new int[5]; // L: 44 - Instrument_delays = new int[5]; // L: 45 - Instrument_volumeSteps = new int[5]; // L: 46 - Instrument_pitchSteps = new int[5]; // L: 47 - Instrument_pitchBaseSteps = new int[5]; // L: 48 + Instrument_samples = new int[220500]; + Instrument_phases = new int[5]; + Instrument_delays = new int[5]; + Instrument_volumeSteps = new int[5]; + Instrument_pitchSteps = new int[5]; + Instrument_pitchBaseSteps = new int[5]; } Instrument() { - this.oscillatorVolume = new int[]{0, 0, 0, 0, 0}; // L: 17 - this.oscillatorPitch = new int[]{0, 0, 0, 0, 0}; // L: 18 - this.oscillatorDelays = new int[]{0, 0, 0, 0, 0}; // L: 19 - this.delayTime = 0; // L: 20 - this.delayDecay = 100; // L: 21 - this.duration = 500; // L: 24 - this.offset = 0; // L: 25 - } // L: 50 + this.oscillatorVolume = new int[]{0, 0, 0, 0, 0}; + this.oscillatorPitch = new int[]{0, 0, 0, 0, 0}; + this.oscillatorDelays = new int[]{0, 0, 0, 0, 0}; + this.delayTime = 0; + this.delayDecay = 100; + this.duration = 500; + this.offset = 0; + } @ObfuscatedName("c") @Export("synthesize") final int[] synthesize(int var1, int var2) { - class333.clearIntArray(Instrument_samples, 0, var1); // L: 53 - if (var2 < 10) { // L: 54 + class333.clearIntArray(Instrument_samples, 0, var1); + if (var2 < 10) { return Instrument_samples; } else { - double var3 = (double)var1 / ((double)var2 + 0.0D); // L: 55 - this.pitch.reset(); // L: 56 - this.volume.reset(); // L: 57 - int var5 = 0; // L: 58 - int var6 = 0; // L: 59 - int var7 = 0; // L: 60 - if (this.pitchModifier != null) { // L: 61 - this.pitchModifier.reset(); // L: 62 - this.pitchModifierAmplitude.reset(); // L: 63 - var5 = (int)((double)(this.pitchModifier.end - this.pitchModifier.start) * 32.768D / var3); // L: 64 - var6 = (int)((double)this.pitchModifier.start * 32.768D / var3); // L: 65 + double var3 = (double)var1 / ((double)var2 + 0.0D); + this.pitch.reset(); + this.volume.reset(); + int var5 = 0; + int var6 = 0; + int var7 = 0; + if (this.pitchModifier != null) { + this.pitchModifier.reset(); + this.pitchModifierAmplitude.reset(); + var5 = (int)((double)(this.pitchModifier.end - this.pitchModifier.start) * 32.768D / var3); + var6 = (int)((double)this.pitchModifier.start * 32.768D / var3); } - int var8 = 0; // L: 67 - int var9 = 0; // L: 68 - int var10 = 0; // L: 69 - if (this.volumeMultiplier != null) { // L: 70 - this.volumeMultiplier.reset(); // L: 71 - this.volumeMultiplierAmplitude.reset(); // L: 72 - var8 = (int)((double)(this.volumeMultiplier.end - this.volumeMultiplier.start) * 32.768D / var3); // L: 73 - var9 = (int)((double)this.volumeMultiplier.start * 32.768D / var3); // L: 74 + int var8 = 0; + int var9 = 0; + int var10 = 0; + if (this.volumeMultiplier != null) { + this.volumeMultiplier.reset(); + this.volumeMultiplierAmplitude.reset(); + var8 = (int)((double)(this.volumeMultiplier.end - this.volumeMultiplier.start) * 32.768D / var3); + var9 = (int)((double)this.volumeMultiplier.start * 32.768D / var3); } int var11; - for (var11 = 0; var11 < 5; ++var11) { // L: 76 - if (this.oscillatorVolume[var11] != 0) { // L: 77 - Instrument_phases[var11] = 0; // L: 78 - Instrument_delays[var11] = (int)((double)this.oscillatorDelays[var11] * var3); // L: 79 - Instrument_volumeSteps[var11] = (this.oscillatorVolume[var11] << 14) / 100; // L: 80 - Instrument_pitchSteps[var11] = (int)((double)(this.pitch.end - this.pitch.start) * 32.768D * Math.pow(1.0057929410678534D, (double)this.oscillatorPitch[var11]) / var3); // L: 81 - Instrument_pitchBaseSteps[var11] = (int)((double)this.pitch.start * 32.768D / var3); // L: 82 + for (var11 = 0; var11 < 5; ++var11) { + if (this.oscillatorVolume[var11] != 0) { + Instrument_phases[var11] = 0; + Instrument_delays[var11] = (int)((double)this.oscillatorDelays[var11] * var3); + Instrument_volumeSteps[var11] = (this.oscillatorVolume[var11] << 14) / 100; + Instrument_pitchSteps[var11] = (int)((double)(this.pitch.end - this.pitch.start) * 32.768D * Math.pow(1.0057929410678534D, (double)this.oscillatorPitch[var11]) / var3); + Instrument_pitchBaseSteps[var11] = (int)((double)this.pitch.start * 32.768D / var3); } } @@ -192,30 +192,30 @@ public class Instrument { int var14; int var15; int[] var10000; - for (var11 = 0; var11 < var1; ++var11) { // L: 84 - var12 = this.pitch.doStep(var1); // L: 85 - var13 = this.volume.doStep(var1); // L: 86 - if (this.pitchModifier != null) { // L: 87 - var14 = this.pitchModifier.doStep(var1); // L: 88 - var15 = this.pitchModifierAmplitude.doStep(var1); // L: 89 - var12 += this.evaluateWave(var7, var15, this.pitchModifier.form) >> 1; // L: 90 - var7 = var7 + var6 + (var14 * var5 >> 16); // L: 91 + for (var11 = 0; var11 < var1; ++var11) { + var12 = this.pitch.doStep(var1); + var13 = this.volume.doStep(var1); + if (this.pitchModifier != null) { + var14 = this.pitchModifier.doStep(var1); + var15 = this.pitchModifierAmplitude.doStep(var1); + var12 += this.evaluateWave(var7, var15, this.pitchModifier.form) >> 1; + var7 = var7 + var6 + (var14 * var5 >> 16); } - if (this.volumeMultiplier != null) { // L: 93 - var14 = this.volumeMultiplier.doStep(var1); // L: 94 - var15 = this.volumeMultiplierAmplitude.doStep(var1); // L: 95 - var13 = var13 * ((this.evaluateWave(var10, var15, this.volumeMultiplier.form) >> 1) + 32768) >> 15; // L: 96 - var10 = var10 + var9 + (var14 * var8 >> 16); // L: 97 + if (this.volumeMultiplier != null) { + var14 = this.volumeMultiplier.doStep(var1); + var15 = this.volumeMultiplierAmplitude.doStep(var1); + var13 = var13 * ((this.evaluateWave(var10, var15, this.volumeMultiplier.form) >> 1) + 32768) >> 15; + var10 = var10 + var9 + (var14 * var8 >> 16); } - for (var14 = 0; var14 < 5; ++var14) { // L: 99 - if (this.oscillatorVolume[var14] != 0) { // L: 100 - var15 = Instrument_delays[var14] + var11; // L: 101 - if (var15 < var1) { // L: 102 - var10000 = Instrument_samples; // L: 103 + for (var14 = 0; var14 < 5; ++var14) { + if (this.oscillatorVolume[var14] != 0) { + var15 = Instrument_delays[var14] + var11; + if (var15 < var1) { + var10000 = Instrument_samples; var10000[var15] += this.evaluateWave(Instrument_phases[var14], var13 * Instrument_volumeSteps[var14] >> 15, this.pitch.form); - var10000 = Instrument_phases; // L: 104 + var10000 = Instrument_phases; var10000[var14] += (var12 * Instrument_pitchSteps[var14] >> 16) + Instrument_pitchBaseSteps[var14]; } } @@ -223,148 +223,148 @@ public class Instrument { } int var16; - if (this.release != null) { // L: 108 - this.release.reset(); // L: 109 - this.attack.reset(); // L: 110 - var11 = 0; // L: 111 - boolean var19 = false; // L: 112 - boolean var20 = true; // L: 113 + if (this.release != null) { + this.release.reset(); + this.attack.reset(); + var11 = 0; + boolean var19 = false; + boolean var20 = true; - for (var14 = 0; var14 < var1; ++var14) { // L: 114 - var15 = this.release.doStep(var1); // L: 115 - var16 = this.attack.doStep(var1); // L: 116 - if (var20) { // L: 117 + for (var14 = 0; var14 < var1; ++var14) { + var15 = this.release.doStep(var1); + var16 = this.attack.doStep(var1); + if (var20) { var12 = (var15 * (this.release.end - this.release.start) >> 8) + this.release.start; } else { - var12 = (var16 * (this.release.end - this.release.start) >> 8) + this.release.start; // L: 118 + var12 = (var16 * (this.release.end - this.release.start) >> 8) + this.release.start; } - var11 += 256; // L: 119 + var11 += 256; if (var11 >= var12) { - var11 = 0; // L: 120 - var20 = !var20; // L: 121 + var11 = 0; + var20 = !var20; } - if (var20) { // L: 123 + if (var20) { Instrument_samples[var14] = 0; } } } - if (this.delayTime > 0 && this.delayDecay > 0) { // L: 126 - var11 = (int)((double)this.delayTime * var3); // L: 127 + if (this.delayTime > 0 && this.delayDecay > 0) { + var11 = (int)((double)this.delayTime * var3); - for (var12 = var11; var12 < var1; ++var12) { // L: 128 + for (var12 = var11; var12 < var1; ++var12) { var10000 = Instrument_samples; var10000[var12] += Instrument_samples[var12 - var11] * this.delayDecay / 100; } } - if (this.filter.pairs[0] > 0 || this.filter.pairs[1] > 0) { // L: 130 - this.filterEnvelope.reset(); // L: 131 - var11 = this.filterEnvelope.doStep(var1 + 1); // L: 132 - var12 = this.filter.compute(0, (float)var11 / 65536.0F); // L: 133 - var13 = this.filter.compute(1, (float)var11 / 65536.0F); // L: 134 - if (var1 >= var12 + var13) { // L: 135 - var14 = 0; // L: 136 - var15 = var13; // L: 137 - if (var13 > var1 - var12) { // L: 138 + if (this.filter.pairs[0] > 0 || this.filter.pairs[1] > 0) { + this.filterEnvelope.reset(); + var11 = this.filterEnvelope.doStep(var1 + 1); + var12 = this.filter.compute(0, (float)var11 / 65536.0F); + var13 = this.filter.compute(1, (float)var11 / 65536.0F); + if (var1 >= var12 + var13) { + var14 = 0; + var15 = var13; + if (var13 > var1 - var12) { var15 = var1 - var12; } int var17; while (var14 < var15) { - var16 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16); // L: 140 + var16 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16); - for (var17 = 0; var17 < var12; ++var17) { // L: 141 + for (var17 = 0; var17 < var12; ++var17) { var16 += (int)((long)Instrument_samples[var14 + var12 - 1 - var17] * (long)AudioFilter.coefficients[0][var17] >> 16); } - for (var17 = 0; var17 < var14; ++var17) { // L: 142 + for (var17 = 0; var17 < var14; ++var17) { var16 -= (int)((long)Instrument_samples[var14 - 1 - var17] * (long)AudioFilter.coefficients[1][var17] >> 16); } - Instrument_samples[var14] = var16; // L: 143 - var11 = this.filterEnvelope.doStep(var1 + 1); // L: 144 - ++var14; // L: 139 + Instrument_samples[var14] = var16; + var11 = this.filterEnvelope.doStep(var1 + 1); + ++var14; } - boolean var21 = true; // L: 146 - var15 = 128; // L: 147 + boolean var21 = true; + var15 = 128; while (true) { - if (var15 > var1 - var12) { // L: 149 + if (var15 > var1 - var12) { var15 = var1 - var12; } int var18; while (var14 < var15) { - var17 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16); // L: 151 + var17 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16); - for (var18 = 0; var18 < var12; ++var18) { // L: 152 + for (var18 = 0; var18 < var12; ++var18) { var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var18] * (long)AudioFilter.coefficients[0][var18] >> 16); } - for (var18 = 0; var18 < var13; ++var18) { // L: 153 + for (var18 = 0; var18 < var13; ++var18) { var17 -= (int)((long)Instrument_samples[var14 - 1 - var18] * (long)AudioFilter.coefficients[1][var18] >> 16); } - Instrument_samples[var14] = var17; // L: 154 - var11 = this.filterEnvelope.doStep(var1 + 1); // L: 155 - ++var14; // L: 150 + Instrument_samples[var14] = var17; + var11 = this.filterEnvelope.doStep(var1 + 1); + ++var14; } - if (var14 >= var1 - var12) { // L: 157 + if (var14 >= var1 - var12) { while (var14 < var1) { - var17 = 0; // L: 163 + var17 = 0; - for (var18 = var14 + var12 - var1; var18 < var12; ++var18) { // L: 164 + for (var18 = var14 + var12 - var1; var18 < var12; ++var18) { var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var18] * (long)AudioFilter.coefficients[0][var18] >> 16); } - for (var18 = 0; var18 < var13; ++var18) { // L: 165 + for (var18 = 0; var18 < var13; ++var18) { var17 -= (int)((long)Instrument_samples[var14 - 1 - var18] * (long)AudioFilter.coefficients[1][var18] >> 16); } - Instrument_samples[var14] = var17; // L: 166 - this.filterEnvelope.doStep(var1 + 1); // L: 167 - ++var14; // L: 162 + Instrument_samples[var14] = var17; + this.filterEnvelope.doStep(var1 + 1); + ++var14; } break; } - var12 = this.filter.compute(0, (float)var11 / 65536.0F); // L: 158 - var13 = this.filter.compute(1, (float)var11 / 65536.0F); // L: 159 - var15 += 128; // L: 160 + var12 = this.filter.compute(0, (float)var11 / 65536.0F); + var13 = this.filter.compute(1, (float)var11 / 65536.0F); + var15 += 128; } } } - for (var11 = 0; var11 < var1; ++var11) { // L: 171 - if (Instrument_samples[var11] < -32768) { // L: 172 + for (var11 = 0; var11 < var1; ++var11) { + if (Instrument_samples[var11] < -32768) { Instrument_samples[var11] = -32768; } - if (Instrument_samples[var11] > 32767) { // L: 173 + if (Instrument_samples[var11] > 32767) { Instrument_samples[var11] = 32767; } } - return Instrument_samples; // L: 175 + return Instrument_samples; } } @ObfuscatedName("b") @Export("evaluateWave") final int evaluateWave(int var1, int var2, int var3) { - if (var3 == 1) { // L: 179 - return (var1 & 32767) < 16384 ? var2 : -var2; // L: 180 181 - } else if (var3 == 2) { // L: 183 + if (var3 == 1) { + return (var1 & 32767) < 16384 ? var2 : -var2; + } else if (var3 == 2) { return Instrument_sine[var1 & 32767] * var2 >> 14; - } else if (var3 == 3) { // L: 184 + } else if (var3 == 3) { return (var2 * (var1 & 32767) >> 14) - var2; } else { - return var3 == 4 ? var2 * Instrument_noise[var1 / 2607 & 32767] : 0; // L: 185 186 + return var3 == 4 ? var2 * Instrument_noise[var1 / 2607 & 32767] : 0; } } @@ -374,54 +374,54 @@ public class Instrument { ) @Export("decode") final void decode(Buffer var1) { - this.pitch = new SoundEnvelope(); // L: 190 - this.pitch.decode(var1); // L: 191 - this.volume = new SoundEnvelope(); // L: 192 - this.volume.decode(var1); // L: 193 - int var2 = var1.readUnsignedByte(); // L: 194 - if (var2 != 0) { // L: 195 - --var1.offset; // L: 196 - this.pitchModifier = new SoundEnvelope(); // L: 197 - this.pitchModifier.decode(var1); // L: 198 - this.pitchModifierAmplitude = new SoundEnvelope(); // L: 199 - this.pitchModifierAmplitude.decode(var1); // L: 200 + this.pitch = new SoundEnvelope(); + this.pitch.decode(var1); + this.volume = new SoundEnvelope(); + this.volume.decode(var1); + int var2 = var1.readUnsignedByte(); + if (var2 != 0) { + --var1.offset; + this.pitchModifier = new SoundEnvelope(); + this.pitchModifier.decode(var1); + this.pitchModifierAmplitude = new SoundEnvelope(); + this.pitchModifierAmplitude.decode(var1); } - var2 = var1.readUnsignedByte(); // L: 202 - if (var2 != 0) { // L: 203 - --var1.offset; // L: 204 - this.volumeMultiplier = new SoundEnvelope(); // L: 205 - this.volumeMultiplier.decode(var1); // L: 206 - this.volumeMultiplierAmplitude = new SoundEnvelope(); // L: 207 - this.volumeMultiplierAmplitude.decode(var1); // L: 208 + var2 = var1.readUnsignedByte(); + if (var2 != 0) { + --var1.offset; + this.volumeMultiplier = new SoundEnvelope(); + this.volumeMultiplier.decode(var1); + this.volumeMultiplierAmplitude = new SoundEnvelope(); + this.volumeMultiplierAmplitude.decode(var1); } - var2 = var1.readUnsignedByte(); // L: 210 - if (var2 != 0) { // L: 211 - --var1.offset; // L: 212 - this.release = new SoundEnvelope(); // L: 213 - this.release.decode(var1); // L: 214 - this.attack = new SoundEnvelope(); // L: 215 - this.attack.decode(var1); // L: 216 + var2 = var1.readUnsignedByte(); + if (var2 != 0) { + --var1.offset; + this.release = new SoundEnvelope(); + this.release.decode(var1); + this.attack = new SoundEnvelope(); + this.attack.decode(var1); } - for (int var3 = 0; var3 < 10; ++var3) { // L: 218 - int var4 = var1.readUShortSmart(); // L: 219 - if (var4 == 0) { // L: 220 + for (int var3 = 0; var3 < 10; ++var3) { + int var4 = var1.readUShortSmart(); + if (var4 == 0) { break; } - this.oscillatorVolume[var3] = var4; // L: 221 - this.oscillatorPitch[var3] = var1.readShortSmart(); // L: 222 - this.oscillatorDelays[var3] = var1.readUShortSmart(); // L: 223 + this.oscillatorVolume[var3] = var4; + this.oscillatorPitch[var3] = var1.readShortSmart(); + this.oscillatorDelays[var3] = var1.readUShortSmart(); } - this.delayTime = var1.readUShortSmart(); // L: 225 - this.delayDecay = var1.readUShortSmart(); // L: 226 - this.duration = var1.readUnsignedShort(); // L: 227 - this.offset = var1.readUnsignedShort(); // L: 228 - this.filter = new AudioFilter(); // L: 229 - this.filterEnvelope = new SoundEnvelope(); // L: 230 - this.filter.method1089(var1, this.filterEnvelope); // L: 231 - } // L: 232 + this.delayTime = var1.readUShortSmart(); + this.delayDecay = var1.readUShortSmart(); + this.duration = var1.readUnsignedShort(); + this.offset = var1.readUnsignedShort(); + this.filter = new AudioFilter(); + this.filterEnvelope = new SoundEnvelope(); + this.filter.method1089(var1, this.filterEnvelope); + } } diff --git a/runescape-client/src/main/java/IntHashTable.java b/runescape-client/src/main/java/IntHashTable.java index bddeff669f..12a0177f6e 100644 --- a/runescape-client/src/main/java/IntHashTable.java +++ b/runescape-client/src/main/java/IntHashTable.java @@ -12,25 +12,25 @@ public class IntHashTable { public IntHashTable(int[] var1) { int var2; - for (var2 = 1; var2 <= (var1.length >> 1) + var1.length; var2 <<= 1) { // L: 7 8 + for (var2 = 1; var2 <= (var1.length >> 1) + var1.length; var2 <<= 1) { } - this.array = new int[var2 + var2]; // L: 9 + this.array = new int[var2 + var2]; int var3; - for (var3 = 0; var3 < var2 + var2; ++var3) { // L: 10 + for (var3 = 0; var3 < var2 + var2; ++var3) { this.array[var3] = -1; } int var4; - for (var3 = 0; var3 < var1.length; this.array[var4 + var4 + 1] = var3++) { // L: 11 15 - for (var4 = var1[var3] & var2 - 1; this.array[var4 + var4 + 1] != -1; var4 = var4 + 1 & var2 - 1) { // L: 12 13 + for (var3 = 0; var3 < var1.length; this.array[var4 + var4 + 1] = var3++) { + for (var4 = var1[var3] & var2 - 1; this.array[var4 + var4 + 1] != -1; var4 = var4 + 1 & var2 - 1) { } - this.array[var4 + var4] = var1[var3]; // L: 14 + this.array[var4 + var4] = var1[var3]; } - } // L: 17 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -39,20 +39,20 @@ public class IntHashTable { ) @Export("get") public int get(int var1) { - int var2 = (this.array.length >> 1) - 1; // L: 20 - int var3 = var1 & var2; // L: 21 + int var2 = (this.array.length >> 1) - 1; + int var3 = var1 & var2; while (true) { - int var4 = this.array[var3 + var3 + 1]; // L: 23 - if (var4 == -1) { // L: 24 + int var4 = this.array[var3 + var3 + 1]; + if (var4 == -1) { return -1; } - if (this.array[var3 + var3] == var1) { // L: 25 + if (this.array[var3 + var3] == var1) { return var4; } - var3 = var3 + 1 & var2; // L: 26 + var3 = var3 + 1 & var2; } } } diff --git a/runescape-client/src/main/java/IntegerNode.java b/runescape-client/src/main/java/IntegerNode.java index 641f616265..68c755d88d 100644 --- a/runescape-client/src/main/java/IntegerNode.java +++ b/runescape-client/src/main/java/IntegerNode.java @@ -10,6 +10,6 @@ public class IntegerNode extends Node { public int integer; public IntegerNode(int var1) { - this.integer = var1; // L: 7 - } // L: 8 + this.integer = var1; + } } diff --git a/runescape-client/src/main/java/InterfaceParent.java b/runescape-client/src/main/java/InterfaceParent.java index 3c962765c2..ad13945d58 100644 --- a/runescape-client/src/main/java/InterfaceParent.java +++ b/runescape-client/src/main/java/InterfaceParent.java @@ -23,8 +23,8 @@ public class InterfaceParent extends Node { boolean field1014; InterfaceParent() { - this.field1014 = false; // L: 8 - } // L: 10 + this.field1014 = false; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -32,8 +32,8 @@ public class InterfaceParent extends Node { garbageValue = "-1043204065" ) public static void method2145(AbstractArchive var0) { - ParamComposition.ParamDefinition_archive = var0; // L: 21 - } // L: 22 + ParamComposition.ParamDefinition_archive = var0; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -41,19 +41,19 @@ public class InterfaceParent extends Node { garbageValue = "-64" ) public static FloorUnderlayDefinition method2144(int var0) { - FloorUnderlayDefinition var1 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0); // L: 25 - if (var1 != null) { // L: 26 + FloorUnderlayDefinition var1 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0); + if (var1 != null) { return var1; } else { - byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0); // L: 27 - var1 = new FloorUnderlayDefinition(); // L: 28 - if (var2 != null) { // L: 29 + byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0); + var1 = new FloorUnderlayDefinition(); + if (var2 != null) { var1.decode(new Buffer(var2), var0); } - var1.postDecode(); // L: 30 - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); // L: 31 - return var1; // L: 32 + var1.postDecode(); + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); + return var1; } } @@ -63,18 +63,18 @@ public class InterfaceParent extends Node { garbageValue = "1442239396" ) public static void method2143() { - SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); // L: 122 - SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); // L: 123 - } // L: 124 + SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); + SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); + } @ObfuscatedName("kw") static final void method2142(double var0) { - Rasterizer3D.Rasterizer3D_setBrightness(var0); // L: 12121 - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(var0); // L: 12122 - VerticalAlignment.method3338(); // L: 12123 - SecureRandomFuture.clientPreferences.brightness = var0; // L: 12124 - class127.savePreferences(); // L: 12125 - } // L: 12126 + Rasterizer3D.Rasterizer3D_setBrightness(var0); + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(var0); + VerticalAlignment.method3338(); + SecureRandomFuture.clientPreferences.brightness = var0; + class127.savePreferences(); + } @ObfuscatedName("lx") @ObfuscatedSignature( @@ -82,25 +82,25 @@ public class InterfaceParent extends Node { garbageValue = "-2059094026" ) static String method2146(String var0, boolean var1) { - String var2 = var1 ? "https://" : "http://"; // L: 12589 - if (Client.gameBuild == 1) { // L: 12590 + String var2 = var1 ? "https://" : "http://"; + if (Client.gameBuild == 1) { var0 = var0 + "-wtrc"; - } else if (Client.gameBuild == 2) { // L: 12591 + } else if (Client.gameBuild == 2) { var0 = var0 + "-wtqa"; - } else if (Client.gameBuild == 3) { // L: 12592 + } else if (Client.gameBuild == 3) { var0 = var0 + "-wtwip"; - } else if (Client.gameBuild == 5) { // L: 12593 + } else if (Client.gameBuild == 5) { var0 = var0 + "-wti"; - } else if (Client.gameBuild == 4) { // L: 12594 + } else if (Client.gameBuild == 4) { var0 = "local"; } - String var3 = ""; // L: 12595 - if (class1.field3 != null) { // L: 12596 + String var3 = ""; + if (class1.field3 != null) { var3 = "/p=" + class1.field3; } - String var4 = "runescape.com"; // L: 12597 - return var2 + var0 + "." + var4 + "/l=" + ScriptFrame.clientLanguage + "/a=" + FriendLoginUpdate.field4096 + var3 + "/"; // L: 12598 + String var4 = "runescape.com"; + return var2 + var0 + "." + var4 + "/l=" + ScriptFrame.clientLanguage + "/a=" + FriendLoginUpdate.field4096 + var3 + "/"; } } diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java index d74076fe1a..dc93e1cc62 100644 --- a/runescape-client/src/main/java/Interpreter.java +++ b/runescape-client/src/main/java/Interpreter.java @@ -64,19 +64,19 @@ public class Interpreter { static final double field814; static { - Interpreter_arrayLengths = new int[5]; // L: 77 - Interpreter_arrays = new int[5][5000]; // L: 78 - Interpreter_intStack = new int[1000]; // L: 79 - Interpreter_stringStack = new String[1000]; // L: 81 - Interpreter_frameDepth = 0; // L: 83 - Interpreter_frames = new ScriptFrame[50]; // L: 84 - Interpreter_calendar = java.util.Calendar.getInstance(); // L: 90 - Interpreter_MONTHS = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; // L: 93 - field818 = false; // L: 96 - field816 = false; // L: 97 - field817 = new ArrayList(); // L: 98 - field815 = 0; // L: 99 - field814 = Math.log(2.0D); // L: 103 + Interpreter_arrayLengths = new int[5]; + Interpreter_arrays = new int[5][5000]; + Interpreter_intStack = new int[1000]; + Interpreter_stringStack = new String[1000]; + Interpreter_frameDepth = 0; + Interpreter_frames = new ScriptFrame[50]; + Interpreter_calendar = java.util.Calendar.getInstance(); + Interpreter_MONTHS = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; + field818 = false; + field816 = false; + field817 = new ArrayList(); + field815 = 0; + field814 = Math.log(2.0D); } @ObfuscatedName("p") @@ -86,16 +86,16 @@ public class Interpreter { ) @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 + int var2 = var0 << 4; + if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { + var0 = Character.toLowerCase(var0); + var2 = (var0 << 4) + 1; } - if (var0 == 241 && var1 == Language.Language_ES) { // L: 148 + if (var0 == 241 && var1 == Language.Language_ES) { var2 = 1762; } - return var2; // L: 149 + return var2; } } diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java index 631636c783..f45a4fefea 100644 --- a/runescape-client/src/main/java/InvDefinition.java +++ b/runescape-client/src/main/java/InvDefinition.java @@ -27,12 +27,12 @@ public class InvDefinition extends DualNode { public int size; static { - InvDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11 + InvDefinition_cached = new EvictingDualNodeHashTable(64); } InvDefinition() { - this.size = 0; // L: 12 - } // L: 14 + this.size = 0; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -42,12 +42,12 @@ public class InvDefinition extends DualNode { @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 28 - if (var2 == 0) { // L: 29 - return; // L: 32 + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; } - this.decodeNext(var1, var2); // L: 30 + this.decodeNext(var1, var2); } } @@ -58,11 +58,11 @@ public class InvDefinition extends DualNode { ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 2) { // L: 35 + if (var2 == 2) { this.size = var1.readUnsignedShort(); } - } // L: 37 + } @ObfuscatedName("ir") @ObfuscatedSignature( @@ -70,6 +70,6 @@ public class InvDefinition extends DualNode { garbageValue = "2" ) static boolean method3157(int var0) { - return var0 == 57 || var0 == 58 || var0 == 1007 || var0 == 25 || var0 == 30; // L: 10084 + return var0 == 57 || var0 == 58 || var0 == 1007 || var0 == 25 || var0 == 30; } } diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java index e60d199c12..e2a241c665 100644 --- a/runescape-client/src/main/java/IsaacCipher.java +++ b/runescape-client/src/main/java/IsaacCipher.java @@ -45,15 +45,15 @@ public final class IsaacCipher { int cc; public IsaacCipher(int[] var1) { - this.mm = new int[256]; // L: 15 - this.results = new int[256]; // L: 16 + this.mm = new int[256]; + this.results = new int[256]; - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 17 - this.results[var2] = var1[var2]; // L: 18 + for (int var2 = 0; var2 < var1.length; ++var2) { + this.results[var2] = var1[var2]; } - this.method7875(); // L: 20 - } // L: 21 + this.method7875(); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -62,12 +62,12 @@ public final class IsaacCipher { ) @Export("nextInt") public final int nextInt() { - if (this.valuesRemaining == 0) { // L: 24 - this.generateMoreResults(); // L: 25 - this.valuesRemaining = 256; // L: 26 + if (this.valuesRemaining == 0) { + this.generateMoreResults(); + this.valuesRemaining = 256; } - return this.results[--this.valuesRemaining]; // L: 28 + return this.results[--this.valuesRemaining]; } @ObfuscatedName("b") @@ -76,12 +76,12 @@ public final class IsaacCipher { garbageValue = "-935102331" ) public final int method7874() { - if (this.valuesRemaining == 0) { // L: 32 - this.generateMoreResults(); // L: 33 - this.valuesRemaining = 256; // L: 34 + if (this.valuesRemaining == 0) { + this.generateMoreResults(); + this.valuesRemaining = 256; } - return this.results[this.valuesRemaining - 1]; // L: 36 + return this.results[this.valuesRemaining - 1]; } @ObfuscatedName("p") @@ -91,29 +91,29 @@ public final class IsaacCipher { ) @Export("generateMoreResults") final void generateMoreResults() { - this.bb += ++this.cc; // L: 43 + this.bb += ++this.cc; - for (int var1 = 0; var1 < 256; ++var1) { // L: 44 - int var2 = this.mm[var1]; // L: 45 - if ((var1 & 2) == 0) { // L: 46 - if ((var1 & 1) == 0) { // L: 47 + for (int var1 = 0; var1 < 256; ++var1) { + int var2 = this.mm[var1]; + if ((var1 & 2) == 0) { + if ((var1 & 1) == 0) { this.aa ^= this.aa << 13; } else { - this.aa ^= this.aa >>> 6; // L: 48 + this.aa ^= this.aa >>> 6; } - } else if ((var1 & 1) == 0) { // L: 51 + } else if ((var1 & 1) == 0) { this.aa ^= this.aa << 2; } else { - this.aa ^= this.aa >>> 16; // L: 52 + this.aa ^= this.aa >>> 16; } - this.aa += this.mm[128 + var1 & 255]; // L: 54 + this.aa += this.mm[128 + var1 & 255]; int var3; - this.mm[var1] = var3 = this.mm[(var2 & 1020) >> 2] + this.aa + this.bb; // L: 55 - this.results[var1] = this.bb = this.mm[(var3 >> 8 & 1020) >> 2] + var2; // L: 56 + this.mm[var1] = var3 = this.mm[(var2 & 1020) >> 2] + this.aa + this.bb; + this.results[var1] = this.bb = this.mm[(var3 >> 8 & 1020) >> 2] + var2; } - } // L: 58 + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -121,132 +121,132 @@ public final class IsaacCipher { garbageValue = "1959628125" ) final void method7875() { - int var9 = -1640531527; // L: 70 - int var8 = -1640531527; // L: 71 - int var7 = -1640531527; // L: 72 - int var6 = -1640531527; // L: 73 - int var5 = -1640531527; // L: 74 - int var4 = -1640531527; // L: 75 - int var3 = -1640531527; // L: 76 - int var2 = -1640531527; // L: 77 + int var9 = -1640531527; + int var8 = -1640531527; + int var7 = -1640531527; + int var6 = -1640531527; + int var5 = -1640531527; + int var4 = -1640531527; + int var3 = -1640531527; + int var2 = -1640531527; int var1; - for (var1 = 0; var1 < 4; ++var1) { // L: 78 - var2 ^= var3 << 11; // L: 79 - var5 += var2; // L: 80 - var3 += var4; // L: 81 - var3 ^= var4 >>> 2; // L: 82 - var6 += var3; // L: 83 - var4 += var5; // L: 84 - var4 ^= var5 << 8; // L: 85 - var7 += var4; // L: 86 - var5 += var6; // L: 87 - var5 ^= var6 >>> 16; // L: 88 - var8 += var5; // L: 89 - var6 += var7; // L: 90 - var6 ^= var7 << 10; // L: 91 - var9 += var6; // L: 92 - var7 += var8; // L: 93 - var7 ^= var8 >>> 4; // L: 94 - var2 += var7; // L: 95 - var8 += var9; // L: 96 - var8 ^= var9 << 8; // L: 97 - var3 += var8; // L: 98 - var9 += var2; // L: 99 - var9 ^= var2 >>> 9; // L: 100 - var4 += var9; // L: 101 - var2 += var3; // L: 102 + for (var1 = 0; var1 < 4; ++var1) { + var2 ^= var3 << 11; + var5 += var2; + var3 += var4; + var3 ^= var4 >>> 2; + var6 += var3; + var4 += var5; + var4 ^= var5 << 8; + var7 += var4; + var5 += var6; + var5 ^= var6 >>> 16; + var8 += var5; + var6 += var7; + var6 ^= var7 << 10; + var9 += var6; + var7 += var8; + var7 ^= var8 >>> 4; + var2 += var7; + var8 += var9; + var8 ^= var9 << 8; + var3 += var8; + var9 += var2; + var9 ^= var2 >>> 9; + var4 += var9; + var2 += var3; } - for (var1 = 0; var1 < 256; var1 += 8) { // L: 104 - var2 += this.results[var1]; // L: 105 - var3 += this.results[var1 + 1]; // L: 106 - var4 += this.results[var1 + 2]; // L: 107 - var5 += this.results[var1 + 3]; // L: 108 - var6 += this.results[var1 + 4]; // L: 109 - var7 += this.results[var1 + 5]; // L: 110 - var8 += this.results[var1 + 6]; // L: 111 - var9 += this.results[var1 + 7]; // L: 112 - var2 ^= var3 << 11; // L: 113 - var5 += var2; // L: 114 - var3 += var4; // L: 115 - var3 ^= var4 >>> 2; // L: 116 - var6 += var3; // L: 117 - var4 += var5; // L: 118 - var4 ^= var5 << 8; // L: 119 - var7 += var4; // L: 120 - var5 += var6; // L: 121 - var5 ^= var6 >>> 16; // L: 122 - var8 += var5; // L: 123 - var6 += var7; // L: 124 - var6 ^= var7 << 10; // L: 125 - var9 += var6; // L: 126 - var7 += var8; // L: 127 - var7 ^= var8 >>> 4; // L: 128 - var2 += var7; // L: 129 - var8 += var9; // L: 130 - var8 ^= var9 << 8; // L: 131 - var3 += var8; // L: 132 - var9 += var2; // L: 133 - var9 ^= var2 >>> 9; // L: 134 - var4 += var9; // L: 135 - var2 += var3; // L: 136 - this.mm[var1] = var2; // L: 137 - this.mm[var1 + 1] = var3; // L: 138 - this.mm[var1 + 2] = var4; // L: 139 - this.mm[var1 + 3] = var5; // L: 140 - this.mm[var1 + 4] = var6; // L: 141 - this.mm[var1 + 5] = var7; // L: 142 - this.mm[var1 + 6] = var8; // L: 143 - this.mm[var1 + 7] = var9; // L: 144 + for (var1 = 0; var1 < 256; var1 += 8) { + var2 += this.results[var1]; + var3 += this.results[var1 + 1]; + var4 += this.results[var1 + 2]; + var5 += this.results[var1 + 3]; + var6 += this.results[var1 + 4]; + var7 += this.results[var1 + 5]; + var8 += this.results[var1 + 6]; + var9 += this.results[var1 + 7]; + var2 ^= var3 << 11; + var5 += var2; + var3 += var4; + var3 ^= var4 >>> 2; + var6 += var3; + var4 += var5; + var4 ^= var5 << 8; + var7 += var4; + var5 += var6; + var5 ^= var6 >>> 16; + var8 += var5; + var6 += var7; + var6 ^= var7 << 10; + var9 += var6; + var7 += var8; + var7 ^= var8 >>> 4; + var2 += var7; + var8 += var9; + var8 ^= var9 << 8; + var3 += var8; + var9 += var2; + var9 ^= var2 >>> 9; + var4 += var9; + var2 += var3; + this.mm[var1] = var2; + this.mm[var1 + 1] = var3; + this.mm[var1 + 2] = var4; + this.mm[var1 + 3] = var5; + this.mm[var1 + 4] = var6; + this.mm[var1 + 5] = var7; + this.mm[var1 + 6] = var8; + this.mm[var1 + 7] = var9; } - for (var1 = 0; var1 < 256; var1 += 8) { // L: 146 - var2 += this.mm[var1]; // L: 147 - var3 += this.mm[var1 + 1]; // L: 148 - var4 += this.mm[var1 + 2]; // L: 149 - var5 += this.mm[var1 + 3]; // L: 150 - var6 += this.mm[var1 + 4]; // L: 151 - var7 += this.mm[var1 + 5]; // L: 152 - var8 += this.mm[var1 + 6]; // L: 153 - var9 += this.mm[var1 + 7]; // L: 154 - var2 ^= var3 << 11; // L: 155 - var5 += var2; // L: 156 - var3 += var4; // L: 157 - var3 ^= var4 >>> 2; // L: 158 - var6 += var3; // L: 159 - var4 += var5; // L: 160 - var4 ^= var5 << 8; // L: 161 - var7 += var4; // L: 162 - var5 += var6; // L: 163 - var5 ^= var6 >>> 16; // L: 164 - var8 += var5; // L: 165 - var6 += var7; // L: 166 - var6 ^= var7 << 10; // L: 167 - var9 += var6; // L: 168 - var7 += var8; // L: 169 - var7 ^= var8 >>> 4; // L: 170 - var2 += var7; // L: 171 - var8 += var9; // L: 172 - var8 ^= var9 << 8; // L: 173 - var3 += var8; // L: 174 - var9 += var2; // L: 175 - var9 ^= var2 >>> 9; // L: 176 - var4 += var9; // L: 177 - var2 += var3; // L: 178 - this.mm[var1] = var2; // L: 179 - this.mm[var1 + 1] = var3; // L: 180 - this.mm[var1 + 2] = var4; // L: 181 - this.mm[var1 + 3] = var5; // L: 182 - this.mm[var1 + 4] = var6; // L: 183 - this.mm[var1 + 5] = var7; // L: 184 - this.mm[var1 + 6] = var8; // L: 185 - this.mm[var1 + 7] = var9; // L: 186 + for (var1 = 0; var1 < 256; var1 += 8) { + var2 += this.mm[var1]; + var3 += this.mm[var1 + 1]; + var4 += this.mm[var1 + 2]; + var5 += this.mm[var1 + 3]; + var6 += this.mm[var1 + 4]; + var7 += this.mm[var1 + 5]; + var8 += this.mm[var1 + 6]; + var9 += this.mm[var1 + 7]; + var2 ^= var3 << 11; + var5 += var2; + var3 += var4; + var3 ^= var4 >>> 2; + var6 += var3; + var4 += var5; + var4 ^= var5 << 8; + var7 += var4; + var5 += var6; + var5 ^= var6 >>> 16; + var8 += var5; + var6 += var7; + var6 ^= var7 << 10; + var9 += var6; + var7 += var8; + var7 ^= var8 >>> 4; + var2 += var7; + var8 += var9; + var8 ^= var9 << 8; + var3 += var8; + var9 += var2; + var9 ^= var2 >>> 9; + var4 += var9; + var2 += var3; + this.mm[var1] = var2; + this.mm[var1 + 1] = var3; + this.mm[var1 + 2] = var4; + this.mm[var1 + 3] = var5; + this.mm[var1 + 4] = var6; + this.mm[var1 + 5] = var7; + this.mm[var1 + 6] = var8; + this.mm[var1 + 7] = var9; } - this.generateMoreResults(); // L: 188 - this.valuesRemaining = 256; // L: 189 - } // L: 190 + this.generateMoreResults(); + this.valuesRemaining = 256; + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -254,7 +254,7 @@ public final class IsaacCipher { garbageValue = "-1565959328" ) static int method7886(int var0, int var1) { - long var2 = (long)((var0 << 16) + var1); // L: 253 - return class279.NetCache_currentResponse != null && class279.NetCache_currentResponse.key == var2 ? class149.NetCache_responseArchiveBuffer.offset * 99 / (class149.NetCache_responseArchiveBuffer.array.length - class279.NetCache_currentResponse.padding) + 1 : 0; // L: 254 255 + long var2 = (long)((var0 << 16) + var1); + return class279.NetCache_currentResponse != null && class279.NetCache_currentResponse.key == var2 ? class149.NetCache_responseArchiveBuffer.offset * 99 / (class149.NetCache_responseArchiveBuffer.array.length - class279.NetCache_currentResponse.padding) + 1 : 0; } } diff --git a/runescape-client/src/main/java/ItemComposition.java b/runescape-client/src/main/java/ItemComposition.java index 49d366fcfd..0bc804be3e 100644 --- a/runescape-client/src/main/java/ItemComposition.java +++ b/runescape-client/src/main/java/ItemComposition.java @@ -302,51 +302,51 @@ public class ItemComposition extends DualNode { public int placeholderTemplate; static { - ItemDefinition_cached = new EvictingDualNodeHashTable(64); // L: 28 - ItemDefinition_cachedModels = new EvictingDualNodeHashTable(50); // L: 29 - ItemDefinition_cachedSprites = new EvictingDualNodeHashTable(200); // L: 30 + ItemDefinition_cached = new EvictingDualNodeHashTable(64); + ItemDefinition_cachedModels = new EvictingDualNodeHashTable(50); + ItemDefinition_cachedSprites = new EvictingDualNodeHashTable(200); } ItemComposition() { - this.name = "null"; // L: 34 - this.zoom2d = 2000; // L: 39 - this.xan2d = 0; // L: 40 - this.yan2d = 0; // L: 41 - this.zan2d = 0; // L: 42 - this.offsetX2d = 0; // L: 43 - this.offsetY2d = 0; // L: 44 - this.isStackable = 0; // L: 45 - this.price = 1; // L: 46 - this.isMembersOnly = false; // L: 47 - this.groundActions = new String[]{null, null, "Take", null, null}; // L: 48 - this.inventoryActions = new String[]{null, null, null, null, "Drop"}; // L: 49 - this.shiftClickIndex = -2; // L: 51 - this.maleModel = -1; // L: 52 - this.maleModel1 = -1; // L: 53 - this.maleOffset = 0; // L: 54 - this.femaleModel = -1; // L: 55 - this.femaleModel1 = -1; // L: 56 - this.femaleOffset = 0; // L: 57 - this.maleModel2 = -1; // L: 58 - this.femaleModel2 = -1; // L: 59 - this.maleHeadModel = -1; // L: 60 - this.maleHeadModel2 = -1; // L: 61 - this.femaleHeadModel = -1; // L: 62 - this.femaleHeadModel2 = -1; // L: 63 - this.note = -1; // L: 66 - this.noteTemplate = -1; // L: 67 - this.resizeX = 128; // L: 68 - this.resizeY = 128; // L: 69 - this.resizeZ = 128; // L: 70 - this.ambient = 0; // L: 71 - this.contrast = 0; // L: 72 - this.team = 0; // L: 73 - this.isTradable = false; // L: 75 - this.unnotedId = -1; // L: 76 - this.notedId = -1; // L: 77 - this.placeholder = -1; // L: 78 - this.placeholderTemplate = -1; // L: 79 - } // L: 81 + this.name = "null"; + this.zoom2d = 2000; + this.xan2d = 0; + this.yan2d = 0; + this.zan2d = 0; + this.offsetX2d = 0; + this.offsetY2d = 0; + this.isStackable = 0; + this.price = 1; + this.isMembersOnly = false; + this.groundActions = new String[]{null, null, "Take", null, null}; + this.inventoryActions = new String[]{null, null, null, null, "Drop"}; + this.shiftClickIndex = -2; + this.maleModel = -1; + this.maleModel1 = -1; + this.maleOffset = 0; + this.femaleModel = -1; + this.femaleModel1 = -1; + this.femaleOffset = 0; + this.maleModel2 = -1; + this.femaleModel2 = -1; + this.maleHeadModel = -1; + this.maleHeadModel2 = -1; + this.femaleHeadModel = -1; + this.femaleHeadModel2 = -1; + this.note = -1; + this.noteTemplate = -1; + this.resizeX = 128; + this.resizeY = 128; + this.resizeZ = 128; + this.ambient = 0; + this.contrast = 0; + this.team = 0; + this.isTradable = false; + this.unnotedId = -1; + this.notedId = -1; + this.placeholder = -1; + this.placeholderTemplate = -1; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -355,7 +355,7 @@ public class ItemComposition extends DualNode { ) @Export("post") void post() { - } // L: 121 + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -365,12 +365,12 @@ public class ItemComposition extends DualNode { @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 125 - if (var2 == 0) { // L: 126 - return; // L: 129 + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; } - this.decodeNext(var1, var2); // L: 127 + this.decodeNext(var1, var2); } } @@ -381,130 +381,130 @@ public class ItemComposition extends DualNode { ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 132 + if (var2 == 1) { this.model = var1.readUnsignedShort(); - } else if (var2 == 2) { // L: 133 + } else if (var2 == 2) { this.name = var1.readStringCp1252NullTerminated(); - } else if (var2 == 4) { // L: 134 + } else if (var2 == 4) { this.zoom2d = var1.readUnsignedShort(); - } else if (var2 == 5) { // L: 135 + } else if (var2 == 5) { this.xan2d = var1.readUnsignedShort(); - } else if (var2 == 6) { // L: 136 + } else if (var2 == 6) { this.yan2d = var1.readUnsignedShort(); - } else if (var2 == 7) { // L: 137 - this.offsetX2d = var1.readUnsignedShort(); // L: 138 - if (this.offsetX2d > 32767) { // L: 139 + } else if (var2 == 7) { + this.offsetX2d = var1.readUnsignedShort(); + if (this.offsetX2d > 32767) { this.offsetX2d -= 65536; } - } else if (var2 == 8) { // L: 141 - this.offsetY2d = var1.readUnsignedShort(); // L: 142 - if (this.offsetY2d > 32767) { // L: 143 + } else if (var2 == 8) { + this.offsetY2d = var1.readUnsignedShort(); + if (this.offsetY2d > 32767) { this.offsetY2d -= 65536; } - } else if (var2 == 9) { // L: 145 - var1.readStringCp1252NullTerminated(); // L: 146 - } else if (var2 == 11) { // L: 148 + } else if (var2 == 9) { + var1.readStringCp1252NullTerminated(); + } else if (var2 == 11) { this.isStackable = 1; - } else if (var2 == 12) { // L: 149 + } else if (var2 == 12) { this.price = var1.readInt(); - } else if (var2 == 16) { // L: 150 + } else if (var2 == 16) { 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 + } else if (var2 == 23) { + this.maleModel = var1.readUnsignedShort(); + this.maleOffset = var1.readUnsignedByte(); + } else if (var2 == 24) { 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 + } else if (var2 == 25) { + this.femaleModel = var1.readUnsignedShort(); + this.femaleOffset = var1.readUnsignedByte(); + } else if (var2 == 26) { 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 + } else if (var2 >= 30 && var2 < 35) { + this.groundActions[var2 - 30] = var1.readStringCp1252NullTerminated(); + if (this.groundActions[var2 - 30].equalsIgnoreCase("Hidden")) { this.groundActions[var2 - 30] = null; } - } else if (var2 >= 35 && var2 < 40) { // L: 165 + } else if (var2 >= 35 && var2 < 40) { 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 + if (var2 == 40) { + var3 = var1.readUnsignedByte(); + this.recolorFrom = new short[var3]; + this.recolorTo = new short[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 170 - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 171 - this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 172 + for (var4 = 0; var4 < var3; ++var4) { + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); + this.recolorTo[var4] = (short)var1.readUnsignedShort(); } - } 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 + } else if (var2 == 41) { + var3 = var1.readUnsignedByte(); + this.retextureFrom = new short[var3]; + this.retextureTo = new short[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 179 - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 180 - this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 181 + for (var4 = 0; var4 < var3; ++var4) { + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); + this.retextureTo[var4] = (short)var1.readUnsignedShort(); } - } else if (var2 == 42) { // L: 184 - this.shiftClickIndex = var1.readByte(); // L: 185 - } else if (var2 == 65) { // L: 187 + } else if (var2 == 42) { + this.shiftClickIndex = var1.readByte(); + } else if (var2 == 65) { this.isTradable = true; - } else if (var2 == 78) { // L: 188 + } else if (var2 == 78) { this.maleModel2 = var1.readUnsignedShort(); - } else if (var2 == 79) { // L: 189 + } else if (var2 == 79) { this.femaleModel2 = var1.readUnsignedShort(); - } else if (var2 == 90) { // L: 190 + } else if (var2 == 90) { this.maleHeadModel = var1.readUnsignedShort(); - } else if (var2 == 91) { // L: 191 + } else if (var2 == 91) { this.femaleHeadModel = var1.readUnsignedShort(); - } else if (var2 == 92) { // L: 192 + } else if (var2 == 92) { this.maleHeadModel2 = var1.readUnsignedShort(); - } else if (var2 == 93) { // L: 193 + } else if (var2 == 93) { this.femaleHeadModel2 = var1.readUnsignedShort(); - } else if (var2 == 94) { // L: 194 - var1.readUnsignedShort(); // L: 195 + } else if (var2 == 94) { + var1.readUnsignedShort(); } else if (var2 == 95) { - this.zan2d = var1.readUnsignedShort(); // L: 197 - } else if (var2 == 97) { // L: 198 + this.zan2d = var1.readUnsignedShort(); + } else if (var2 == 97) { this.note = var1.readUnsignedShort(); - } else if (var2 == 98) { // L: 199 + } else if (var2 == 98) { 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 + } else if (var2 >= 100 && var2 < 110) { + if (this.countobj == null) { + this.countobj = new int[10]; + this.countco = new int[10]; } - this.countobj[var2 - 100] = var1.readUnsignedShort(); // L: 205 - this.countco[var2 - 100] = var1.readUnsignedShort(); // L: 206 - } else if (var2 == 110) { // L: 208 + this.countobj[var2 - 100] = var1.readUnsignedShort(); + this.countco[var2 - 100] = var1.readUnsignedShort(); + } else if (var2 == 110) { this.resizeX = var1.readUnsignedShort(); - } else if (var2 == 111) { // L: 209 + } else if (var2 == 111) { this.resizeY = var1.readUnsignedShort(); - } else if (var2 == 112) { // L: 210 + } else if (var2 == 112) { this.resizeZ = var1.readUnsignedShort(); - } else if (var2 == 113) { // L: 211 + } else if (var2 == 113) { this.ambient = var1.readByte(); - } else if (var2 == 114) { // L: 212 + } else if (var2 == 114) { this.contrast = var1.readByte() * 5; - } else if (var2 == 115) { // L: 213 + } else if (var2 == 115) { this.team = var1.readUnsignedByte(); - } else if (var2 == 139) { // L: 214 + } else if (var2 == 139) { this.unnotedId = var1.readUnsignedShort(); - } else if (var2 == 140) { // L: 215 + } else if (var2 == 140) { this.notedId = var1.readUnsignedShort(); - } else if (var2 == 148) { // L: 216 + } else if (var2 == 148) { this.placeholder = var1.readUnsignedShort(); - } else if (var2 == 149) { // L: 217 + } else if (var2 == 149) { this.placeholderTemplate = var1.readUnsignedShort(); - } else if (var2 == 249) { // L: 218 + } else if (var2 == 249) { this.params = Canvas.readStringIntParameters(var1, this.params); } } - } // L: 220 + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -513,22 +513,22 @@ public class ItemComposition extends DualNode { ) @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 + 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 = 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( @@ -537,42 +537,42 @@ public class ItemComposition extends DualNode { ) @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 + 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; + this.recolorTo = var2.recolorTo; + this.retextureFrom = var2.retextureFrom; + this.retextureTo = var2.retextureTo; + this.name = var2.name; + this.isMembersOnly = var2.isMembersOnly; + this.isStackable = var2.isStackable; + this.maleModel = var2.maleModel; + this.maleModel1 = var2.maleModel1; + this.maleModel2 = var2.maleModel2; + this.femaleModel = var2.femaleModel; + this.femaleModel1 = var2.femaleModel1; + this.femaleModel2 = var2.femaleModel2; + this.maleHeadModel = var2.maleHeadModel; + this.maleHeadModel2 = var2.maleHeadModel2; + this.femaleHeadModel = var2.femaleHeadModel; + this.femaleHeadModel2 = var2.femaleHeadModel2; + this.team = var2.team; + this.groundActions = var2.groundActions; + this.inventoryActions = new String[5]; + if (var2.inventoryActions != null) { 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 + this.inventoryActions[4] = "Discard"; + this.price = 0; + } @ObfuscatedName("j") @ObfuscatedSignature( @@ -581,23 +581,23 @@ public class ItemComposition extends DualNode { ) @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 + 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 = var1.recolorFrom; + this.recolorTo = var1.recolorTo; + this.retextureFrom = var1.retextureFrom; + this.retextureTo = var1.retextureTo; + this.isStackable = var1.isStackable; + this.name = var2.name; + this.price = 0; + this.isMembersOnly = false; + this.isTradable = false; + } @ObfuscatedName("w") @ObfuscatedSignature( @@ -607,41 +607,41 @@ public class ItemComposition extends DualNode { @Export("getModelData") public final ModelData getModelData(int var1) { int var3; - if (this.countobj != null && var1 > 1) { // L: 293 - int var2 = -1; // L: 294 + if (this.countobj != null && var1 > 1) { + int var2 = -1; - for (var3 = 0; var3 < 10; ++var3) { // L: 295 - if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 296 + for (var3 = 0; var3 < 10; ++var3) { + if (var1 >= this.countco[var3] && this.countco[var3] != 0) { var2 = this.countobj[var3]; } } - if (var2 != -1) { // L: 298 + if (var2 != -1) { return UserComparator6.ItemDefinition_get(var2).getModelData(1); } } - ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); // L: 300 - if (var4 == null) { // L: 301 + ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); + if (var4 == null) { return null; } else { - if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 302 + if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { 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.recolorFrom != null) { + for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { + var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); } } - 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 + if (this.retextureFrom != null) { + for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { + var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); } } - return var4; // L: 313 + return var4; } } @@ -653,7 +653,7 @@ public class ItemComposition extends DualNode { @Export("getModel") public final Model getModel(int var1) { if (this.countobj != null && var1 > 1) { - int var2 = -1; // L: 318 + int var2 = -1; for (int var3 = 0; var3 < 10; ++var3) { if (var1 >= this.countco[var3] && this.countco[var3] != 0) { @@ -674,27 +674,27 @@ public class ItemComposition extends DualNode { if (var6 == null) { return null; } else { - if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 328 + if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { var6.resize(this.resizeX, this.resizeY, this.resizeZ); } int var4; - if (this.recolorFrom != null) { // L: 329 + if (this.recolorFrom != null) { for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { - var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 331 + var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); } } if (this.retextureFrom != null) { - for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 335 + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); } } - var5 = var6.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 339 - var5.isSingleTile = true; // L: 340 + var5 = var6.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); + var5.isSingleTile = true; ItemDefinition_cachedModels.put(var5, (long)this.id); - return var5; // L: 342 + return var5; } } } @@ -706,8 +706,8 @@ public class ItemComposition extends DualNode { ) @Export("getCountObj") public ItemComposition getCountObj(int var1) { - if (this.countobj != null && var1 > 1) { // L: 346 - int var2 = -1; // L: 347 + if (this.countobj != null && var1 > 1) { + int var2 = -1; for (int var3 = 0; var3 < 10; ++var3) { if (var1 >= this.countco[var3] && this.countco[var3] != 0) { @@ -715,12 +715,12 @@ public class ItemComposition extends DualNode { } } - if (var2 != -1) { // L: 351 + if (var2 != -1) { return UserComparator6.ItemDefinition_get(var2); } } - return this; // L: 353 + return this; } @ObfuscatedName("v") @@ -730,32 +730,32 @@ public class ItemComposition extends DualNode { ) @Export("hasNoValidModel") public final boolean hasNoValidModel(boolean var1) { - int var2 = this.maleModel; // L: 438 - int var3 = this.maleModel1; // L: 439 - int var4 = this.maleModel2; // L: 440 - if (var1) { // L: 441 - var2 = this.femaleModel; // L: 442 - var3 = this.femaleModel1; // L: 443 - var4 = this.femaleModel2; // L: 444 + int var2 = this.maleModel; + int var3 = this.maleModel1; + int var4 = this.maleModel2; + if (var1) { + var2 = this.femaleModel; + var3 = this.femaleModel1; + var4 = this.femaleModel2; } - if (var2 == -1) { // L: 446 + if (var2 == -1) { return true; } else { - boolean var5 = true; // L: 447 - if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 448 + boolean var5 = true; + if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { var5 = false; } - if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 449 + if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { var5 = false; } - if (var4 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { // L: 450 + if (var4 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { var5 = false; } - return var5; // L: 451 + return var5; } } @@ -765,53 +765,53 @@ public class ItemComposition extends DualNode { garbageValue = "2096791202" ) public final ModelData method3554(boolean var1) { - int var2 = this.maleModel; // L: 455 - int var3 = this.maleModel1; // L: 456 - int var4 = this.maleModel2; // L: 457 - if (var1) { // L: 458 - var2 = this.femaleModel; // L: 459 - var3 = this.femaleModel1; // L: 460 - var4 = this.femaleModel2; // L: 461 + int var2 = this.maleModel; + int var3 = this.maleModel1; + int var4 = this.maleModel2; + if (var1) { + var2 = this.femaleModel; + var3 = this.femaleModel1; + var4 = this.femaleModel2; } - if (var2 == -1) { // L: 463 + if (var2 == -1) { return null; } else { - ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); // L: 464 - if (var3 != -1) { // L: 465 - ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); // L: 466 - if (var4 != -1) { // L: 467 - ModelData var7 = ModelData.ModelData_get(ItemDefinition_modelArchive, var4, 0); // L: 468 - ModelData[] var8 = new ModelData[]{var5, var6, var7}; // L: 469 - var5 = new ModelData(var8, 3); // L: 470 + ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); + if (var3 != -1) { + ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); + if (var4 != -1) { + ModelData var7 = ModelData.ModelData_get(ItemDefinition_modelArchive, var4, 0); + ModelData[] var8 = new ModelData[]{var5, var6, var7}; + var5 = new ModelData(var8, 3); } else { - ModelData[] var10 = new ModelData[]{var5, var6}; // L: 473 - var5 = new ModelData(var10, 2); // L: 474 + ModelData[] var10 = new ModelData[]{var5, var6}; + var5 = new ModelData(var10, 2); } } - if (!var1 && this.maleOffset != 0) { // L: 477 + if (!var1 && this.maleOffset != 0) { var5.changeOffset(0, this.maleOffset, 0); } - if (var1 && this.femaleOffset != 0) { // L: 478 + if (var1 && this.femaleOffset != 0) { var5.changeOffset(0, this.femaleOffset, 0); } int var9; - if (this.recolorFrom != null) { // L: 479 - for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { // L: 480 - var5.recolor(this.recolorFrom[var9], this.recolorTo[var9]); // L: 481 + if (this.recolorFrom != null) { + for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { + var5.recolor(this.recolorFrom[var9], this.recolorTo[var9]); } } - if (this.retextureFrom != null) { // L: 484 - for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { // L: 485 - var5.retexture(this.retextureFrom[var9], this.retextureTo[var9]); // L: 486 + if (this.retextureFrom != null) { + for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { + var5.retexture(this.retextureFrom[var9], this.retextureTo[var9]); } } - return var5; // L: 489 + return var5; } } @@ -821,26 +821,26 @@ public class ItemComposition extends DualNode { garbageValue = "-2121620855" ) public final boolean method3555(boolean var1) { - int var2 = this.maleHeadModel; // L: 493 - int var3 = this.maleHeadModel2; // L: 494 - if (var1) { // L: 495 - var2 = this.femaleHeadModel; // L: 496 - var3 = this.femaleHeadModel2; // L: 497 + int var2 = this.maleHeadModel; + int var3 = this.maleHeadModel2; + if (var1) { + var2 = this.femaleHeadModel; + var3 = this.femaleHeadModel2; } - if (var2 == -1) { // L: 499 + if (var2 == -1) { return true; } else { - boolean var4 = true; // L: 500 - if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 501 + boolean var4 = true; + if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { var4 = false; } - if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 502 + if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { var4 = false; } - return var4; // L: 503 + return var4; } } @@ -850,37 +850,37 @@ public class ItemComposition extends DualNode { garbageValue = "1383399718" ) public final ModelData method3601(boolean var1) { - int var2 = this.maleHeadModel; // L: 507 - int var3 = this.maleHeadModel2; // L: 508 - if (var1) { // L: 509 - var2 = this.femaleHeadModel; // L: 510 - var3 = this.femaleHeadModel2; // L: 511 + int var2 = this.maleHeadModel; + int var3 = this.maleHeadModel2; + if (var1) { + var2 = this.femaleHeadModel; + var3 = this.femaleHeadModel2; } - if (var2 == -1) { // L: 513 + if (var2 == -1) { return null; } else { - ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); // L: 514 - if (var3 != -1) { // L: 515 - ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); // L: 516 - ModelData[] var6 = new ModelData[]{var4, var5}; // L: 517 - var4 = new ModelData(var6, 2); // L: 518 + ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); + if (var3 != -1) { + ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); + ModelData[] var6 = new ModelData[]{var4, var5}; + var4 = new ModelData(var6, 2); } int var7; - if (this.recolorFrom != null) { // L: 520 - for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { // L: 521 - var4.recolor(this.recolorFrom[var7], this.recolorTo[var7]); // L: 522 + if (this.recolorFrom != null) { + for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { + var4.recolor(this.recolorFrom[var7], this.recolorTo[var7]); } } - if (this.retextureFrom != null) { // L: 525 - for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { // L: 526 - var4.retexture(this.retextureFrom[var7], this.retextureTo[var7]); // L: 527 + if (this.retextureFrom != null) { + for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { + var4.retexture(this.retextureFrom[var7], this.retextureTo[var7]); } } - return var4; // L: 530 + return var4; } } @@ -891,7 +891,7 @@ public class ItemComposition extends DualNode { ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return class12.method158(this.params, var1, var2); // L: 534 + return class12.method158(this.params, var1, var2); } @ObfuscatedName("a") @@ -901,7 +901,7 @@ public class ItemComposition extends DualNode { ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return Skeleton.method3948(this.params, var1, var2); // L: 538 + return Skeleton.method3948(this.params, var1, var2); } @ObfuscatedName("u") @@ -911,11 +911,11 @@ public class ItemComposition extends DualNode { ) @Export("getShiftClickIndex") public int getShiftClickIndex() { - if (this.shiftClickIndex != -1 && this.inventoryActions != null) { // L: 542 - if (this.shiftClickIndex >= 0) { // L: 543 + if (this.shiftClickIndex != -1 && this.inventoryActions != null) { + if (this.shiftClickIndex >= 0) { return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * 585263195 * 2111080403 : -1; } else { - return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; // L: 544 + return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; } } else { return -1; @@ -928,7 +928,7 @@ public class ItemComposition extends DualNode { garbageValue = "-1174152873" ) boolean method3560() { - return this.recolorTo != null; // L: 563 + return this.recolorTo != null; } @ObfuscatedName("q") @@ -937,7 +937,7 @@ public class ItemComposition extends DualNode { garbageValue = "-16" ) boolean method3572() { - return this.retextureTo != null; // L: 567 + return this.retextureTo != null; } @ObfuscatedName("p") @@ -947,8 +947,8 @@ public class ItemComposition extends DualNode { ) @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 + ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); + return var2.getMessage(var1); } @ObfuscatedName("d") @@ -958,44 +958,44 @@ public class ItemComposition extends DualNode { ) @Export("getFrames") static Frames getFrames(int var0) { - Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); // L: 316 - if (var1 != null) { // L: 317 + Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); + if (var1 != null) { return var1; } else { - AbstractArchive var3 = SequenceDefinition.SequenceDefinition_animationsArchive; // L: 319 - AbstractArchive var4 = class118.SequenceDefinition_skeletonsArchive; // L: 320 - boolean var5 = true; // L: 322 - int[] var6 = var3.getGroupFileIds(var0); // L: 323 + AbstractArchive var3 = SequenceDefinition.SequenceDefinition_animationsArchive; + AbstractArchive var4 = class118.SequenceDefinition_skeletonsArchive; + boolean var5 = true; + int[] var6 = var3.getGroupFileIds(var0); - 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 + for (int var7 = 0; var7 < var6.length; ++var7) { + byte[] var8 = var3.getFile(var0, var6[var7]); + if (var8 == null) { + var5 = false; } else { - int var9 = (var8[0] & 255) << 8 | var8[1] & 255; // L: 330 - byte[] var10 = var4.getFile(var9, 0); // L: 333 - if (var10 == null) { // L: 334 + int var9 = (var8[0] & 255) << 8 | var8[1] & 255; + byte[] var10 = var4.getFile(var9, 0); + if (var10 == null) { var5 = false; } } } Frames var2; - if (!var5) { // L: 336 - var2 = null; // L: 337 + if (!var5) { + var2 = null; } else { try { - var2 = new Frames(var3, var4, var0, false); // L: 341 - } catch (Exception var12) { // L: 343 - var2 = null; // L: 344 + var2 = new Frames(var3, var4, var0, false); + } catch (Exception var12) { + var2 = null; } } - if (var2 != null) { // L: 348 + if (var2 != null) { SequenceDefinition.SequenceDefinition_cachedFrames.put(var2, (long)var0); } - return var2; // L: 349 + return var2; } } } diff --git a/runescape-client/src/main/java/ItemContainer.java b/runescape-client/src/main/java/ItemContainer.java index c9610d0a28..1aeef3a4ab 100644 --- a/runescape-client/src/main/java/ItemContainer.java +++ b/runescape-client/src/main/java/ItemContainer.java @@ -26,11 +26,11 @@ public class ItemContainer extends Node { int[] quantities; static { - itemContainers = new NodeHashTable(32); // L: 7 + itemContainers = new NodeHashTable(32); } ItemContainer() { - this.ids = new int[]{-1}; // L: 8 - this.quantities = new int[]{0}; // L: 9 - } // L: 11 + this.ids = new int[]{-1}; + this.quantities = new int[]{0}; + } } diff --git a/runescape-client/src/main/java/ItemLayer.java b/runescape-client/src/main/java/ItemLayer.java index 7eeb29cc62..4da2e6a742 100644 --- a/runescape-client/src/main/java/ItemLayer.java +++ b/runescape-client/src/main/java/ItemLayer.java @@ -57,7 +57,7 @@ public final class ItemLayer { int height; ItemLayer() { - } // L: 13 + } @ObfuscatedName("gu") @ObfuscatedSignature( @@ -69,167 +69,167 @@ public final class ItemLayer { int var3; int var4; int var11; - if (var0.field1136 >= Client.cycle) { // L: 4624 - var11 = Math.max(1, var0.field1136 - Client.cycle); // L: 4625 - var3 = var0.field1120 * 64 + var0.field1132 * 128; // L: 4626 - var4 = var0.field1120 * 64 + var0.field1134 * 128; // L: 4627 - var0.x += (var3 - var0.x) / var11; // L: 4628 - var0.y += (var4 - var0.y) / var11; // L: 4629 - var0.field1117 = 0; // L: 4630 - var0.orientation = var0.field1138; // L: 4631 - } else if (var0.field1157 >= Client.cycle) { // L: 4633 + if (var0.field1136 >= Client.cycle) { + var11 = Math.max(1, var0.field1136 - Client.cycle); + var3 = var0.field1120 * 64 + var0.field1132 * 128; + var4 = var0.field1120 * 64 + var0.field1134 * 128; + var0.x += (var3 - var0.x) / var11; + var0.y += (var4 - var0.y) / var11; + var0.field1117 = 0; + var0.orientation = var0.field1138; + } else if (var0.field1157 >= Client.cycle) { class18.method293(var0); } else { - var0.movementSequence = var0.idleSequence; // L: 4635 - if (var0.pathLength == 0) { // L: 4636 - var0.field1117 = 0; // L: 4637 + var0.movementSequence = var0.idleSequence; + if (var0.pathLength == 0) { + var0.field1117 = 0; } else { label410: { - if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 4640 - SequenceDefinition var2 = UserComparator5.SequenceDefinition_get(var0.sequence); // L: 4641 - if (var0.field1098 > 0 && var2.field2096 == 0) { // L: 4642 - ++var0.field1117; // L: 4643 - break label410; // L: 4644 + if (var0.sequence != -1 && var0.sequenceDelay == 0) { + SequenceDefinition var2 = UserComparator5.SequenceDefinition_get(var0.sequence); + if (var0.field1098 > 0 && var2.field2096 == 0) { + ++var0.field1117; + break label410; } - if (var0.field1098 <= 0 && var2.field2097 == 0) { // L: 4646 - ++var0.field1117; // L: 4647 - break label410; // L: 4648 + if (var0.field1098 <= 0 && var2.field2097 == 0) { + ++var0.field1117; + break label410; } } - var11 = var0.x; // L: 4651 - var3 = var0.y; // L: 4652 - var4 = var0.field1120 * 64 + var0.pathX[var0.pathLength - 1] * 128; // L: 4653 - int var5 = var0.field1120 * 64 + var0.pathY[var0.pathLength - 1] * 128; // L: 4654 - if (var11 < var4) { // L: 4655 - if (var3 < var5) { // L: 4656 + var11 = var0.x; + var3 = var0.y; + var4 = var0.field1120 * 64 + var0.pathX[var0.pathLength - 1] * 128; + int var5 = var0.field1120 * 64 + var0.pathY[var0.pathLength - 1] * 128; + if (var11 < var4) { + if (var3 < var5) { var0.orientation = 1280; - } else if (var3 > var5) { // L: 4657 + } else if (var3 > var5) { var0.orientation = 1792; } else { - var0.orientation = 1536; // L: 4658 + var0.orientation = 1536; } - } else if (var11 > var4) { // L: 4660 - if (var3 < var5) { // L: 4661 + } else if (var11 > var4) { + if (var3 < var5) { var0.orientation = 768; - } else if (var3 > var5) { // L: 4662 + } else if (var3 > var5) { var0.orientation = 256; } else { - var0.orientation = 512; // L: 4663 + var0.orientation = 512; } - } else if (var3 < var5) { // L: 4665 + } else if (var3 < var5) { var0.orientation = 1024; - } else if (var3 > var5) { // L: 4666 + } else if (var3 > var5) { var0.orientation = 0; } - class185 var6 = var0.field1153[var0.pathLength - 1]; // L: 4667 - if (var4 - var11 <= 256 && var4 - var11 >= -256 && var5 - var3 <= 256 && var5 - var3 >= -256) { // L: 4668 - int var7 = var0.orientation - var0.rotation & 2047; // L: 4675 - if (var7 > 1024) { // L: 4676 + class185 var6 = var0.field1153[var0.pathLength - 1]; + if (var4 - var11 <= 256 && var4 - var11 >= -256 && var5 - var3 <= 256 && var5 - var3 >= -256) { + int var7 = var0.orientation - var0.rotation & 2047; + if (var7 > 1024) { var7 -= 2048; } - int var8 = var0.walkBackSequence; // L: 4677 - if (var7 >= -256 && var7 <= 256) { // L: 4678 + int var8 = var0.walkBackSequence; + if (var7 >= -256 && var7 <= 256) { var8 = var0.walkSequence; - } else if (var7 >= 256 && var7 < 768) { // L: 4679 + } else if (var7 >= 256 && var7 < 768) { var8 = var0.walkRightSequence; - } else if (var7 >= -768 && var7 <= -256) { // L: 4680 + } else if (var7 >= -768 && var7 <= -256) { var8 = var0.walkLeftSequence; } - if (var8 == -1) { // L: 4681 + if (var8 == -1) { var8 = var0.walkSequence; } - var0.movementSequence = var8; // L: 4682 - int var9 = 4; // L: 4683 - boolean var10 = true; // L: 4684 - if (var0 instanceof NPC) { // L: 4685 + var0.movementSequence = var8; + int var9 = 4; + boolean var10 = true; + if (var0 instanceof NPC) { var10 = ((NPC)var0).definition.isClickable; } - if (var10) { // L: 4686 - if (var0.orientation != var0.rotation && var0.targetIndex == -1 && var0.field1149 != 0) { // L: 4687 + if (var10) { + if (var0.orientation != var0.rotation && var0.targetIndex == -1 && var0.field1149 != 0) { var9 = 2; } - if (var0.pathLength > 2) { // L: 4688 + if (var0.pathLength > 2) { var9 = 6; } - if (var0.pathLength > 3) { // L: 4689 + if (var0.pathLength > 3) { var9 = 8; } - if (var0.field1117 > 0 && var0.pathLength > 1) { // L: 4690 - var9 = 8; // L: 4691 - --var0.field1117; // L: 4692 + if (var0.field1117 > 0 && var0.pathLength > 1) { + var9 = 8; + --var0.field1117; } } else { - if (var0.pathLength > 1) { // L: 4696 + if (var0.pathLength > 1) { var9 = 6; } - if (var0.pathLength > 2) { // L: 4697 + if (var0.pathLength > 2) { var9 = 8; } - if (var0.field1117 > 0 && var0.pathLength > 1) { // L: 4698 - var9 = 8; // L: 4699 - --var0.field1117; // L: 4700 + if (var0.field1117 > 0 && var0.pathLength > 1) { + var9 = 8; + --var0.field1117; } } - if (var6 == class185.field2122) { // L: 4703 + if (var6 == class185.field2122) { var9 <<= 1; - } else if (var6 == class185.field2120) { // L: 4704 + } else if (var6 == class185.field2120) { var9 >>= 1; } - if (var9 >= 8 && var0.walkSequence == var0.movementSequence && var0.runSequence != -1) { // L: 4705 + if (var9 >= 8 && var0.walkSequence == var0.movementSequence && var0.runSequence != -1) { var0.movementSequence = var0.runSequence; } - if (var11 != var4 || var3 != var5) { // L: 4706 - if (var11 < var4) { // L: 4707 - var0.x += var9; // L: 4708 - if (var0.x > var4) { // L: 4709 + if (var11 != var4 || var3 != var5) { + if (var11 < var4) { + var0.x += var9; + if (var0.x > var4) { var0.x = var4; } - } else if (var11 > var4) { // L: 4711 - var0.x -= var9; // L: 4712 - if (var0.x < var4) { // L: 4713 + } else if (var11 > var4) { + var0.x -= var9; + if (var0.x < var4) { var0.x = var4; } } - if (var3 < var5) { // L: 4715 - var0.y += var9; // L: 4716 - if (var0.y > var5) { // L: 4717 + if (var3 < var5) { + var0.y += var9; + if (var0.y > var5) { var0.y = var5; } - } else if (var3 > var5) { // L: 4719 - var0.y -= var9; // L: 4720 - if (var0.y < var5) { // L: 4721 + } else if (var3 > var5) { + var0.y -= var9; + if (var0.y < var5) { var0.y = var5; } } } - if (var4 == var0.x && var5 == var0.y) { // L: 4724 - --var0.pathLength; // L: 4725 - if (var0.field1098 > 0) { // L: 4726 + if (var4 == var0.x && var5 == var0.y) { + --var0.pathLength; + if (var0.field1098 > 0) { --var0.field1098; } } } else { - var0.x = var4; // L: 4669 - var0.y = var5; // L: 4670 - --var0.pathLength; // L: 4671 - if (var0.field1098 > 0) { // L: 4672 + var0.x = var4; + var0.y = var5; + --var0.pathLength; + if (var0.field1098 > 0) { --var0.field1098; } } @@ -237,100 +237,100 @@ public final class ItemLayer { } } - if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { // L: 4729 - var0.sequence = -1; // L: 4730 - var0.spotAnimation = -1; // L: 4731 - var0.field1136 = 0; // L: 4732 - var0.field1157 = 0; // L: 4733 - var0.x = var0.field1120 * 64 + var0.pathX[0] * 128; // L: 4734 - var0.y = var0.pathY[0] * 128 + var0.field1120 * 64; // L: 4735 - var0.method2228(); // L: 4736 + if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { + var0.sequence = -1; + var0.spotAnimation = -1; + var0.field1136 = 0; + var0.field1157 = 0; + var0.x = var0.field1120 * 64 + var0.pathX[0] * 128; + var0.y = var0.pathY[0] * 128 + var0.field1120 * 64; + var0.method2228(); } - if (class340.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { // L: 4738 4739 - var0.sequence = -1; // L: 4740 - var0.spotAnimation = -1; // L: 4741 - var0.field1136 = 0; // L: 4742 - var0.field1157 = 0; // L: 4743 - var0.x = var0.field1120 * 64 + var0.pathX[0] * 128; // L: 4744 - var0.y = var0.pathY[0] * 128 + var0.field1120 * 64; // L: 4745 - var0.method2228(); // L: 4746 + if (class340.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { + var0.sequence = -1; + var0.spotAnimation = -1; + var0.field1136 = 0; + var0.field1157 = 0; + var0.x = var0.field1120 * 64 + var0.pathX[0] * 128; + var0.y = var0.pathY[0] * 128 + var0.field1120 * 64; + var0.method2228(); } - if (var0.field1149 != 0) { // L: 4750 - if (var0.targetIndex != -1) { // L: 4751 - Object var13 = null; // L: 4752 - if (var0.targetIndex < 32768) { // L: 4753 + if (var0.field1149 != 0) { + if (var0.targetIndex != -1) { + Object var13 = null; + if (var0.targetIndex < 32768) { var13 = Client.npcs[var0.targetIndex]; - } else if (var0.targetIndex >= 32768) { // L: 4754 + } else if (var0.targetIndex >= 32768) { var13 = Client.players[var0.targetIndex - 32768]; } - if (var13 != null) { // L: 4755 - var3 = var0.x - ((Actor)var13).x; // L: 4756 - var4 = var0.y - ((Actor)var13).y; // L: 4757 - if (var3 != 0 || var4 != 0) { // L: 4758 + if (var13 != null) { + var3 = var0.x - ((Actor)var13).x; + var4 = var0.y - ((Actor)var13).y; + if (var3 != 0 || var4 != 0) { var0.orientation = (int)(Math.atan2((double)var3, (double)var4) * 325.949D) & 2047; } - } else if (var0.false0) { // L: 4760 - var0.targetIndex = -1; // L: 4761 - var0.false0 = false; // L: 4762 + } else if (var0.false0) { + var0.targetIndex = -1; + var0.false0 = false; } } - if (var0.field1122 != -1 && (var0.pathLength == 0 || var0.field1117 > 0)) { // L: 4765 - var0.orientation = var0.field1122; // L: 4766 - var0.field1122 = -1; // L: 4767 + if (var0.field1122 != -1 && (var0.pathLength == 0 || var0.field1117 > 0)) { + var0.orientation = var0.field1122; + var0.field1122 = -1; } - var11 = var0.orientation - var0.rotation & 2047; // L: 4769 - if (var11 == 0 && var0.false0) { // L: 4770 - var0.targetIndex = -1; // L: 4771 - var0.false0 = false; // L: 4772 + var11 = var0.orientation - var0.rotation & 2047; + if (var11 == 0 && var0.false0) { + var0.targetIndex = -1; + var0.false0 = false; } - if (var11 != 0) { // L: 4774 - ++var0.field1148; // L: 4775 + if (var11 != 0) { + ++var0.field1148; boolean var14; - if (var11 > 1024) { // L: 4776 - var0.rotation -= var0.field1118 ? var11 : var0.field1149 * -771997279 * 1637605985; // L: 4777 - var14 = true; // L: 4778 - if (var11 < var0.field1149 || var11 > 2048 - var0.field1149) { // L: 4779 - var0.rotation = var0.orientation; // L: 4780 - var14 = false; // L: 4781 + if (var11 > 1024) { + var0.rotation -= var0.field1118 ? var11 : var0.field1149 * -771997279 * 1637605985; + var14 = true; + if (var11 < var0.field1149 || var11 > 2048 - var0.field1149) { + var0.rotation = var0.orientation; + var14 = false; } - if (!var0.field1118 && var0.idleSequence == var0.movementSequence && (var0.field1148 > 25 || var14)) { // L: 4783 - if (var0.turnLeftSequence != -1) { // L: 4784 + if (!var0.field1118 && var0.idleSequence == var0.movementSequence && (var0.field1148 > 25 || var14)) { + if (var0.turnLeftSequence != -1) { var0.movementSequence = var0.turnLeftSequence; } else { - var0.movementSequence = var0.walkSequence; // L: 4785 + var0.movementSequence = var0.walkSequence; } } } else { - var0.rotation += var0.field1118 ? var11 : -771997279 * var0.field1149 * 1637605985; // L: 4789 - var14 = true; // L: 4790 - if (var11 < var0.field1149 || var11 > 2048 - var0.field1149) { // L: 4791 - var0.rotation = var0.orientation; // L: 4792 - var14 = false; // L: 4793 + var0.rotation += var0.field1118 ? var11 : -771997279 * var0.field1149 * 1637605985; + var14 = true; + if (var11 < var0.field1149 || var11 > 2048 - var0.field1149) { + var0.rotation = var0.orientation; + var14 = false; } - if (!var0.field1118 && var0.movementSequence == var0.idleSequence && (var0.field1148 > 25 || var14)) { // L: 4795 - if (var0.turnRightSequence != -1) { // L: 4796 + if (!var0.field1118 && var0.movementSequence == var0.idleSequence && (var0.field1148 > 25 || var14)) { + if (var0.turnRightSequence != -1) { var0.movementSequence = var0.turnRightSequence; } else { - var0.movementSequence = var0.walkSequence; // L: 4797 + var0.movementSequence = var0.walkSequence; } } } - var0.rotation &= 2047; // L: 4801 - var0.field1118 = false; // L: 4802 + var0.rotation &= 2047; + var0.field1118 = false; } else { - var0.field1148 = 0; // L: 4804 + var0.field1148 = 0; } } - class363.method6612(var0); // L: 4806 - } // L: 4807 + class363.method6612(var0); + } } diff --git a/runescape-client/src/main/java/IterableDualNodeQueue.java b/runescape-client/src/main/java/IterableDualNodeQueue.java index 4ab0f6b0f5..fa7ecf1660 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueue.java +++ b/runescape-client/src/main/java/IterableDualNodeQueue.java @@ -21,19 +21,19 @@ public class IterableDualNodeQueue implements Iterable { DualNode head; public IterableDualNodeQueue() { - this.sentinel = new DualNode(); // L: 7 - this.sentinel.previousDual = this.sentinel; // L: 11 - this.sentinel.nextDual = this.sentinel; // L: 12 - } // L: 13 + this.sentinel = new DualNode(); + this.sentinel.previousDual = this.sentinel; + this.sentinel.nextDual = this.sentinel; + } @ObfuscatedName("c") @Export("clear") public void clear() { - while (this.sentinel.previousDual != this.sentinel) { // L: 16 - this.sentinel.previousDual.removeDual(); // L: 17 + while (this.sentinel.previousDual != this.sentinel) { + this.sentinel.previousDual.removeDual(); } - } // L: 19 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -41,15 +41,15 @@ public class IterableDualNodeQueue implements Iterable { ) @Export("add") public void add(DualNode var1) { - if (var1.nextDual != null) { // L: 22 + if (var1.nextDual != null) { var1.removeDual(); } - var1.nextDual = this.sentinel.nextDual; // L: 23 - var1.previousDual = this.sentinel; // L: 24 - var1.nextDual.previousDual = var1; // L: 25 - var1.previousDual.nextDual = var1; // L: 26 - } // L: 27 + var1.nextDual = this.sentinel.nextDual; + var1.previousDual = this.sentinel; + var1.nextDual.previousDual = var1; + var1.previousDual.nextDual = var1; + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -57,12 +57,12 @@ public class IterableDualNodeQueue implements Iterable { ) @Export("removeLast") public DualNode removeLast() { - DualNode var1 = this.sentinel.previousDual; // L: 39 + DualNode var1 = this.sentinel.previousDual; if (var1 == this.sentinel) { - return null; // L: 40 + return null; } else { - var1.removeDual(); // L: 41 - return var1; // L: 42 + var1.removeDual(); + return var1; } } @@ -72,7 +72,7 @@ public class IterableDualNodeQueue implements Iterable { ) @Export("last") public DualNode last() { - return this.previousOrLast((DualNode)null); // L: 46 + return this.previousOrLast((DualNode)null); } @ObfuscatedName("s") @@ -82,18 +82,18 @@ public class IterableDualNodeQueue implements Iterable { @Export("previousOrLast") DualNode previousOrLast(DualNode var1) { DualNode var2; - if (var1 == null) { // L: 52 + if (var1 == null) { var2 = this.sentinel.previousDual; } else { - var2 = var1; // L: 53 + var2 = var1; } - if (var2 == this.sentinel) { // L: 54 - this.head = null; // L: 55 - return null; // L: 56 + if (var2 == this.sentinel) { + this.head = null; + return null; } else { - this.head = var2.previousDual; // L: 58 - return var2; // L: 59 + this.head = var2.previousDual; + return var2; } } @@ -103,18 +103,18 @@ public class IterableDualNodeQueue implements Iterable { ) @Export("previous") public DualNode previous() { - DualNode var1 = this.head; // L: 64 - if (var1 == this.sentinel) { // L: 65 - this.head = null; // L: 66 - return null; // L: 67 + DualNode var1 = this.head; + if (var1 == this.sentinel) { + this.head = null; + return null; } else { - this.head = var1.previousDual; // L: 69 - return var1; // L: 70 + this.head = var1.previousDual; + return var1; } } public Iterator iterator() { - return new IterableDualNodeQueueIterator(this); // L: 74 + return new IterableDualNodeQueueIterator(this); } @ObfuscatedName("p") @@ -123,13 +123,13 @@ public class IterableDualNodeQueue implements Iterable { ) @Export("DualNodeDeque_addBefore") public static void DualNodeDeque_addBefore(DualNode var0, DualNode var1) { - if (var0.nextDual != null) { // L: 30 + if (var0.nextDual != null) { var0.removeDual(); } - var0.nextDual = var1; // L: 31 - var0.previousDual = var1.previousDual; // L: 32 - var0.nextDual.previousDual = var0; // L: 33 - var0.previousDual.nextDual = var0; // L: 34 - } // L: 35 + var0.nextDual = var1; + var0.previousDual = var1.previousDual; + var0.nextDual.previousDual = var0; + var0.previousDual.nextDual = var0; + } } diff --git a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java index 37e55413f6..5c94a8de2b 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java +++ b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java @@ -30,35 +30,35 @@ public class IterableDualNodeQueueIterator implements Iterator { descriptor = "(Lls;)V" ) IterableDualNodeQueueIterator(IterableDualNodeQueue var1) { - this.last = null; // L: 9 - this.queue = var1; // L: 12 - this.head = this.queue.sentinel.previousDual; // L: 13 - this.last = null; // L: 14 - } // L: 15 + this.last = null; + this.queue = var1; + this.head = this.queue.sentinel.previousDual; + this.last = null; + } public boolean hasNext() { - return this.queue.sentinel != this.head; // L: 30 + return this.queue.sentinel != this.head; } public void remove() { - if (this.last == null) { // L: 34 + if (this.last == null) { throw new IllegalStateException(); } else { - this.last.removeDual(); // L: 35 - this.last = null; // L: 36 + this.last.removeDual(); + this.last = null; } - } // L: 37 + } 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 + DualNode var1 = this.head; + if (var1 == this.queue.sentinel) { + var1 = null; + this.head = null; } else { - this.head = var1.previousDual; // L: 24 + this.head = var1.previousDual; } - this.last = var1; // L: 25 - return var1; // L: 26 + this.last = var1; + return var1; } } diff --git a/runescape-client/src/main/java/IterableNodeDeque.java b/runescape-client/src/main/java/IterableNodeDeque.java index 9806bc04de..b9e6c3ad18 100644 --- a/runescape-client/src/main/java/IterableNodeDeque.java +++ b/runescape-client/src/main/java/IterableNodeDeque.java @@ -21,19 +21,19 @@ public class IterableNodeDeque implements Iterable, Collection { Node field3967; public IterableNodeDeque() { - this.sentinel = new Node(); // L: 7 - this.sentinel.previous = this.sentinel; // L: 11 - this.sentinel.next = this.sentinel; // L: 12 - } // L: 13 + this.sentinel = new Node(); + this.sentinel.previous = this.sentinel; + this.sentinel.next = this.sentinel; + } @ObfuscatedName("c") @Export("rsClear") public void rsClear() { - while (this.sentinel.previous != this.sentinel) { // L: 16 - this.sentinel.previous.remove(); // L: 17 + while (this.sentinel.previous != this.sentinel) { + this.sentinel.previous.remove(); } - } // L: 19 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -41,15 +41,15 @@ public class IterableNodeDeque implements Iterable, Collection { ) @Export("addFirst") public void addFirst(Node var1) { - if (var1.next != null) { // L: 22 + if (var1.next != null) { var1.remove(); } - var1.next = this.sentinel.next; // L: 23 - var1.previous = this.sentinel; // L: 24 - var1.next.previous = var1; // L: 25 - var1.previous.next = var1; // L: 26 - } // L: 27 + var1.next = this.sentinel.next; + var1.previous = this.sentinel; + var1.next.previous = var1; + var1.previous.next = var1; + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -57,15 +57,15 @@ public class IterableNodeDeque implements Iterable, Collection { ) @Export("addLast") public void addLast(Node var1) { - if (var1.next != null) { // L: 30 + if (var1.next != null) { var1.remove(); } - var1.next = this.sentinel; // L: 31 - var1.previous = this.sentinel.previous; // L: 32 - var1.next.previous = var1; // L: 33 - var1.previous.next = var1; // L: 34 - } // L: 35 + var1.next = this.sentinel; + var1.previous = this.sentinel.previous; + var1.next.previous = var1; + var1.previous.next = var1; + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -73,7 +73,7 @@ public class IterableNodeDeque implements Iterable, Collection { ) @Export("last") public Node last() { - return this.method5912((Node)null); // L: 46 + return this.method5912((Node)null); } @ObfuscatedName("s") @@ -82,18 +82,18 @@ public class IterableNodeDeque implements Iterable, Collection { ) Node method5912(Node var1) { Node var2; - if (var1 == null) { // L: 52 + if (var1 == null) { var2 = this.sentinel.previous; } else { - var2 = var1; // L: 53 + var2 = var1; } - if (var2 == this.sentinel) { // L: 54 - this.field3967 = null; // L: 55 - return null; // L: 56 + if (var2 == this.sentinel) { + this.field3967 = null; + return null; } else { - this.field3967 = var2.previous; // L: 58 - return var2; // L: 59 + this.field3967 = var2.previous; + return var2; } } @@ -103,30 +103,30 @@ public class IterableNodeDeque implements Iterable, Collection { ) @Export("previous") public Node previous() { - Node var1 = this.field3967; // L: 64 - if (var1 == this.sentinel) { // L: 65 - this.field3967 = null; // L: 66 - return null; // L: 67 + Node var1 = this.field3967; + if (var1 == this.sentinel) { + this.field3967 = null; + return null; } else { - this.field3967 = var1.previous; // L: 69 - return var1; // L: 70 + this.field3967 = var1.previous; + return var1; } } @ObfuscatedName("w") int method5914() { - int var1 = 0; // L: 74 + int var1 = 0; - for (Node var2 = this.sentinel.previous; var2 != this.sentinel; var2 = var2.previous) { // L: 75 76 78 - ++var1; // L: 77 + for (Node var2 = this.sentinel.previous; var2 != this.sentinel; var2 = var2.previous) { + ++var1; } - return var1; // L: 80 + return var1; } @ObfuscatedName("n") public boolean method5915() { - return this.sentinel.previous == this.sentinel; // L: 84 + return this.sentinel.previous == this.sentinel; } @ObfuscatedName("r") @@ -134,14 +134,14 @@ public class IterableNodeDeque implements Iterable, Collection { descriptor = "()[Lnw;" ) Node[] method5972() { - Node[] var1 = new Node[this.method5914()]; // L: 88 - int var2 = 0; // L: 89 + Node[] var1 = new Node[this.method5914()]; + int var2 = 0; - for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { // L: 90 91 93 - var1[var2++] = var3; // L: 92 + for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { + var1[var2++] = var3; } - return var1; // L: 95 + return var1; } @ObfuscatedName("o") @@ -149,74 +149,74 @@ public class IterableNodeDeque implements Iterable, Collection { descriptor = "(Lnw;)Z" ) boolean method5918(Node var1) { - this.addFirst(var1); // L: 135 - return true; // L: 136 + this.addFirst(var1); + return true; } public Iterator iterator() { - return new IterableNodeDequeDescendingIterator(this); // L: 99 + return new IterableNodeDequeDescendingIterator(this); } public boolean addAll(Collection var1) { - throw new RuntimeException(); // L: 151 + throw new RuntimeException(); } public boolean contains(Object var1) { - throw new RuntimeException(); // L: 114 + throw new RuntimeException(); } public Object[] toArray() { - return this.method5972(); // L: 119 + return this.method5972(); } public Object[] toArray(Object[] var1) { - int var2 = 0; // L: 125 + int var2 = 0; - for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { // L: 126 127 129 - var1[var2++] = var3; // L: 128 + for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { + var1[var2++] = var3; } - return var1; // L: 131 + return var1; } public boolean remove(Object var1) { - throw new RuntimeException(); // L: 141 + throw new RuntimeException(); } public boolean containsAll(Collection var1) { - throw new RuntimeException(); // L: 146 + throw new RuntimeException(); } public boolean removeAll(Collection var1) { - throw new RuntimeException(); // L: 156 + throw new RuntimeException(); } public void clear() { - this.rsClear(); // L: 166 - } // L: 167 + this.rsClear(); + } public boolean add(Object var1) { - return this.method5918((Node)var1); // L: 170 + return this.method5918((Node)var1); } public boolean equals(Object var1) { - return super.equals(var1); // L: 174 + return super.equals(var1); } public int hashCode() { - return super.hashCode(); // L: 178 + return super.hashCode(); } public boolean isEmpty() { - return this.method5915(); // L: 109 + return this.method5915(); } public boolean retainAll(Collection var1) { - throw new RuntimeException(); // L: 161 + throw new RuntimeException(); } public int size() { - return this.method5914(); // L: 104 + return this.method5914(); } @ObfuscatedName("m") @@ -225,13 +225,13 @@ public class IterableNodeDeque implements Iterable, Collection { ) @Export("IterableNodeDeque_addBefore") public static void IterableNodeDeque_addBefore(Node var0, Node var1) { - if (var0.next != null) { // L: 38 + if (var0.next != null) { var0.remove(); } - var0.next = var1; // L: 39 - var0.previous = var1.previous; // L: 40 - var0.next.previous = var0; // L: 41 - var0.previous.next = var0; // L: 42 - } // L: 43 + var0.next = var1; + var0.previous = var1.previous; + var0.next.previous = var0; + var0.previous.next = var0; + } } diff --git a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java index ef5fa8c01a..64c67c370c 100644 --- a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java +++ b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java @@ -29,9 +29,9 @@ public class IterableNodeDequeDescendingIterator implements Iterator { descriptor = "(Llr;)V" ) IterableNodeDequeDescendingIterator(IterableNodeDeque var1) { - this.last = null; // L: 9 - this.setDeque(var1); // L: 12 - } // L: 13 + this.last = null; + this.setDeque(var1); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -39,40 +39,40 @@ public class IterableNodeDequeDescendingIterator implements Iterator { ) @Export("setDeque") void setDeque(IterableNodeDeque var1) { - this.deque = var1; // L: 16 - this.start(); // L: 17 - } // L: 18 + this.deque = var1; + this.start(); + } @ObfuscatedName("b") @Export("start") void start() { - this.field3964 = this.deque != null ? this.deque.sentinel.previous : null; // L: 21 - this.last = null; // L: 22 - } // L: 23 + this.field3964 = this.deque != null ? this.deque.sentinel.previous : null; + this.last = null; + } public void remove() { - if (this.last == null) { // L: 42 + if (this.last == null) { throw new IllegalStateException(); } else { - this.last.remove(); // L: 43 - this.last = null; // L: 44 + this.last.remove(); + this.last = null; } - } // L: 45 + } public boolean hasNext() { - return this.deque.sentinel != this.field3964 && this.field3964 != null; // L: 38 + return this.deque.sentinel != this.field3964 && this.field3964 != null; } public Object next() { - Node var1 = this.field3964; // L: 27 - if (var1 == this.deque.sentinel) { // L: 28 - var1 = null; // L: 29 - this.field3964 = null; // L: 30 + Node var1 = this.field3964; + if (var1 == this.deque.sentinel) { + var1 = null; + this.field3964 = null; } else { - this.field3964 = var1.previous; // L: 32 + this.field3964 = var1.previous; } - this.last = var1; // L: 33 - return var1; // L: 34 + this.last = var1; + return var1; } } diff --git a/runescape-client/src/main/java/IterableNodeHashTable.java b/runescape-client/src/main/java/IterableNodeHashTable.java index d311e3047c..68ca39ed24 100644 --- a/runescape-client/src/main/java/IterableNodeHashTable.java +++ b/runescape-client/src/main/java/IterableNodeHashTable.java @@ -33,17 +33,17 @@ public final class IterableNodeHashTable implements Iterable { int index; public IterableNodeHashTable(int var1) { - this.index = 0; // L: 11 - this.size = var1; // L: 14 - this.buckets = new Node[var1]; // L: 15 + this.index = 0; + this.size = var1; + this.buckets = new Node[var1]; - for (int var2 = 0; var2 < var1; ++var2) { // L: 16 - Node var3 = this.buckets[var2] = new Node(); // L: 17 - var3.previous = var3; // L: 18 - var3.next = var3; // L: 19 + for (int var2 = 0; var2 < var1; ++var2) { + Node var3 = this.buckets[var2] = new Node(); + var3.previous = var3; + var3.next = var3; } - } // L: 21 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -51,18 +51,18 @@ public final class IterableNodeHashTable implements Iterable { ) @Export("get") public Node get(long var1) { - Node var3 = this.buckets[(int)(var1 & (long)(this.size - 1))]; // L: 25 + Node var3 = this.buckets[(int)(var1 & (long)(this.size - 1))]; - 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 + for (this.currentGet = var3.previous; var3 != this.currentGet; this.currentGet = this.currentGet.previous) { + if (this.currentGet.key == var1) { + Node var4 = this.currentGet; + this.currentGet = this.currentGet.previous; + return var4; } } - this.currentGet = null; // L: 35 - return null; // L: 36 + this.currentGet = null; + return null; } @ObfuscatedName("b") @@ -71,37 +71,37 @@ public final class IterableNodeHashTable implements Iterable { ) @Export("put") public void put(Node var1, long var2) { - if (var1.next != null) { // L: 40 + if (var1.next != null) { var1.remove(); } - 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 + Node var4 = this.buckets[(int)(var2 & (long)(this.size - 1))]; + var1.next = var4.next; + var1.previous = var4; + var1.next.previous = var1; + var1.previous.next = var1; + var1.key = var2; + } @ObfuscatedName("p") @Export("clear") public void clear() { - for (int var1 = 0; var1 < this.size; ++var1) { // L: 50 - Node var2 = this.buckets[var1]; // L: 51 + for (int var1 = 0; var1 < this.size; ++var1) { + Node var2 = this.buckets[var1]; while (true) { - Node var3 = var2.previous; // L: 53 - if (var3 == var2) { // L: 54 + Node var3 = var2.previous; + if (var3 == var2) { break; } - var3.remove(); // L: 55 + var3.remove(); } } - this.currentGet = null; // L: 58 - this.current = null; // L: 59 - } // L: 60 + this.currentGet = null; + this.current = null; + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -109,8 +109,8 @@ public final class IterableNodeHashTable implements Iterable { ) @Export("first") public Node first() { - this.index = 0; // L: 63 - return this.next(); // L: 64 + this.index = 0; + return this.next(); } @ObfuscatedName("t") @@ -120,25 +120,25 @@ public final class IterableNodeHashTable implements Iterable { @Export("next") public Node next() { Node var1; - 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 + if (this.index > 0 && this.buckets[this.index - 1] != this.current) { + var1 = this.current; + this.current = var1.previous; + return var1; } else { do { - if (this.index >= this.size) { // L: 74 - return null; // L: 81 + if (this.index >= this.size) { + return null; } - var1 = this.buckets[this.index++].previous; // L: 75 - } while(var1 == this.buckets[this.index - 1]); // L: 76 + var1 = this.buckets[this.index++].previous; + } while(var1 == this.buckets[this.index - 1]); - this.current = var1.previous; // L: 77 - return var1; // L: 78 + this.current = var1.previous; + return var1; } } public Iterator iterator() { - return new IterableNodeHashTableIterator(this); // L: 86 + return new IterableNodeHashTableIterator(this); } } diff --git a/runescape-client/src/main/java/IterableNodeHashTableIterator.java b/runescape-client/src/main/java/IterableNodeHashTableIterator.java index 02ace29613..c3f6196cad 100644 --- a/runescape-client/src/main/java/IterableNodeHashTableIterator.java +++ b/runescape-client/src/main/java/IterableNodeHashTableIterator.java @@ -33,60 +33,60 @@ public class IterableNodeHashTableIterator implements Iterator { descriptor = "(Loz;)V" ) IterableNodeHashTableIterator(IterableNodeHashTable var1) { - this.last = null; // L: 10 - this.hashTable = var1; // L: 13 - this.start(); // L: 14 - } // L: 15 + this.last = null; + this.hashTable = var1; + this.start(); + } @ObfuscatedName("c") @Export("start") void start() { - this.head = this.hashTable.buckets[0].previous; // L: 18 - this.index = 1; // L: 19 - this.last = null; // L: 20 - } // L: 21 + this.head = this.hashTable.buckets[0].previous; + this.index = 1; + this.last = null; + } 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 + if (this.hashTable.buckets[this.index - 1] != this.head) { + var1 = this.head; + this.head = var1.previous; + this.last = var1; + return var1; } else { do { - if (this.index >= this.hashTable.size) { // L: 31 - return null; // L: 39 + if (this.index >= this.hashTable.size) { + return null; } - var1 = this.hashTable.buckets[this.index++].previous; // L: 32 - } while(var1 == this.hashTable.buckets[this.index - 1]); // L: 33 + var1 = this.hashTable.buckets[this.index++].previous; + } while(var1 == this.hashTable.buckets[this.index - 1]); - this.head = var1.previous; // L: 34 - this.last = var1; // L: 35 - return var1; // L: 36 + this.head = var1.previous; + this.last = var1; + return var1; } } public boolean hasNext() { - if (this.hashTable.buckets[this.index - 1] != this.head) { // L: 43 + if (this.hashTable.buckets[this.index - 1] != this.head) { 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 + while (this.index < this.hashTable.size) { + if (this.hashTable.buckets[this.index++].previous != this.hashTable.buckets[this.index - 1]) { + this.head = this.hashTable.buckets[this.index - 1].previous; + return true; } - this.head = this.hashTable.buckets[this.index - 1]; // L: 50 + this.head = this.hashTable.buckets[this.index - 1]; } - return false; // L: 53 + return false; } } public void remove() { - this.last.remove(); // L: 58 - this.last = null; // L: 59 - } // L: 60 + this.last.remove(); + this.last = null; + } } diff --git a/runescape-client/src/main/java/JagexCache.java b/runescape-client/src/main/java/JagexCache.java index 55772cc939..94f918e940 100644 --- a/runescape-client/src/main/java/JagexCache.java +++ b/runescape-client/src/main/java/JagexCache.java @@ -41,9 +41,9 @@ public class JagexCache { public static String formattedOperatingSystemName; static { - JagexCache_randomDat = null; // L: 22 - JagexCache_dat2File = null; // L: 23 - JagexCache_idx255File = null; // L: 24 + JagexCache_randomDat = null; + JagexCache_dat2File = null; + JagexCache_idx255File = null; } @ObfuscatedName("g") @@ -52,16 +52,16 @@ public class JagexCache { garbageValue = "2123818799" ) static class120 method3064(int var0) { - class120 var1 = (class120)SequenceDefinition.field2086.get((long)var0); // L: 362 - if (var1 != null) { // L: 363 + class120 var1 = (class120)SequenceDefinition.field2086.get((long)var0); + if (var1 != null) { return var1; } else { - var1 = class112.method2571(SequenceDefinition.SequenceDefinition_animationsArchive, class118.SequenceDefinition_skeletonsArchive, var0, false); // L: 364 - if (var1 != null) { // L: 365 + var1 = class112.method2571(SequenceDefinition.SequenceDefinition_animationsArchive, class118.SequenceDefinition_skeletonsArchive, var0, false); + if (var1 != null) { SequenceDefinition.field2086.put(var1, (long)var0); } - return var1; // L: 366 + return var1; } } } diff --git a/runescape-client/src/main/java/KeyHandler.java b/runescape-client/src/main/java/KeyHandler.java index 8521a042f3..563f2a73d1 100644 --- a/runescape-client/src/main/java/KeyHandler.java +++ b/runescape-client/src/main/java/KeyHandler.java @@ -91,117 +91,116 @@ public final class KeyHandler implements KeyListener, FocusListener { @ObfuscatedSignature( descriptor = "Lkz;" ) - @Export("archive4") - static Archive archive4; + static Archive field151; static { - KeyHandler_instance = new KeyHandler(); // L: 14 - KeyHandler_pressedKeys = new boolean[112]; // L: 101 - field132 = new boolean[112]; // L: 102 - field130 = new boolean[112]; // L: 103 - field134 = new int[128]; // L: 106 - field135 = 0; // L: 107 - field120 = 0; // L: 108 - field137 = new char[128]; // L: 109 - field131 = new int[128]; // L: 110 - field139 = new int[128]; // L: 111 - field140 = 0; // L: 112 - field141 = new int[128]; // L: 113 - field142 = 0; // L: 114 - field143 = 0; // L: 115 - field144 = 0; // L: 116 - field145 = 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 + KeyHandler_instance = new KeyHandler(); + KeyHandler_pressedKeys = new boolean[112]; + field132 = new boolean[112]; + field130 = new boolean[112]; + field134 = new int[128]; + field135 = 0; + field120 = 0; + field137 = new char[128]; + field131 = new int[128]; + field139 = new int[128]; + field140 = 0; + field141 = new int[128]; + field142 = 0; + field143 = 0; + field144 = 0; + field145 = 0; + KeyHandler_idleCycles = 0; + KeyHandler_keyCodes = new int[]{-1, -1, -1, -1, -1, -1, -1, -1, 85, 80, 84, -1, 91, -1, -1, -1, 81, 82, 86, -1, -1, -1, -1, -1, -1, -1, -1, 13, -1, -1, -1, -1, 83, 104, 105, 103, 102, 96, 98, 97, 99, -1, -1, -1, -1, -1, -1, -1, 25, 16, 17, 18, 19, 20, 21, 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, 48, 68, 66, 50, 34, 51, 52, 53, 39, 54, 55, 56, 70, 69, 40, 41, 32, 35, 49, 36, 38, 67, 33, 65, 37, 64, -1, -1, -1, -1, -1, 228, 231, 227, 233, 224, 219, 225, 230, 226, 232, 89, 87, -1, 88, 229, 90, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, -1, -1, -1, 101, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 100, -1, 87, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; } KeyHandler() { - } // L: 121 + } 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) { + int var2 = var1.getKeyCode(); + if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { + var2 = KeyHandler_keyCodes[var2]; + if ((var2 & 128) != 0) { var2 = -1; } } else { - var2 = -1; // L: 185 + var2 = -1; } - if (field120 >= 0 && var2 >= 0) { // L: 186 - field134[field120] = var2; // L: 187 - field120 = field120 + 1 & 127; // L: 188 - if (field135 == field120) { // L: 189 + if (field120 >= 0 && var2 >= 0) { + field134[field120] = var2; + field120 = field120 + 1 & 127; + if (field135 == field120) { field120 = -1; } } int var3; - if (var2 >= 0) { // L: 191 - var3 = field144 + 1 & 127; // L: 192 - if (var3 != field143) { // L: 193 - field131[field144] = var2; // L: 194 - field137[field144] = 0; // L: 195 - field144 = var3; // L: 196 + if (var2 >= 0) { + var3 = field144 + 1 & 127; + if (var3 != field143) { + field131[field144] = var2; + field137[field144] = 0; + field144 = var3; } } - var3 = var1.getModifiers(); // L: 199 - if ((var3 & 10) != 0 || var2 == 85 || var2 == 10) { // L: 200 - var1.consume(); // L: 201 + var3 = var1.getModifiers(); + if ((var3 & 10) != 0 || var2 == 85 || var2 == 10) { + var1.consume(); } } - } // L: 204 + } 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 + if (KeyHandler_instance != null) { + int var2 = var1.getKeyCode(); + if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { var2 = KeyHandler_keyCodes[var2] & -129; } else { - var2 = -1; // L: 210 + var2 = -1; } - if (field120 >= 0 && var2 >= 0) { // L: 211 - field134[field120] = ~var2; // L: 212 - field120 = field120 + 1 & 127; // L: 213 - if (field135 == field120) { // L: 214 + if (field120 >= 0 && var2 >= 0) { + field134[field120] = ~var2; + field120 = field120 + 1 & 127; + if (field135 == field120) { field120 = -1; } } } - var1.consume(); // L: 217 - } // L: 218 + var1.consume(); + } public final void keyTyped(KeyEvent var1) { - if (KeyHandler_instance != null) { // L: 221 - char var2 = var1.getKeyChar(); // L: 222 - if (var2 != 0 && var2 != '\uffff' && class136.method2842(var2)) { // L: 223 - int var3 = field144 + 1 & 127; // L: 224 - if (var3 != field143) { // L: 225 - field131[field144] = -1; // L: 226 - field137[field144] = var2; // L: 227 - field144 = var3; // L: 228 + if (KeyHandler_instance != null) { + char var2 = var1.getKeyChar(); + if (var2 != 0 && var2 != '\uffff' && class136.method2842(var2)) { + int var3 = field144 + 1 & 127; + if (var3 != field143) { + field131[field144] = -1; + field137[field144] = var2; + field144 = var3; } } } - var1.consume(); // L: 232 - } // L: 233 + var1.consume(); + } public final void focusGained(FocusEvent var1) { - } // L: 266 + } public final synchronized void focusLost(FocusEvent var1) { - if (KeyHandler_instance != null) { // L: 269 - field120 = -1; // L: 270 + if (KeyHandler_instance != null) { + field120 = -1; } - } // L: 272 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -209,8 +208,8 @@ public final class KeyHandler implements KeyListener, FocusListener { garbageValue = "1763095521" ) public static void method390(String[] var0, short[] var1) { - Projectile.sortItemsByName(var0, var1, 0, var0.length - 1); // L: 9 - } // L: 10 + Projectile.sortItemsByName(var0, var1, 0, var0.length - 1); + } @ObfuscatedName("v") @ObfuscatedSignature( @@ -218,9 +217,9 @@ public final class KeyHandler implements KeyListener, FocusListener { garbageValue = "51" ) static final int method367(int var0, int var1) { - int var2 = var1 * 57 + var0; // L: 488 - var2 ^= var2 << 13; // L: 489 - int var3 = (var2 * var2 * 15731 + 789221) * var2 + 1376312589 & Integer.MAX_VALUE; // L: 490 - return var3 >> 19 & 255; // L: 491 + int var2 = var1 * 57 + var0; + var2 ^= var2 << 13; + int var3 = (var2 * var2 * 15731 + 789221) * var2 + 1376312589 & Integer.MAX_VALUE; + return var3 >> 19 & 255; } } diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index e3ac6cd77b..99b835eba5 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -60,14 +60,14 @@ public class KitDefinition extends DualNode { public boolean nonSelectable; static { - KitDefinition_cached = new EvictingDualNodeHashTable(64); // L: 14 + KitDefinition_cached = new EvictingDualNodeHashTable(64); } KitDefinition() { - this.bodypartID = -1; // L: 15 - this.models = new int[]{-1, -1, -1, -1, -1}; // L: 21 - this.nonSelectable = false; // L: 22 - } // L: 24 + this.bodypartID = -1; + this.models = new int[]{-1, -1, -1, -1, -1}; + this.nonSelectable = false; + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -77,12 +77,12 @@ public class KitDefinition extends DualNode { @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 44 - if (var2 == 0) { // L: 45 - return; // L: 48 + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; } - this.decodeNext(var1, var2); // L: 46 + this.decodeNext(var1, var2); } } @@ -93,44 +93,44 @@ public class KitDefinition extends DualNode { ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 51 + if (var2 == 1) { this.bodypartID = var1.readUnsignedByte(); } else { int var3; int var4; - if (var2 == 2) { // L: 52 - var3 = var1.readUnsignedByte(); // L: 53 - this.models2 = new int[var3]; // L: 54 + if (var2 == 2) { + var3 = var1.readUnsignedByte(); + this.models2 = new int[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 55 + for (var4 = 0; var4 < var3; ++var4) { this.models2[var4] = var1.readUnsignedShort(); } - } else if (var2 == 3) { // L: 57 + } else if (var2 == 3) { this.nonSelectable = true; - } 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 + } else if (var2 == 40) { + var3 = var1.readUnsignedByte(); + this.recolorFrom = new short[var3]; + this.recolorTo = new short[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 62 - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 63 - this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 64 + for (var4 = 0; var4 < var3; ++var4) { + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); + this.recolorTo[var4] = (short)var1.readUnsignedShort(); } - } else if (var2 == 41) { // L: 67 - var3 = var1.readUnsignedByte(); // L: 68 - this.retextureFrom = new short[var3]; // L: 69 - this.retextureTo = new short[var3]; // L: 70 + } else if (var2 == 41) { + var3 = var1.readUnsignedByte(); + this.retextureFrom = new short[var3]; + this.retextureTo = new short[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 71 - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 72 - this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 73 + for (var4 = 0; var4 < var3; ++var4) { + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); + this.retextureTo[var4] = (short)var1.readUnsignedShort(); } - } else if (var2 >= 60 && var2 < 70) { // L: 76 + } else if (var2 >= 60 && var2 < 70) { this.models[var2 - 60] = var1.readUnsignedShort(); } } - } // L: 78 + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -139,18 +139,18 @@ public class KitDefinition extends DualNode { ) @Export("ready") public boolean ready() { - if (this.models2 == null) { // L: 81 + if (this.models2 == null) { return true; } else { - boolean var1 = true; // L: 82 + boolean var1 = true; - for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 83 + for (int var2 = 0; var2 < this.models2.length; ++var2) { if (!KitDefinition_modelsArchive.tryLoadFile(this.models2[var2], 0)) { var1 = false; } } - return var1; // L: 84 + return var1; } } @@ -161,36 +161,36 @@ public class KitDefinition extends DualNode { ) @Export("getModelData") public ModelData getModelData() { - if (this.models2 == null) { // L: 88 + if (this.models2 == null) { return null; } else { - ModelData[] var1 = new ModelData[this.models2.length]; // L: 89 + ModelData[] var1 = new ModelData[this.models2.length]; - for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 90 + for (int var2 = 0; var2 < this.models2.length; ++var2) { var1[var2] = ModelData.ModelData_get(KitDefinition_modelsArchive, this.models2[var2], 0); } ModelData var4; - if (var1.length == 1) { // L: 92 + if (var1.length == 1) { var4 = var1[0]; } else { - var4 = new ModelData(var1, var1.length); // L: 93 + var4 = new ModelData(var1, var1.length); } int var3; - 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.recolorFrom != null) { + for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { + var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); } } - 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 + if (this.retextureFrom != null) { + for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { + var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); } } - return var4; // L: 104 + return var4; } } @@ -200,15 +200,15 @@ public class KitDefinition extends DualNode { garbageValue = "1736416150" ) public boolean method3210() { - boolean var1 = true; // L: 108 + boolean var1 = true; - for (int var2 = 0; var2 < 5; ++var2) { // L: 109 - if (this.models[var2] != -1 && !KitDefinition_modelsArchive.tryLoadFile(this.models[var2], 0)) { // L: 110 + for (int var2 = 0; var2 < 5; ++var2) { + if (this.models[var2] != -1 && !KitDefinition_modelsArchive.tryLoadFile(this.models[var2], 0)) { var1 = false; } } - return var1; // L: 112 + return var1; } @ObfuscatedName("w") @@ -218,30 +218,30 @@ public class KitDefinition extends DualNode { ) @Export("getKitDefinitionModels") public ModelData getKitDefinitionModels() { - ModelData[] var1 = new ModelData[5]; // L: 116 - int var2 = 0; // L: 117 + ModelData[] var1 = new ModelData[5]; + int var2 = 0; - for (int var3 = 0; var3 < 5; ++var3) { // L: 118 - if (this.models[var3] != -1) { // L: 119 + for (int var3 = 0; var3 < 5; ++var3) { + if (this.models[var3] != -1) { var1[var2++] = ModelData.ModelData_get(KitDefinition_modelsArchive, this.models[var3], 0); } } - ModelData var5 = new ModelData(var1, var2); // L: 121 + ModelData var5 = new ModelData(var1, var2); int var4; - 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.recolorFrom != null) { + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { + var5.recolor(this.recolorFrom[var4], this.recolorTo[var4]); } } - 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 + if (this.retextureFrom != null) { + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { + var5.retexture(this.retextureFrom[var4], this.retextureTo[var4]); } } - return var5; // L: 132 + return var5; } @ObfuscatedName("c") @@ -250,11 +250,11 @@ public class KitDefinition extends DualNode { garbageValue = "-59" ) public static class3 method3238(class6 var0) { - switch(var0.field16) { // L: 9 + switch(var0.field16) { case 0: - return new class0(); // L: 12 + return new class0(); default: - throw new IllegalArgumentException(); // L: 16 + throw new IllegalArgumentException(); } } @@ -264,46 +264,46 @@ public class KitDefinition extends DualNode { garbageValue = "445518606" ) static int method3237(int var0, Script var1, boolean var2) { - if (var0 == 7400) { // L: 4460 - --IsaacCipher.Interpreter_intStackSize; // L: 4461 - --class13.Interpreter_stringStackSize; // L: 4462 - return 1; // L: 4463 - } else if (var0 == 7401) { // L: 4465 - --IsaacCipher.Interpreter_intStackSize; // L: 4466 - --class13.Interpreter_stringStackSize; // L: 4467 - return 1; // L: 4468 - } else if (var0 == 7402) { // L: 4470 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 4471 - --class13.Interpreter_stringStackSize; // L: 4472 - return 1; // L: 4473 - } else if (var0 == 7403) { // L: 4475 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 4476 - --class13.Interpreter_stringStackSize; // L: 4477 - return 1; // L: 4478 - } else if (var0 == 7404) { // L: 4480 - --IsaacCipher.Interpreter_intStackSize; // L: 4481 - --class13.Interpreter_stringStackSize; // L: 4482 - return 1; // L: 4483 - } else if (var0 == 7405) { // L: 4485 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 4486 - return 1; // L: 4487 - } else if (var0 == 7406) { // L: 4489 - --IsaacCipher.Interpreter_intStackSize; // L: 4490 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 4491 - return 1; // L: 4492 - } else if (var0 == 7407) { // L: 4494 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 4495 - return 1; // L: 4496 - } else if (var0 == 7408) { // L: 4498 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 4499 - --class13.Interpreter_stringStackSize; // L: 4500 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 4501 - return 1; // L: 4502 - } else if (var0 == 7409) { // L: 4504 - --IsaacCipher.Interpreter_intStackSize; // L: 4505 - return 1; // L: 4506 + if (var0 == 7400) { + --IsaacCipher.Interpreter_intStackSize; + --class13.Interpreter_stringStackSize; + return 1; + } else if (var0 == 7401) { + --IsaacCipher.Interpreter_intStackSize; + --class13.Interpreter_stringStackSize; + return 1; + } else if (var0 == 7402) { + IsaacCipher.Interpreter_intStackSize -= 2; + --class13.Interpreter_stringStackSize; + return 1; + } else if (var0 == 7403) { + IsaacCipher.Interpreter_intStackSize -= 2; + --class13.Interpreter_stringStackSize; + return 1; + } else if (var0 == 7404) { + --IsaacCipher.Interpreter_intStackSize; + --class13.Interpreter_stringStackSize; + return 1; + } else if (var0 == 7405) { + IsaacCipher.Interpreter_intStackSize -= 2; + return 1; + } else if (var0 == 7406) { + --IsaacCipher.Interpreter_intStackSize; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + return 1; + } else if (var0 == 7407) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 7408) { + IsaacCipher.Interpreter_intStackSize -= 2; + --class13.Interpreter_stringStackSize; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 7409) { + --IsaacCipher.Interpreter_intStackSize; + return 1; } else { - return 2; // L: 4508 + return 2; } } } diff --git a/runescape-client/src/main/java/Language.java b/runescape-client/src/main/java/Language.java index 9a00da499b..7841180fd4 100644 --- a/runescape-client/src/main/java/Language.java +++ b/runescape-client/src/main/java/Language.java @@ -5,6 +5,8 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +@lz +@jc @ObfuscatedName("lf") @Implements("Language") public class Language implements MouseWheel { @@ -69,24 +71,24 @@ public class Language implements MouseWheel { final int id; static { - Language_EN = new Language("EN", "en", "English", ModeWhere.field3948, 0, "GB"); // L: 12 - Language_DE = new Language("DE", "de", "German", ModeWhere.field3948, 1, "DE"); // L: 13 - Language_FR = new Language("FR", "fr", "French", ModeWhere.field3948, 2, "FR"); // L: 14 - Language_PT = new Language("PT", "pt", "Portuguese", ModeWhere.field3948, 3, "BR"); // L: 15 - Language_NL = new Language("NL", "nl", "Dutch", ModeWhere.field3939, 4, "NL"); // L: 16 - Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field3939, 5, "ES"); // L: 17 - Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field3948, 6, "MX"); // L: 18 - Language[] var0 = new Language[]{Language_ES_MX, Language_EN, Language_NL, Language_PT, Language_ES, Language_DE, Language_FR}; // L: 27 - Language_valuesOrdered = new Language[var0.length]; // L: 30 - Language[] var2 = var0; // L: 32 + Language_EN = new Language("EN", "en", "English", ModeWhere.field3948, 0, "GB"); + Language_DE = new Language("DE", "de", "German", ModeWhere.field3948, 1, "DE"); + Language_FR = new Language("FR", "fr", "French", ModeWhere.field3948, 2, "FR"); + Language_PT = new Language("PT", "pt", "Portuguese", ModeWhere.field3948, 3, "BR"); + Language_NL = new Language("NL", "nl", "Dutch", ModeWhere.field3939, 4, "NL"); + Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field3939, 5, "ES"); + Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field3948, 6, "MX"); + Language[] var0 = new Language[]{Language_ES_MX, Language_EN, Language_NL, Language_PT, Language_ES, Language_DE, Language_FR}; + Language_valuesOrdered = new Language[var0.length]; + Language[] var2 = var0; - 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 + for (int var3 = 0; var3 < var2.length; ++var3) { + Language var4 = var2[var3]; + if (Language_valuesOrdered[var4.id] != null) { + throw new IllegalStateException(); } - Language_valuesOrdered[var4.id] = var4; // L: 39 + Language_valuesOrdered[var4.id] = var4; } } @@ -97,14 +99,14 @@ public class Language implements MouseWheel { Language(String var1, String var2, String var3, ModeWhere var4, int var5, String var6) { this.field3928 = var1; this.language = var2; - this.id = var5; // L: 48 - if (var6 != null) { // L: 49 - new Locale(var2.substring(0, 2), var6); // L: 50 + this.id = var5; + if (var6 != null) { + new Locale(var2.substring(0, 2), var6); } else { - new Locale(var2.substring(0, 2)); // L: 53 + new Locale(var2.substring(0, 2)); } - } // L: 55 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -113,7 +115,7 @@ public class Language implements MouseWheel { ) @Export("getLanguage") String getLanguage() { - return this.language; // L: 58 + return this.language; } @ObfuscatedName("b") @@ -123,11 +125,11 @@ public class Language implements MouseWheel { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 63 + return this.id; } public String toString() { - return this.getLanguage().toLowerCase(Locale.ENGLISH); // L: 73 + return this.getLanguage().toLowerCase(Locale.ENGLISH); } @ObfuscatedName("p") @@ -136,12 +138,12 @@ public class Language implements MouseWheel { garbageValue = "316979421" ) public static int method5825(int var0) { - var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); // L: 42 - var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); // L: 43 - var0 = var0 + (var0 >>> 4) & 252645135; // L: 44 - var0 += var0 >>> 8; // L: 45 - var0 += var0 >>> 16; // L: 46 - return var0 & 255; // L: 47 + var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); + var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); + var0 = var0 + (var0 >>> 4) & 252645135; + var0 += var0 >>> 8; + var0 += var0 >>> 16; + return var0 & 255; } @ObfuscatedName("p") @@ -150,7 +152,7 @@ public class Language implements MouseWheel { garbageValue = "77" ) public static Language method5826(int var0) { - return var0 >= 0 && var0 < Language_valuesOrdered.length ? Language_valuesOrdered[var0] : null; // L: 67 68 + return var0 >= 0 && var0 < Language_valuesOrdered.length ? Language_valuesOrdered[var0] : null; } @ObfuscatedName("n") @@ -159,13 +161,13 @@ public class Language implements MouseWheel { garbageValue = "2031072564" ) public static int[] method5840() { - int[] var0 = new int[KeyHandler.field142]; // L: 259 + int[] var0 = new int[KeyHandler.field142]; - for (int var1 = 0; var1 < KeyHandler.field142; ++var1) { // L: 260 - var0[var1] = KeyHandler.field141[var1]; // L: 261 + for (int var1 = 0; var1 < KeyHandler.field142; ++var1) { + var0[var1] = KeyHandler.field141[var1]; } - return var0; // L: 263 + return var0; } @ObfuscatedName("v") @@ -180,350 +182,350 @@ public class Language implements MouseWheel { int var9; int var11; int var13; - if (class148.worldSelectBackSprites == null) { // L: 1671 - var3 = UserComparator6.archive8; // L: 1673 - var4 = var3.getGroupId("sl_back"); // L: 1675 - var5 = var3.getFileId(var4, ""); // L: 1676 + if (class148.worldSelectBackSprites == null) { + var3 = UserComparator6.archive8; + var4 = var3.getGroupId("sl_back"); + var5 = var3.getFileId(var4, ""); SpritePixels[] var6; - if (!class147.method3009(var3, var4, var5)) { // L: 1679 - var6 = null; // L: 1680 + if (!class147.method3009(var3, var4, var5)) { + var6 = null; } else { - SpritePixels[] var8 = new SpritePixels[class440.SpriteBuffer_spriteCount]; // L: 1685 + SpritePixels[] var8 = new SpritePixels[class440.SpriteBuffer_spriteCount]; var9 = 0; while (true) { if (var9 >= class440.SpriteBuffer_spriteCount) { - UserComparator3.method2529(); // L: 1699 - var6 = var8; // L: 1702 + UserComparator3.method2529(); + var6 = var8; break; } - SpritePixels var10 = var8[var9] = new SpritePixels(); // L: 1687 - var10.width = class432.SpriteBuffer_spriteWidth; // L: 1688 - var10.height = class432.SpriteBuffer_spriteHeight; // L: 1689 - var10.xOffset = class141.SpriteBuffer_xOffsets[var9]; // L: 1690 - var10.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var9]; // L: 1691 - var10.subWidth = class432.SpriteBuffer_spriteWidths[var9]; // L: 1692 - var10.subHeight = class330.SpriteBuffer_spriteHeights[var9]; // L: 1693 - var11 = var10.subHeight * var10.subWidth; // L: 1694 - byte[] var12 = class369.SpriteBuffer_pixels[var9]; // L: 1695 - var10.pixels = new int[var11]; // L: 1696 + SpritePixels var10 = var8[var9] = new SpritePixels(); + var10.width = class432.SpriteBuffer_spriteWidth; + var10.height = class432.SpriteBuffer_spriteHeight; + var10.xOffset = class141.SpriteBuffer_xOffsets[var9]; + var10.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var9]; + var10.subWidth = class432.SpriteBuffer_spriteWidths[var9]; + var10.subHeight = class330.SpriteBuffer_spriteHeights[var9]; + var11 = var10.subHeight * var10.subWidth; + byte[] var12 = class369.SpriteBuffer_pixels[var9]; + var10.pixels = new int[var11]; - for (var13 = 0; var13 < var11; ++var13) { // L: 1697 + for (var13 = 0; var13 < var11; ++var13) { var10.pixels[var13] = class432.SpriteBuffer_spritePalette[var12[var13] & 255]; } - ++var9; // L: 1686 + ++var9; } } - class148.worldSelectBackSprites = var6; // L: 1706 + class148.worldSelectBackSprites = var6; } IndexedSprite[] var30; IndexedSprite[] var31; IndexedSprite var32; - if (AbstractArchive.worldSelectFlagSprites == null) { // L: 1708 - var3 = UserComparator6.archive8; // L: 1710 - var4 = var3.getGroupId("sl_flags"); // L: 1712 - var5 = var3.getFileId(var4, ""); // L: 1713 - if (!class147.method3009(var3, var4, var5)) { // L: 1716 - var30 = null; // L: 1717 + if (AbstractArchive.worldSelectFlagSprites == null) { + var3 = UserComparator6.archive8; + var4 = var3.getGroupId("sl_flags"); + var5 = var3.getFileId(var4, ""); + if (!class147.method3009(var3, var4, var5)) { + var30 = null; } else { - var31 = new IndexedSprite[class440.SpriteBuffer_spriteCount]; // L: 1722 + var31 = new IndexedSprite[class440.SpriteBuffer_spriteCount]; - for (var9 = 0; var9 < class440.SpriteBuffer_spriteCount; ++var9) { // L: 1723 - var32 = var31[var9] = new IndexedSprite(); // L: 1724 - var32.width = class432.SpriteBuffer_spriteWidth; // L: 1725 - var32.height = class432.SpriteBuffer_spriteHeight; // L: 1726 - var32.xOffset = class141.SpriteBuffer_xOffsets[var9]; // L: 1727 - var32.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var9]; // L: 1728 - var32.subWidth = class432.SpriteBuffer_spriteWidths[var9]; // L: 1729 - var32.subHeight = class330.SpriteBuffer_spriteHeights[var9]; // L: 1730 - var32.palette = class432.SpriteBuffer_spritePalette; // L: 1731 - var32.pixels = class369.SpriteBuffer_pixels[var9]; // L: 1732 + for (var9 = 0; var9 < class440.SpriteBuffer_spriteCount; ++var9) { + var32 = var31[var9] = new IndexedSprite(); + var32.width = class432.SpriteBuffer_spriteWidth; + var32.height = class432.SpriteBuffer_spriteHeight; + var32.xOffset = class141.SpriteBuffer_xOffsets[var9]; + var32.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var9]; + var32.subWidth = class432.SpriteBuffer_spriteWidths[var9]; + var32.subHeight = class330.SpriteBuffer_spriteHeights[var9]; + var32.palette = class432.SpriteBuffer_spritePalette; + var32.pixels = class369.SpriteBuffer_pixels[var9]; } - UserComparator3.method2529(); // L: 1734 - var30 = var31; // L: 1737 + UserComparator3.method2529(); + var30 = var31; } - AbstractArchive.worldSelectFlagSprites = var30; // L: 1741 + AbstractArchive.worldSelectFlagSprites = var30; } - if (UserComparator3.worldSelectArrows == null) { // L: 1743 - var3 = UserComparator6.archive8; // L: 1745 - var4 = var3.getGroupId("sl_arrows"); // L: 1747 - var5 = var3.getFileId(var4, ""); // L: 1748 - if (!class147.method3009(var3, var4, var5)) { // L: 1751 - var30 = null; // L: 1752 + if (UserComparator3.worldSelectArrows == null) { + var3 = UserComparator6.archive8; + var4 = var3.getGroupId("sl_arrows"); + var5 = var3.getFileId(var4, ""); + if (!class147.method3009(var3, var4, var5)) { + var30 = null; } else { - var31 = new IndexedSprite[class440.SpriteBuffer_spriteCount]; // L: 1757 + var31 = new IndexedSprite[class440.SpriteBuffer_spriteCount]; - for (var9 = 0; var9 < class440.SpriteBuffer_spriteCount; ++var9) { // L: 1758 - var32 = var31[var9] = new IndexedSprite(); // L: 1759 - var32.width = class432.SpriteBuffer_spriteWidth; // L: 1760 - var32.height = class432.SpriteBuffer_spriteHeight; // L: 1761 - var32.xOffset = class141.SpriteBuffer_xOffsets[var9]; // L: 1762 - var32.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var9]; // L: 1763 - var32.subWidth = class432.SpriteBuffer_spriteWidths[var9]; // L: 1764 - var32.subHeight = class330.SpriteBuffer_spriteHeights[var9]; // L: 1765 - var32.palette = class432.SpriteBuffer_spritePalette; // L: 1766 - var32.pixels = class369.SpriteBuffer_pixels[var9]; // L: 1767 + for (var9 = 0; var9 < class440.SpriteBuffer_spriteCount; ++var9) { + var32 = var31[var9] = new IndexedSprite(); + var32.width = class432.SpriteBuffer_spriteWidth; + var32.height = class432.SpriteBuffer_spriteHeight; + var32.xOffset = class141.SpriteBuffer_xOffsets[var9]; + var32.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var9]; + var32.subWidth = class432.SpriteBuffer_spriteWidths[var9]; + var32.subHeight = class330.SpriteBuffer_spriteHeights[var9]; + var32.palette = class432.SpriteBuffer_spritePalette; + var32.pixels = class369.SpriteBuffer_pixels[var9]; } - UserComparator3.method2529(); // L: 1769 - var30 = var31; // L: 1772 + UserComparator3.method2529(); + var30 = var31; } - UserComparator3.worldSelectArrows = var30; // L: 1776 + UserComparator3.worldSelectArrows = var30; } - if (class112.worldSelectStars == null) { // L: 1778 - var3 = UserComparator6.archive8; // L: 1780 - var4 = var3.getGroupId("sl_stars"); // L: 1782 - var5 = var3.getFileId(var4, ""); // L: 1783 - if (!class147.method3009(var3, var4, var5)) { // L: 1786 - var30 = null; // L: 1787 + if (class112.worldSelectStars == null) { + var3 = UserComparator6.archive8; + var4 = var3.getGroupId("sl_stars"); + var5 = var3.getFileId(var4, ""); + if (!class147.method3009(var3, var4, var5)) { + var30 = null; } else { - var31 = new IndexedSprite[class440.SpriteBuffer_spriteCount]; // L: 1792 + var31 = new IndexedSprite[class440.SpriteBuffer_spriteCount]; - for (var9 = 0; var9 < class440.SpriteBuffer_spriteCount; ++var9) { // L: 1793 - var32 = var31[var9] = new IndexedSprite(); // L: 1794 - var32.width = class432.SpriteBuffer_spriteWidth; // L: 1795 - var32.height = class432.SpriteBuffer_spriteHeight; // L: 1796 - var32.xOffset = class141.SpriteBuffer_xOffsets[var9]; // L: 1797 - var32.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var9]; // L: 1798 - var32.subWidth = class432.SpriteBuffer_spriteWidths[var9]; // L: 1799 - var32.subHeight = class330.SpriteBuffer_spriteHeights[var9]; // L: 1800 - var32.palette = class432.SpriteBuffer_spritePalette; // L: 1801 - var32.pixels = class369.SpriteBuffer_pixels[var9]; // L: 1802 + for (var9 = 0; var9 < class440.SpriteBuffer_spriteCount; ++var9) { + var32 = var31[var9] = new IndexedSprite(); + var32.width = class432.SpriteBuffer_spriteWidth; + var32.height = class432.SpriteBuffer_spriteHeight; + var32.xOffset = class141.SpriteBuffer_xOffsets[var9]; + var32.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var9]; + var32.subWidth = class432.SpriteBuffer_spriteWidths[var9]; + var32.subHeight = class330.SpriteBuffer_spriteHeights[var9]; + var32.palette = class432.SpriteBuffer_spritePalette; + var32.pixels = class369.SpriteBuffer_pixels[var9]; } - UserComparator3.method2529(); // L: 1804 - var30 = var31; // L: 1807 + UserComparator3.method2529(); + var30 = var31; } - class112.worldSelectStars = var30; // L: 1811 + class112.worldSelectStars = var30; } - if (class11.worldSelectLeftSprite == null) { // L: 1813 + if (class11.worldSelectLeftSprite == null) { class11.worldSelectLeftSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(UserComparator6.archive8, "leftarrow", ""); } - if (UrlRequest.worldSelectRightSprite == null) { // L: 1814 + if (UrlRequest.worldSelectRightSprite == null) { UrlRequest.worldSelectRightSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(UserComparator6.archive8, "rightarrow", ""); } - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); // L: 1815 - Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); // L: 1816 - Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); // L: 1817 - var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); // L: 1818 - if (class112.worldSelectStars != null) { // L: 1819 - class112.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); // L: 1820 - var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); // L: 1821 - class112.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); // L: 1822 - var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); // L: 1823 + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); + var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); + if (class112.worldSelectStars != null) { + class112.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); + var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); + class112.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); + var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); } - if (UserComparator3.worldSelectArrows != null) { // L: 1825 - int var22 = Login.xPadding + 280; // L: 1826 - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { // L: 1827 + if (UserComparator3.worldSelectArrows != null) { + int var22 = Login.xPadding + 280; + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { UserComparator3.worldSelectArrows[2].drawAt(var22, 4); } else { - UserComparator3.worldSelectArrows[0].drawAt(var22, 4); // L: 1828 + UserComparator3.worldSelectArrows[0].drawAt(var22, 4); } - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { // L: 1829 + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { UserComparator3.worldSelectArrows[3].drawAt(var22 + 15, 4); } else { - UserComparator3.worldSelectArrows[1].drawAt(var22 + 15, 4); // L: 1830 + UserComparator3.worldSelectArrows[1].drawAt(var22 + 15, 4); } - var0.draw("World", var22 + 32, 17, 16777215, -1); // L: 1831 - int var23 = Login.xPadding + 390; // L: 1832 - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { // L: 1833 + var0.draw("World", var22 + 32, 17, 16777215, -1); + int var23 = Login.xPadding + 390; + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { UserComparator3.worldSelectArrows[2].drawAt(var23, 4); } else { - UserComparator3.worldSelectArrows[0].drawAt(var23, 4); // L: 1834 + UserComparator3.worldSelectArrows[0].drawAt(var23, 4); } - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { // L: 1835 + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { UserComparator3.worldSelectArrows[3].drawAt(var23 + 15, 4); } else { - UserComparator3.worldSelectArrows[1].drawAt(var23 + 15, 4); // L: 1836 + UserComparator3.worldSelectArrows[1].drawAt(var23 + 15, 4); } - var0.draw("Players", var23 + 32, 17, 16777215, -1); // L: 1837 - var4 = Login.xPadding + 500; // L: 1838 - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { // L: 1839 + var0.draw("Players", var23 + 32, 17, 16777215, -1); + var4 = Login.xPadding + 500; + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { UserComparator3.worldSelectArrows[2].drawAt(var4, 4); } else { - UserComparator3.worldSelectArrows[0].drawAt(var4, 4); // L: 1840 + UserComparator3.worldSelectArrows[0].drawAt(var4, 4); } - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { // L: 1841 + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { UserComparator3.worldSelectArrows[3].drawAt(var4 + 15, 4); } else { - UserComparator3.worldSelectArrows[1].drawAt(var4 + 15, 4); // L: 1842 + UserComparator3.worldSelectArrows[1].drawAt(var4 + 15, 4); } - var0.draw("Location", var4 + 32, 17, 16777215, -1); // L: 1843 - var5 = Login.xPadding + 610; // L: 1844 - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { // L: 1845 + var0.draw("Location", var4 + 32, 17, 16777215, -1); + var5 = Login.xPadding + 610; + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { UserComparator3.worldSelectArrows[2].drawAt(var5, 4); } else { - UserComparator3.worldSelectArrows[0].drawAt(var5, 4); // L: 1846 + UserComparator3.worldSelectArrows[0].drawAt(var5, 4); } - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { // L: 1847 + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { UserComparator3.worldSelectArrows[3].drawAt(var5 + 15, 4); } else { - UserComparator3.worldSelectArrows[1].drawAt(var5 + 15, 4); // L: 1848 + UserComparator3.worldSelectArrows[1].drawAt(var5 + 15, 4); } - var0.draw("Type", var5 + 32, 17, 16777215, -1); // L: 1849 + var0.draw("Type", var5 + 32, 17, 16777215, -1); } - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); // L: 1851 - var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); // L: 1852 - Login.hoveredWorldIndex = -1; // L: 1853 - if (class148.worldSelectBackSprites != null) { // L: 1854 - byte var34 = 88; // L: 1855 - byte var35 = 19; // L: 1856 - var4 = 765 / (var34 + 1) - 1; // L: 1857 - var5 = 480 / (var35 + 1); // L: 1858 + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); + var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); + Login.hoveredWorldIndex = -1; + if (class148.worldSelectBackSprites != null) { + byte var34 = 88; + byte var35 = 19; + var4 = 765 / (var34 + 1) - 1; + var5 = 480 / (var35 + 1); int var24; int var25; do { - var24 = var5; // L: 1860 - var25 = var4; // L: 1861 - if (var5 * (var4 - 1) >= World.World_count) { // L: 1862 + var24 = var5; + var25 = var4; + if (var5 * (var4 - 1) >= World.World_count) { --var4; } - if (var4 * (var5 - 1) >= World.World_count) { // L: 1863 + if (var4 * (var5 - 1) >= World.World_count) { --var5; } - if (var4 * (var5 - 1) >= World.World_count) { // L: 1864 + if (var4 * (var5 - 1) >= World.World_count) { --var5; } - } while(var5 != var24 || var4 != var25); // L: 1865 + } while(var5 != var24 || var4 != var25); - var24 = (765 - var4 * var34) / (var4 + 1); // L: 1867 - if (var24 > 5) { // L: 1868 + var24 = (765 - var4 * var34) / (var4 + 1); + if (var24 > 5) { var24 = 5; } - var25 = (480 - var35 * var5) / (var5 + 1); // L: 1869 - if (var25 > 5) { // L: 1870 + var25 = (480 - var35 * var5) / (var5 + 1); + if (var25 > 5) { var25 = 5; } - int var26 = (765 - var34 * var4 - var24 * (var4 - 1)) / 2; // L: 1871 - var9 = (480 - var35 * var5 - var25 * (var5 - 1)) / 2; // L: 1872 - int var27 = (var5 + World.World_count - 1) / var5; // L: 1873 - Login.worldSelectPagesCount = var27 - var4; // L: 1874 - if (class11.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { // L: 1875 - class11.worldSelectLeftSprite.drawAt(8, BoundaryObject.canvasHeight / 2 - class11.worldSelectLeftSprite.subHeight / 2); // L: 1876 + int var26 = (765 - var34 * var4 - var24 * (var4 - 1)) / 2; + var9 = (480 - var35 * var5 - var25 * (var5 - 1)) / 2; + int var27 = (var5 + World.World_count - 1) / var5; + Login.worldSelectPagesCount = var27 - var4; + if (class11.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { + class11.worldSelectLeftSprite.drawAt(8, BoundaryObject.canvasHeight / 2 - class11.worldSelectLeftSprite.subHeight / 2); } - if (UrlRequest.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { // L: 1878 - UrlRequest.worldSelectRightSprite.drawAt(class186.canvasWidth - UrlRequest.worldSelectRightSprite.subWidth - 8, BoundaryObject.canvasHeight / 2 - UrlRequest.worldSelectRightSprite.subHeight / 2); // L: 1879 + if (UrlRequest.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { + UrlRequest.worldSelectRightSprite.drawAt(class186.canvasWidth - UrlRequest.worldSelectRightSprite.subWidth - 8, BoundaryObject.canvasHeight / 2 - UrlRequest.worldSelectRightSprite.subHeight / 2); } - var11 = var9 + 23; // L: 1881 - int var28 = var26 + Login.xPadding; // L: 1882 - var13 = 0; // L: 1883 - boolean var14 = false; // L: 1884 - int var15 = Login.worldSelectPage; // L: 1885 + var11 = var9 + 23; + int var28 = var26 + Login.xPadding; + var13 = 0; + boolean var14 = false; + int var15 = Login.worldSelectPage; int var16; - for (var16 = var5 * var15; var16 < World.World_count && var15 - Login.worldSelectPage < var4; ++var16) { // L: 1886 1887 - World var17 = class334.World_worlds[var16]; // L: 1890 - boolean var18 = true; // L: 1891 - String var19 = Integer.toString(var17.population); // L: 1892 - if (var17.population == -1) { // L: 1893 - var19 = "OFF"; // L: 1894 - var18 = false; // L: 1895 - } else if (var17.population > 1980) { // L: 1897 - var19 = "FULL"; // L: 1898 - var18 = false; // L: 1899 + for (var16 = var5 * var15; var16 < World.World_count && var15 - Login.worldSelectPage < var4; ++var16) { + World var17 = class334.World_worlds[var16]; + boolean var18 = true; + String var19 = Integer.toString(var17.population); + if (var17.population == -1) { + var19 = "OFF"; + var18 = false; + } else if (var17.population > 1980) { + var19 = "FULL"; + var18 = false; } - int var21 = 0; // L: 1902 + int var21 = 0; byte var20; - if (var17.isBeta()) { // L: 1903 - if (var17.isMembersOnly()) { // L: 1904 + if (var17.isBeta()) { + if (var17.isMembersOnly()) { var20 = 7; } else { - var20 = 6; // L: 1905 + var20 = 6; } - } else if (var17.isDeadman()) { // L: 1907 - var21 = 16711680; // L: 1908 - if (var17.isMembersOnly()) { // L: 1909 + } else if (var17.isDeadman()) { + var21 = 16711680; + if (var17.isMembersOnly()) { var20 = 5; } else { - var20 = 4; // L: 1910 + var20 = 4; } - } else if (var17.method1679()) { // L: 1912 - if (var17.isMembersOnly()) { // L: 1913 + } else if (var17.method1679()) { + if (var17.isMembersOnly()) { var20 = 9; } else { - var20 = 8; // L: 1914 + var20 = 8; } - } else if (var17.isPvp()) { // L: 1916 - if (var17.isMembersOnly()) { // L: 1917 + } else if (var17.isPvp()) { + if (var17.isMembersOnly()) { var20 = 3; } else { - var20 = 2; // L: 1918 + var20 = 2; } - } else if (var17.isMembersOnly()) { // L: 1921 + } else if (var17.isMembersOnly()) { var20 = 1; } else { - var20 = 0; // L: 1922 + var20 = 0; } - if (MouseHandler.MouseHandler_x >= var28 && MouseHandler.MouseHandler_y >= var11 && MouseHandler.MouseHandler_x < var28 + var34 && MouseHandler.MouseHandler_y < var11 + var35 && var18) { // L: 1924 - Login.hoveredWorldIndex = var16; // L: 1925 - class148.worldSelectBackSprites[var20].drawTransOverlayAt(var28, var11, 128, 16777215); // L: 1926 - var14 = true; // L: 1927 + if (MouseHandler.MouseHandler_x >= var28 && MouseHandler.MouseHandler_y >= var11 && MouseHandler.MouseHandler_x < var28 + var34 && MouseHandler.MouseHandler_y < var11 + var35 && var18) { + Login.hoveredWorldIndex = var16; + class148.worldSelectBackSprites[var20].drawTransOverlayAt(var28, var11, 128, 16777215); + var14 = true; } else { - class148.worldSelectBackSprites[var20].drawAt(var28, var11); // L: 1929 + class148.worldSelectBackSprites[var20].drawAt(var28, var11); } - if (AbstractArchive.worldSelectFlagSprites != null) { // L: 1930 + if (AbstractArchive.worldSelectFlagSprites != null) { AbstractArchive.worldSelectFlagSprites[(var17.isMembersOnly() ? 8 : 0) + var17.location].drawAt(var28 + 29, var11); } - var0.drawCentered(Integer.toString(var17.id), var28 + 15, var35 / 2 + var11 + 5, var21, -1); // L: 1931 - var1.drawCentered(var19, var28 + 60, var35 / 2 + var11 + 5, 268435455, -1); // L: 1932 - var11 = var11 + var25 + var35; // L: 1933 - ++var13; // L: 1934 + var0.drawCentered(Integer.toString(var17.id), var28 + 15, var35 / 2 + var11 + 5, var21, -1); + var1.drawCentered(var19, var28 + 60, var35 / 2 + var11 + 5, 268435455, -1); + var11 = var11 + var25 + var35; + ++var13; if (var13 >= var5) { - var11 = var9 + 23; // L: 1935 - var28 = var28 + var24 + var34; // L: 1936 - var13 = 0; // L: 1937 - ++var15; // L: 1938 + var11 = var9 + 23; + var28 = var28 + var24 + var34; + var13 = 0; + ++var15; } } - if (var14) { // L: 1941 - var16 = var1.stringWidth(class334.World_worlds[Login.hoveredWorldIndex].activity) + 6; // L: 1942 - int var29 = var1.ascent + 8; // L: 1943 - int var33 = MouseHandler.MouseHandler_y + 25; // L: 1944 - if (var33 + var29 > 480) { // L: 1945 - var33 = MouseHandler.MouseHandler_y - 25 - var29; // L: 1946 + if (var14) { + var16 = var1.stringWidth(class334.World_worlds[Login.hoveredWorldIndex].activity) + 6; + int var29 = var1.ascent + 8; + int var33 = MouseHandler.MouseHandler_y + 25; + if (var33 + var29 > 480) { + var33 = MouseHandler.MouseHandler_y - 25 - var29; } - Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var16 / 2, var33, var16, var29, 16777120); // L: 1948 - Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var16 / 2, var33, var16, var29, 0); // L: 1949 - var1.drawCentered(class334.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var33 + var1.ascent + 4, 0, -1); // L: 1950 + Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var16 / 2, var33, var16, var29, 16777120); + Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var16 / 2, var33, var16, var29, 0); + var1.drawCentered(class334.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var33 + var1.ascent + 4, 0, -1); } } - class19.rasterProvider.drawFull(0, 0); // L: 1953 - } // L: 1954 + class19.rasterProvider.drawFull(0, 0); + } } diff --git a/runescape-client/src/main/java/Link.java b/runescape-client/src/main/java/Link.java index 03c0a70e31..398451f99b 100644 --- a/runescape-client/src/main/java/Link.java +++ b/runescape-client/src/main/java/Link.java @@ -22,11 +22,11 @@ public class Link { @ObfuscatedName("c") @Export("remove") public void remove() { - if (this.next != null) { // L: 8 - this.next.previous = this.previous; // L: 9 - this.previous.next = this.next; // L: 10 - this.previous = null; // L: 11 - this.next = null; // L: 12 + if (this.next != null) { + this.next.previous = this.previous; + this.previous.next = this.next; + this.previous = null; + this.next = null; } - } // L: 13 + } } diff --git a/runescape-client/src/main/java/LinkDeque.java b/runescape-client/src/main/java/LinkDeque.java index c2475ae9aa..7719a82b4e 100644 --- a/runescape-client/src/main/java/LinkDeque.java +++ b/runescape-client/src/main/java/LinkDeque.java @@ -20,10 +20,10 @@ public class LinkDeque { Link current; public LinkDeque() { - this.sentinel = new Link(); // L: 6 - this.sentinel.previous = this.sentinel; // L: 10 - this.sentinel.next = this.sentinel; // L: 11 - } // L: 12 + this.sentinel = new Link(); + this.sentinel.previous = this.sentinel; + this.sentinel.next = this.sentinel; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -31,15 +31,15 @@ public class LinkDeque { ) @Export("addFirst") public void addFirst(Link var1) { - if (var1.next != null) { // L: 15 + if (var1.next != null) { var1.remove(); } - var1.next = this.sentinel.next; // L: 16 - var1.previous = this.sentinel; // L: 17 - var1.next.previous = var1; // L: 18 - var1.previous.next = var1; // L: 19 - } // L: 20 + var1.next = this.sentinel.next; + var1.previous = this.sentinel; + var1.next.previous = var1; + var1.previous.next = var1; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -47,13 +47,13 @@ public class LinkDeque { ) @Export("last") public Link last() { - Link var1 = this.sentinel.previous; // L: 24 - if (var1 == this.sentinel) { // L: 25 - this.current = null; // L: 26 - return null; // L: 27 + Link var1 = this.sentinel.previous; + if (var1 == this.sentinel) { + this.current = null; + return null; } else { - this.current = var1.previous; // L: 29 - return var1; // L: 30 + this.current = var1.previous; + return var1; } } @@ -63,13 +63,13 @@ public class LinkDeque { ) @Export("previous") public Link previous() { - Link var1 = this.current; // L: 35 - if (var1 == this.sentinel) { // L: 36 - this.current = null; // L: 37 - return null; // L: 38 + Link var1 = this.current; + if (var1 == this.sentinel) { + this.current = null; + return null; } else { - this.current = var1.previous; // L: 40 - return var1; // L: 41 + this.current = var1.previous; + return var1; } } } diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java index 43cdb619e7..46df587968 100644 --- a/runescape-client/src/main/java/Login.java +++ b/runescape-client/src/main/java/Login.java @@ -147,34 +147,34 @@ public class Login { static String[] field893; static { - xPadding = 0; // L: 39 - loginBoxX = xPadding + 202; // L: 58 - Login_loadingPercent = 10; // L: 60 - Login_loadingText = ""; // L: 61 - field871 = -1; // L: 79 - field872 = 1; // L: 82 - loginIndex = 0; // L: 86 - Login_response0 = ""; // L: 87 - Login_response1 = ""; // L: 88 - Login_response2 = ""; // L: 89 - Login_response3 = ""; // L: 90 - Login_username = ""; // L: 91 - Login_password = ""; // L: 92 - field880 = false; // L: 99 - field881 = false; // L: 100 - field882 = true; // L: 103 - currentLoginField = 0; // L: 104 - worldSelectOpen = false; // L: 108 - hoveredWorldIndex = -1; // L: 116 - worldSelectPage = 0; // L: 117 - worldSelectPagesCount = 0; // L: 118 - new DecimalFormat("##0.00"); // L: 121 + xPadding = 0; + loginBoxX = xPadding + 202; + Login_loadingPercent = 10; + Login_loadingText = ""; + field871 = -1; + field872 = 1; + loginIndex = 0; + Login_response0 = ""; + Login_response1 = ""; + Login_response2 = ""; + Login_response3 = ""; + Login_username = ""; + Login_password = ""; + field880 = false; + field881 = false; + field882 = true; + currentLoginField = 0; + worldSelectOpen = false; + hoveredWorldIndex = -1; + worldSelectPage = 0; + worldSelectPagesCount = 0; + new DecimalFormat("##0.00"); new class118(); - field890 = -1L; // L: 129 - field869 = -1L; // L: 130 - field892 = new String[]{"title.jpg"}; // L: 133 + field890 = -1L; + field869 = -1L; + field892 = new String[]{"title.jpg"}; field893 = 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: 136 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -182,7 +182,7 @@ public class Login { garbageValue = "160" ) static class116[] method1994() { - return new class116[]{class116.field1421, class116.field1415, class116.field1416, class116.field1423, class116.field1418, class116.field1419}; // L: 25 + return new class116[]{class116.field1421, class116.field1415, class116.field1416, class116.field1423, class116.field1418, class116.field1419}; } @ObfuscatedName("w") @@ -191,10 +191,10 @@ public class Login { garbageValue = "-721408272" ) static int method1993(int var0, int var1, int var2) { - if ((Tiles.Tiles_renderFlags[var0][var1][var2] & 8) != 0) { // L: 456 + if ((Tiles.Tiles_renderFlags[var0][var1][var2] & 8) != 0) { return 0; } else { - return var0 > 0 && (Tiles.Tiles_renderFlags[1][var1][var2] & 2) != 0 ? var0 - 1 : var0; // L: 457 + return var0 > 0 && (Tiles.Tiles_renderFlags[1][var1][var2] & 2) != 0 ? var0 - 1 : var0; } } @@ -204,17 +204,17 @@ public class Login { garbageValue = "675537632" ) static final int method1995(int var0, int var1) { - if (var0 == -1) { // L: 495 + if (var0 == -1) { return 12345678; } else { - var1 = (var0 & 127) * var1 / 128; // L: 496 - if (var1 < 2) { // L: 497 + var1 = (var0 & 127) * var1 / 128; + if (var1 < 2) { var1 = 2; - } else if (var1 > 126) { // L: 498 + } else if (var1 > 126) { var1 = 126; } - return (var0 & 65408) + var1; // L: 499 + return (var0 & 65408) + var1; } } @@ -224,6 +224,6 @@ public class Login { garbageValue = "-5" ) public static AbstractSocket method1965(Socket var0, int var1, int var2) throws IOException { - return new BufferedNetSocket(var0, var1, var2); // L: 10 + return new BufferedNetSocket(var0, var1, var2); } } diff --git a/runescape-client/src/main/java/LoginPacket.java b/runescape-client/src/main/java/LoginPacket.java index 777952f6d9..9b083c91a7 100644 --- a/runescape-client/src/main/java/LoginPacket.java +++ b/runescape-client/src/main/java/LoginPacket.java @@ -51,29 +51,29 @@ public class LoginPacket implements class251 { public final int id; static { - field3032 = new LoginPacket(14, 0); // L: 5 - field3031 = new LoginPacket(15, 4); // L: 6 - field3038 = new LoginPacket(16, -2); // L: 7 - field3037 = new LoginPacket(18, -2); // L: 8 - field3034 = new LoginPacket(19, -2); // L: 9 - field3035 = new LoginPacket(27, 0); // L: 10 - LoginPacket_indexedValues = new LoginPacket[32]; // L: 12 - LoginPacket[] var0 = new LoginPacket[]{field3031, field3037, field3038, field3034, field3032, field3035}; // L: 17 - LoginPacket[] var1 = var0; // L: 19 + field3032 = new LoginPacket(14, 0); + field3031 = new LoginPacket(15, 4); + field3038 = new LoginPacket(16, -2); + field3037 = new LoginPacket(18, -2); + field3034 = new LoginPacket(19, -2); + field3035 = new LoginPacket(27, 0); + LoginPacket_indexedValues = new LoginPacket[32]; + LoginPacket[] var0 = new LoginPacket[]{field3031, field3037, field3038, field3034, field3032, field3035}; + LoginPacket[] var1 = var0; - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 20 - LoginPacket_indexedValues[var1[var2].id] = var1[var2]; // L: 21 + for (int var2 = 0; var2 < var1.length; ++var2) { + LoginPacket_indexedValues[var1[var2].id] = var1[var2]; } - } // L: 23 + } @ObfuscatedSignature( descriptor = "(II)V", garbageValue = "0" ) LoginPacket(int var1, int var2) { - this.id = var1; // L: 26 - } // L: 27 + this.id = var1; + } @ObfuscatedName("v") @ObfuscatedSignature( @@ -81,14 +81,14 @@ public class LoginPacket implements class251 { garbageValue = "100" ) public static String method5019(CharSequence var0) { - int var2 = var0.length(); // L: 176 - char[] var3 = new char[var2]; // L: 178 + int var2 = var0.length(); + char[] var3 = new char[var2]; - for (int var4 = 0; var4 < var2; ++var4) { // L: 179 + for (int var4 = 0; var4 < var2; ++var4) { var3[var4] = '*'; } - String var1 = new String(var3); // L: 180 - return var1; // L: 182 + String var1 = new String(var3); + return var1; } } diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java index 0cdd7ce0a9..17ad6ec5d0 100644 --- a/runescape-client/src/main/java/LoginScreenAnimation.java +++ b/runescape-client/src/main/java/LoginScreenAnimation.java @@ -72,16 +72,16 @@ public class LoginScreenAnimation { descriptor = "([Lpa;)V" ) LoginScreenAnimation(IndexedSprite[] var1) { - this.field1177 = new int[256]; // L: 13 - this.field1182 = 0; // L: 14 - this.field1175 = 0; // L: 19 - this.field1169 = 0; // L: 20 - this.field1168 = 0; // L: 25 - this.field1181 = 0; // L: 26 - this.field1164 = 0; // L: 27 - this.sprites = var1; // L: 30 - this.initColors(); // L: 31 - } // L: 32 + this.field1177 = new int[256]; + this.field1182 = 0; + this.field1175 = 0; + this.field1169 = 0; + this.field1168 = 0; + this.field1181 = 0; + this.field1164 = 0; + this.sprites = var1; + this.initColors(); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -90,69 +90,69 @@ public class LoginScreenAnimation { ) @Export("initColors") void initColors() { - this.field1171 = new int[256]; // L: 35 + this.field1171 = new int[256]; int var1; - for (var1 = 0; var1 < 64; ++var1) { // L: 36 + for (var1 = 0; var1 < 64; ++var1) { this.field1171[var1] = var1 * 262144; } - for (var1 = 0; var1 < 64; ++var1) { // L: 37 + for (var1 = 0; var1 < 64; ++var1) { this.field1171[var1 + 64] = var1 * 1024 + 16711680; } - for (var1 = 0; var1 < 64; ++var1) { // L: 38 + for (var1 = 0; var1 < 64; ++var1) { this.field1171[var1 + 128] = var1 * 4 + 16776960; } - for (var1 = 0; var1 < 64; ++var1) { // L: 39 + for (var1 = 0; var1 < 64; ++var1) { this.field1171[var1 + 192] = 16777215; } - this.field1174 = new int[256]; // L: 40 + this.field1174 = new int[256]; - for (var1 = 0; var1 < 64; ++var1) { // L: 41 + for (var1 = 0; var1 < 64; ++var1) { this.field1174[var1] = var1 * 1024; } - for (var1 = 0; var1 < 64; ++var1) { // L: 42 + for (var1 = 0; var1 < 64; ++var1) { this.field1174[var1 + 64] = var1 * 4 + 65280; } - for (var1 = 0; var1 < 64; ++var1) { // L: 43 + for (var1 = 0; var1 < 64; ++var1) { this.field1174[var1 + 128] = var1 * 262144 + 65535; } - for (var1 = 0; var1 < 64; ++var1) { // L: 44 + for (var1 = 0; var1 < 64; ++var1) { this.field1174[var1 + 192] = 16777215; } - this.field1173 = new int[256]; // L: 45 + this.field1173 = new int[256]; - for (var1 = 0; var1 < 64; ++var1) { // L: 46 + for (var1 = 0; var1 < 64; ++var1) { this.field1173[var1] = var1 * 4; } - for (var1 = 0; var1 < 64; ++var1) { // L: 47 + for (var1 = 0; var1 < 64; ++var1) { this.field1173[var1 + 64] = var1 * 262144 + 255; } - for (var1 = 0; var1 < 64; ++var1) { // L: 48 + for (var1 = 0; var1 < 64; ++var1) { this.field1173[var1 + 128] = var1 * 1024 + 16711935; } - for (var1 = 0; var1 < 64; ++var1) { // L: 49 + for (var1 = 0; var1 < 64; ++var1) { this.field1173[var1 + 192] = 16777215; } - this.field1170 = new int[256]; // L: 50 - this.field1168 = 0; // L: 51 - this.field1178 = new int[32768]; // L: 52 - this.field1179 = new int[32768]; // L: 53 - this.method2260((IndexedSprite)null); // L: 54 - this.field1176 = new int[32768]; // L: 55 - this.field1183 = new int[32768]; // L: 56 - } // L: 57 + this.field1170 = new int[256]; + this.field1168 = 0; + this.field1178 = new int[32768]; + this.field1179 = new int[32768]; + this.method2260((IndexedSprite)null); + this.field1176 = new int[32768]; + this.field1183 = new int[32768]; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -160,17 +160,17 @@ public class LoginScreenAnimation { garbageValue = "0" ) void method2280() { - this.field1171 = null; // L: 60 - this.field1174 = null; // L: 61 - this.field1173 = null; // L: 62 - this.field1170 = null; // L: 63 - this.field1178 = null; // L: 64 - this.field1179 = null; // L: 65 - this.field1176 = null; // L: 66 - this.field1183 = null; // L: 67 - this.field1168 = 0; // L: 68 - this.field1181 = 0; // L: 69 - } // L: 70 + this.field1171 = null; + this.field1174 = null; + this.field1173 = null; + this.field1170 = null; + this.field1178 = null; + this.field1179 = null; + this.field1176 = null; + this.field1183 = null; + this.field1168 = 0; + this.field1181 = 0; + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -179,26 +179,26 @@ public class LoginScreenAnimation { ) @Export("draw") void draw(int var1, int var2) { - if (this.field1176 == null) { // L: 73 - this.initColors(); // L: 74 + if (this.field1176 == null) { + this.initColors(); } - if (this.field1164 == 0) { // L: 76 - this.field1164 = var2; // L: 77 + if (this.field1164 == 0) { + this.field1164 = var2; } - int var3 = var2 - this.field1164; // L: 79 - if (var3 >= 256) { // L: 80 + int var3 = var2 - this.field1164; + if (var3 >= 256) { var3 = 0; } - this.field1164 = var2; // L: 81 - if (var3 > 0) { // L: 82 - this.method2255(var3); // L: 83 + this.field1164 = var2; + if (var3 > 0) { + this.method2255(var3); } - this.method2257(var1); // L: 85 - } // L: 86 + this.method2257(var1); + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -206,133 +206,133 @@ public class LoginScreenAnimation { garbageValue = "-399944521" ) final void method2255(int var1) { - this.field1168 += var1 * 128; // L: 89 + this.field1168 += var1 * 128; int var2; - if (this.field1168 > this.field1178.length) { // L: 90 - this.field1168 -= this.field1178.length; // L: 91 - var2 = (int)(Math.random() * 12.0D); // L: 92 - this.method2260(this.sprites[var2]); // L: 93 + if (this.field1168 > this.field1178.length) { + this.field1168 -= this.field1178.length; + var2 = (int)(Math.random() * 12.0D); + this.method2260(this.sprites[var2]); } - var2 = 0; // L: 95 - int var3 = var1 * 128; // L: 96 - int var4 = (256 - var1) * 128; // L: 97 + var2 = 0; + int var3 = var1 * 128; + int var4 = (256 - var1) * 128; int var6; - for (int var5 = 0; var5 < var4; ++var5) { // L: 98 - var6 = this.field1176[var3 + var2] - this.field1178[var2 + this.field1168 & this.field1178.length - 1] * var1 / 6; // L: 99 - if (var6 < 0) { // L: 100 + for (int var5 = 0; var5 < var4; ++var5) { + var6 = this.field1176[var3 + var2] - this.field1178[var2 + this.field1168 & this.field1178.length - 1] * var1 / 6; + if (var6 < 0) { var6 = 0; } - this.field1176[var2++] = var6; // L: 101 + this.field1176[var2++] = var6; } - byte var15 = 10; // L: 103 - var6 = 128 - var15; // L: 104 + byte var15 = 10; + var6 = 128 - var15; int var7; int var10; - for (var7 = 256 - var1; var7 < 256; ++var7) { // L: 105 - int var8 = var7 * 128; // L: 106 + for (var7 = 256 - var1; var7 < 256; ++var7) { + int var8 = var7 * 128; - 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 + for (int var9 = 0; var9 < 128; ++var9) { + var10 = (int)(Math.random() * 100.0D); + if (var10 < 50 && var9 > var15 && var9 < var6) { this.field1176[var9 + var8] = 255; } else { - this.field1176[var9 + var8] = 0; // L: 110 + this.field1176[var9 + var8] = 0; } } } - if (this.field1175 > 0) { // L: 113 + if (this.field1175 > 0) { this.field1175 -= var1 * 4; } - if (this.field1169 > 0) { // L: 114 + if (this.field1169 > 0) { this.field1169 -= var1 * 4; } - if (this.field1175 == 0 && this.field1169 == 0) { // L: 115 - var7 = (int)(Math.random() * (double)(2000 / var1)); // L: 116 - if (var7 == 0) { // L: 117 + if (this.field1175 == 0 && this.field1169 == 0) { + var7 = (int)(Math.random() * (double)(2000 / var1)); + if (var7 == 0) { this.field1175 = 1024; } - if (var7 == 1) { // L: 118 + if (var7 == 1) { this.field1169 = 1024; } } - for (var7 = 0; var7 < 256 - var1; ++var7) { // L: 120 + for (var7 = 0; var7 < 256 - var1; ++var7) { this.field1177[var7] = this.field1177[var7 + var1]; } - for (var7 = 256 - var1; var7 < 256; ++var7) { // L: 121 - this.field1177[var7] = (int)(Math.sin((double)this.field1182 / 14.0D) * 16.0D + Math.sin((double)this.field1182 / 15.0D) * 14.0D + Math.sin((double)this.field1182 / 16.0D) * 12.0D); // L: 122 - ++this.field1182; // L: 123 + for (var7 = 256 - var1; var7 < 256; ++var7) { + this.field1177[var7] = (int)(Math.sin((double)this.field1182 / 14.0D) * 16.0D + Math.sin((double)this.field1182 / 15.0D) * 14.0D + Math.sin((double)this.field1182 / 16.0D) * 12.0D); + ++this.field1182; } this.field1181 += var1; - var7 = ((Client.cycle & 1) + var1) / 2; // L: 126 - if (var7 > 0) { // L: 127 - short var16 = 128; // L: 128 - byte var17 = 2; // L: 129 - var10 = 128 - var17 - var17; // L: 130 + var7 = ((Client.cycle & 1) + var1) / 2; + if (var7 > 0) { + short var16 = 128; + byte var17 = 2; + var10 = 128 - var17 - var17; int var11; int var12; int var13; - for (var11 = 0; var11 < this.field1181 * 100; ++var11) { // L: 131 - var12 = (int)(Math.random() * (double)var10) + var17; // L: 132 - var13 = (int)(Math.random() * (double)var16) + var16; // L: 133 - this.field1176[var12 + (var13 << 7)] = 192; // L: 134 + for (var11 = 0; var11 < this.field1181 * 100; ++var11) { + var12 = (int)(Math.random() * (double)var10) + var17; + var13 = (int)(Math.random() * (double)var16) + var16; + this.field1176[var12 + (var13 << 7)] = 192; } - this.field1181 = 0; // L: 136 + this.field1181 = 0; int var14; - for (var11 = 0; var11 < 256; ++var11) { // L: 137 - var12 = 0; // L: 138 - var13 = var11 * 128; // L: 139 + for (var11 = 0; var11 < 256; ++var11) { + var12 = 0; + var13 = var11 * 128; - for (var14 = -var7; var14 < 128; ++var14) { // L: 140 - if (var7 + var14 < 128) { // L: 141 + for (var14 = -var7; var14 < 128; ++var14) { + if (var7 + var14 < 128) { var12 += this.field1176[var7 + var14 + var13]; } - if (var14 - (var7 + 1) >= 0) { // L: 142 + if (var14 - (var7 + 1) >= 0) { var12 -= this.field1176[var14 + var13 - (var7 + 1)]; } - if (var14 >= 0) { // L: 143 + if (var14 >= 0) { this.field1183[var14 + var13] = var12 / (var7 * 2 + 1); } } } - for (var11 = 0; var11 < 128; ++var11) { // L: 146 - var12 = 0; // L: 147 + for (var11 = 0; var11 < 128; ++var11) { + var12 = 0; - for (var13 = -var7; var13 < 256; ++var13) { // L: 148 - var14 = var13 * 128; // L: 149 - if (var13 + var7 < 256) { // L: 150 + for (var13 = -var7; var13 < 256; ++var13) { + var14 = var13 * 128; + if (var13 + var7 < 256) { var12 += this.field1183[var14 + var11 + var7 * 128]; } - if (var13 - (var7 + 1) >= 0) { // L: 151 + if (var13 - (var7 + 1) >= 0) { var12 -= this.field1183[var11 + var14 - (var7 + 1) * 128]; } if (var13 >= 0) { - this.field1176[var11 + var14] = var12 / (var7 * 2 + 1); // L: 152 + this.field1176[var11 + var14] = var12 / (var7 * 2 + 1); } } } } - } // L: 156 + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -340,8 +340,8 @@ public class LoginScreenAnimation { garbageValue = "0" ) final int method2256(int var1, int var2, int var3) { - int var4 = 256 - var3; // L: 159 - return (var3 * (var2 & 65280) + var4 * (var1 & 65280) & 16711680) + (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) >> 8; // L: 160 + int var4 = 256 - var3; + return (var3 * (var2 & 65280) + var4 * (var1 & 65280) & 16711680) + (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) >> 8; } @ObfuscatedName("s") @@ -350,19 +350,19 @@ public class LoginScreenAnimation { garbageValue = "88" ) final void method2257(int var1) { - int var2 = this.field1170.length; // L: 164 - if (this.field1175 > 0) { // L: 165 - this.method2258(this.field1175, this.field1174); // L: 166 - } else if (this.field1169 > 0) { // L: 168 - this.method2258(this.field1169, this.field1173); // L: 169 + int var2 = this.field1170.length; + if (this.field1175 > 0) { + this.method2258(this.field1175, this.field1174); + } else if (this.field1169 > 0) { + this.method2258(this.field1169, this.field1173); } else { - for (int var3 = 0; var3 < var2; ++var3) { // L: 172 + for (int var3 = 0; var3 < var2; ++var3) { this.field1170[var3] = this.field1171[var3]; } } - this.method2276(var1); // L: 174 - } // L: 175 + this.method2276(var1); + } @ObfuscatedName("j") @ObfuscatedSignature( @@ -370,19 +370,19 @@ public class LoginScreenAnimation { garbageValue = "-1795149133" ) final void method2258(int var1, int[] var2) { - int var3 = this.field1170.length; // L: 178 + int var3 = this.field1170.length; - for (int var4 = 0; var4 < var3; ++var4) { // L: 179 - if (var1 > 768) { // L: 180 + for (int var4 = 0; var4 < var3; ++var4) { + if (var1 > 768) { this.field1170[var4] = this.method2256(this.field1171[var4], var2[var4], 1024 - var1); } else if (var1 > 256) { - this.field1170[var4] = var2[var4]; // L: 181 + this.field1170[var4] = var2[var4]; } else { - this.field1170[var4] = this.method2256(var2[var4], this.field1171[var4], 256 - var1); // L: 182 + this.field1170[var4] = this.method2256(var2[var4], this.field1171[var4], 256 - var1); } } - } // L: 184 + } @ObfuscatedName("w") @ObfuscatedSignature( @@ -390,43 +390,43 @@ public class LoginScreenAnimation { garbageValue = "2135286460" ) final void method2276(int var1) { - int var2 = 0; // L: 187 + int var2 = 0; - for (int var3 = 1; var3 < 255; ++var3) { // L: 188 - int var4 = (256 - var3) * this.field1177[var3] / 256; // L: 189 - int var5 = var4 + var1; // L: 190 - int var6 = 0; // L: 191 - int var7 = 128; // L: 192 - if (var5 < 0) { // L: 193 - var6 = -var5; // L: 194 - var5 = 0; // L: 195 + for (int var3 = 1; var3 < 255; ++var3) { + int var4 = (256 - var3) * this.field1177[var3] / 256; + int var5 = var4 + var1; + int var6 = 0; + int var7 = 128; + if (var5 < 0) { + var6 = -var5; + var5 = 0; } - if (var5 + 128 >= class19.rasterProvider.width) { // L: 197 - var7 = class19.rasterProvider.width - var5; // L: 198 + if (var5 + 128 >= class19.rasterProvider.width) { + var7 = class19.rasterProvider.width - var5; } - int var8 = var5 + (var3 + 8) * class19.rasterProvider.width; // L: 200 - var2 += var6; // L: 201 + int var8 = var5 + (var3 + 8) * class19.rasterProvider.width; + var2 += var6; - for (int var9 = var6; var9 < var7; ++var9) { // L: 202 - int var10 = this.field1176[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.field1170[var10]; // L: 208 - int var14 = class19.rasterProvider.pixels[var8]; // L: 209 - class19.rasterProvider.pixels[var8++] = -16777216 | (var13 * (var14 & 65280) + var12 * (var10 & 65280) & 16711680) + ((var14 & 16711935) * var13 + (var10 & 16711935) * var12 & -16711936) >> 8; // L: 210 + for (int var9 = var6; var9 < var7; ++var9) { + int var10 = this.field1176[var2++]; + int var11 = var8 % Rasterizer2D.Rasterizer2D_width; + if (var10 != 0 && var11 >= Rasterizer2D.Rasterizer2D_xClipStart && var11 < Rasterizer2D.Rasterizer2D_xClipEnd) { + int var12 = var10; + int var13 = 256 - var10; + var10 = this.field1170[var10]; + int var14 = class19.rasterProvider.pixels[var8]; + class19.rasterProvider.pixels[var8++] = -16777216 | (var13 * (var14 & 65280) + var12 * (var10 & 65280) & 16711680) + ((var14 & 16711935) * var13 + (var10 & 16711935) * var12 & -16711936) >> 8; } else { - ++var8; // L: 212 + ++var8; } } - var2 += 128 - var7; // L: 214 + var2 += 128 - var7; } - } // L: 216 + } @ObfuscatedName("n") @ObfuscatedSignature( @@ -435,47 +435,47 @@ public class LoginScreenAnimation { ) final void method2260(IndexedSprite var1) { int var2; - for (var2 = 0; var2 < this.field1178.length; ++var2) { // L: 219 + for (var2 = 0; var2 < this.field1178.length; ++var2) { this.field1178[var2] = 0; } int var3; - for (var2 = 0; var2 < 5000; ++var2) { // L: 220 - var3 = (int)(Math.random() * 128.0D * 256.0D); // L: 221 - this.field1178[var3] = (int)(Math.random() * 256.0D); // L: 222 + for (var2 = 0; var2 < 5000; ++var2) { + var3 = (int)(Math.random() * 128.0D * 256.0D); + this.field1178[var3] = (int)(Math.random() * 256.0D); } int var4; int var5; - for (var2 = 0; var2 < 20; ++var2) { // L: 224 - for (var3 = 1; var3 < 255; ++var3) { // L: 225 - for (var4 = 1; var4 < 127; ++var4) { // L: 226 - var5 = var4 + (var3 << 7); // L: 227 - this.field1179[var5] = (this.field1178[var5 + 1] + this.field1178[var5 - 128] + this.field1178[var5 + 128] + this.field1178[var5 - 1]) / 4; // L: 228 + for (var2 = 0; var2 < 20; ++var2) { + for (var3 = 1; var3 < 255; ++var3) { + for (var4 = 1; var4 < 127; ++var4) { + var5 = var4 + (var3 << 7); + this.field1179[var5] = (this.field1178[var5 + 1] + this.field1178[var5 - 128] + this.field1178[var5 + 128] + this.field1178[var5 - 1]) / 4; } } - int[] var8 = this.field1178; // L: 231 - this.field1178 = this.field1179; // L: 232 - this.field1179 = var8; // L: 233 + int[] var8 = this.field1178; + this.field1178 = this.field1179; + this.field1179 = var8; } - if (var1 != null) { // L: 235 - var2 = 0; // L: 236 + if (var1 != null) { + var2 = 0; - for (var3 = 0; var3 < var1.subHeight; ++var3) { // L: 237 - for (var4 = 0; var4 < var1.subWidth; ++var4) { // L: 238 - if (var1.pixels[var2++] != 0) { // L: 239 - var5 = var4 + var1.xOffset + 16; // L: 240 - int var6 = var3 + var1.yOffset + 16; // L: 241 - int var7 = var5 + (var6 << 7); // L: 242 - this.field1178[var7] = 0; // L: 243 + for (var3 = 0; var3 < var1.subHeight; ++var3) { + for (var4 = 0; var4 < var1.subWidth; ++var4) { + if (var1.pixels[var2++] != 0) { + var5 = var4 + var1.xOffset + 16; + int var6 = var3 + var1.yOffset + 16; + int var7 = var5 + (var6 << 7); + this.field1178[var7] = 0; } } } } - } // L: 248 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -483,7 +483,7 @@ public class LoginScreenAnimation { garbageValue = "1954568677" ) static class114[] method2251() { - return new class114[]{class114.field1390, class114.field1383, class114.field1384, class114.field1391, class114.field1386}; // L: 125 + return new class114[]{class114.field1390, class114.field1383, class114.field1384, class114.field1391, class114.field1386}; } @ObfuscatedName("fq") @@ -493,27 +493,27 @@ public class LoginScreenAnimation { ) @Export("logOut") static final void logOut() { - Client.packetWriter.close(); // L: 3544 - UrlRequest.method2496(); // L: 3545 - class7.scene.clear(); // L: 3546 + Client.packetWriter.close(); + UrlRequest.method2496(); + class7.scene.clear(); - for (int var0 = 0; var0 < 4; ++var0) { // L: 3547 + for (int var0 = 0; var0 < 4; ++var0) { Client.collisionMaps[var0].clear(); } - System.gc(); // L: 3548 - class260.musicPlayerStatus = 1; // L: 3550 - class124.musicTrackArchive = null; // L: 3551 - VarcInt.musicTrackGroupId = -1; // L: 3552 - class260.musicTrackFileId = -1; // L: 3553 - ChatChannel.musicTrackVolume = 0; // L: 3554 - DynamicObject.musicTrackBoolean = false; // L: 3555 - class260.pcmSampleLength = 2; // L: 3556 - Client.currentTrackGroupId = -1; // L: 3558 - Client.field743 = false; // L: 3559 - GrandExchangeEvent.method5760(); // L: 3560 - VertexNormal.updateGameState(10); // L: 3561 - } // L: 3562 + System.gc(); + class260.musicPlayerStatus = 1; + class124.musicTrackArchive = null; + VarcInt.musicTrackGroupId = -1; + class260.musicTrackFileId = -1; + ChatChannel.musicTrackVolume = 0; + DynamicObject.musicTrackBoolean = false; + class260.pcmSampleLength = 2; + Client.currentTrackGroupId = -1; + Client.field743 = false; + GrandExchangeEvent.method5760(); + VertexNormal.updateGameState(10); + } @ObfuscatedName("fp") @ObfuscatedSignature( @@ -522,14 +522,14 @@ public class LoginScreenAnimation { ) @Export("queueSoundEffect") static void queueSoundEffect(int var0, int var1, int var2) { - if (SecureRandomFuture.clientPreferences.soundEffectsVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) { // L: 4330 - Client.soundEffectIds[Client.soundEffectCount] = var0; // L: 4331 - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; // L: 4332 - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; // L: 4333 - Client.soundEffects[Client.soundEffectCount] = null; // L: 4334 - Client.soundLocations[Client.soundEffectCount] = 0; // L: 4335 - ++Client.soundEffectCount; // L: 4336 + if (SecureRandomFuture.clientPreferences.soundEffectsVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) { + Client.soundEffectIds[Client.soundEffectCount] = var0; + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; + Client.soundEffects[Client.soundEffectCount] = null; + Client.soundLocations[Client.soundEffectCount] = 0; + ++Client.soundEffectCount; } - } // L: 4338 + } } diff --git a/runescape-client/src/main/java/LoginType.java b/runescape-client/src/main/java/LoginType.java index 8a29695933..c4e95b31ce 100644 --- a/runescape-client/src/main/java/LoginType.java +++ b/runescape-client/src/main/java/LoginType.java @@ -68,31 +68,31 @@ public class LoginType { final String field4400; static { - oldscape = new LoginType(6, 0, "", ""); // L: 5 - field4397 = new LoginType(1, 1, "", ""); // L: 6 - field4402 = new LoginType(8, 2, "", ""); // L: 7 - field4399 = new LoginType(7, 3, "", ""); // L: 8 - field4401 = new LoginType(4, 4, "", ""); // L: 9 - field4407 = new LoginType(5, 5, "", ""); // L: 10 - field4403 = new LoginType(2, 6, "", ""); // L: 11 - field4404 = new LoginType(0, 7, "", ""); // L: 12 - field4405 = new LoginType(3, -1, "", "", true, new LoginType[]{oldscape, field4397, field4402, field4401, field4399}); // L: 13 + oldscape = new LoginType(6, 0, "", ""); + field4397 = new LoginType(1, 1, "", ""); + field4402 = new LoginType(8, 2, "", ""); + field4399 = new LoginType(7, 3, "", ""); + field4401 = new LoginType(4, 4, "", ""); + field4407 = new LoginType(5, 5, "", ""); + field4403 = new LoginType(2, 6, "", ""); + field4404 = new LoginType(0, 7, "", ""); + field4405 = new LoginType(3, -1, "", "", true, new LoginType[]{oldscape, field4397, field4402, field4401, field4399}); } LoginType(int var1, int var2, String var3, String var4) { - this.field4406 = var1; // L: 18 - this.field4400 = var4; // L: 19 - } // L: 20 + this.field4406 = var1; + this.field4400 = var4; + } @ObfuscatedSignature( descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Low;)V" ) LoginType(int var1, int var2, String var3, String var4, boolean var5, LoginType[] var6) { - this.field4406 = var1; // L: 23 - this.field4400 = var4; // L: 24 - } // L: 25 + this.field4406 = var1; + this.field4400 = var4; + } public String toString() { - return this.field4400; // L: 29 + return this.field4400; } } diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java index 14a202e6e6..24cf231e78 100644 --- a/runescape-client/src/main/java/MenuAction.java +++ b/runescape-client/src/main/java/MenuAction.java @@ -36,7 +36,7 @@ public class MenuAction { String action; MenuAction() { - } // L: 12768 + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -44,18 +44,18 @@ public class MenuAction { garbageValue = "1427914294" ) public static void method1961() { - synchronized(MouseHandler.MouseHandler_instance) { // L: 58 - MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; // L: 59 + synchronized(MouseHandler.MouseHandler_instance) { + MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; - MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; // L: 61 - MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; // L: 62 - MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; // L: 63 - MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; // L: 64 - MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; // L: 65 - MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; // L: 66 - MouseHandler.MouseHandler_lastButtonVolatile = 0; // L: 67 + MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; + MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; + MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; + MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; + MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; + MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; + MouseHandler.MouseHandler_lastButtonVolatile = 0; } - } // L: 69 + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -63,7 +63,7 @@ public class MenuAction { garbageValue = "33" ) public static long method1960(int var0) { - return ViewportMouse.ViewportMouse_entityTags[var0]; // L: 60 + return ViewportMouse.ViewportMouse_entityTags[var0]; } @ObfuscatedName("t") @@ -73,31 +73,31 @@ public class MenuAction { ) static final void method1959(int var0, int var1, int var2) { int var3; - for (var3 = 0; var3 < 8; ++var3) { // L: 111 - for (int var4 = 0; var4 < 8; ++var4) { // L: 112 + for (var3 = 0; var3 < 8; ++var3) { + for (int var4 = 0; var4 < 8; ++var4) { Tiles.Tiles_heights[var0][var3 + var1][var4 + var2] = 0; } } - if (var1 > 0) { // L: 114 - for (var3 = 1; var3 < 8; ++var3) { // L: 115 + if (var1 > 0) { + for (var3 = 1; var3 < 8; ++var3) { Tiles.Tiles_heights[var0][var1][var3 + var2] = Tiles.Tiles_heights[var0][var1 - 1][var3 + var2]; } } - if (var2 > 0) { // L: 117 - for (var3 = 1; var3 < 8; ++var3) { // L: 118 + 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: 120 + if (var1 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2] != 0) { Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2]; - } else if (var2 > 0 && Tiles.Tiles_heights[var0][var1][var2 - 1] != 0) { // L: 121 + } else if (var2 > 0 && Tiles.Tiles_heights[var0][var1][var2 - 1] != 0) { Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1][var2 - 1]; - } else if (var1 > 0 && var2 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2 - 1] != 0) { // L: 122 + } else if (var1 > 0 && var2 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2 - 1] != 0) { Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2 - 1]; } - } // L: 123 + } } diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java index 85b22d65f3..a6b0243341 100644 --- a/runescape-client/src/main/java/Message.java +++ b/runescape-client/src/main/java/Message.java @@ -54,10 +54,10 @@ public class Message extends DualNode { 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.set(var1, var2, var3, var4); // L: 19 - } // L: 20 + this.isFromFriend0 = TriBool.TriBool_unknown; + this.isFromIgnored0 = TriBool.TriBool_unknown; + this.set(var1, var2, var3, var4); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -66,17 +66,17 @@ public class Message extends DualNode { ) @Export("set") void set(int var1, String var2, String var3, String var4) { - int var5 = ++Messages.Messages_count - 1; // L: 25 - this.count = var5; // L: 27 - this.cycle = Client.cycle; // L: 28 - this.type = var1; // L: 29 - this.sender = var2; // L: 30 - this.fillSenderUsername(); // L: 31 - this.prefix = var3; // L: 32 - this.text = var4; // L: 33 - this.clearIsFromFriend(); // L: 34 - this.clearIsFromIgnored(); // L: 35 - } // L: 36 + int var5 = ++Messages.Messages_count - 1; + this.count = var5; + this.cycle = Client.cycle; + this.type = var1; + this.sender = var2; + this.fillSenderUsername(); + this.prefix = var3; + this.text = var4; + this.clearIsFromFriend(); + this.clearIsFromIgnored(); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -85,8 +85,8 @@ public class Message extends DualNode { ) @Export("clearIsFromFriend") void clearIsFromFriend() { - this.isFromFriend0 = TriBool.TriBool_unknown; // L: 39 - } // L: 40 + this.isFromFriend0 = TriBool.TriBool_unknown; + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -95,11 +95,11 @@ public class Message extends DualNode { ) @Export("isFromFriend") final boolean isFromFriend() { - if (this.isFromFriend0 == TriBool.TriBool_unknown) { // L: 43 - this.fillIsFromFriend(); // L: 44 + if (this.isFromFriend0 == TriBool.TriBool_unknown) { + this.fillIsFromFriend(); } - return this.isFromFriend0 == TriBool.TriBool_true; // L: 46 + return this.isFromFriend0 == TriBool.TriBool_true; } @ObfuscatedName("m") @@ -109,8 +109,8 @@ public class Message extends DualNode { ) @Export("fillIsFromFriend") void fillIsFromFriend() { - this.isFromFriend0 = GameEngine.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 50 - } // L: 51 + this.isFromFriend0 = GameEngine.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -119,8 +119,8 @@ public class Message extends DualNode { ) @Export("clearIsFromIgnored") void clearIsFromIgnored() { - this.isFromIgnored0 = TriBool.TriBool_unknown; // L: 54 - } // L: 55 + this.isFromIgnored0 = TriBool.TriBool_unknown; + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -129,11 +129,11 @@ public class Message extends DualNode { ) @Export("isFromIgnored") final boolean isFromIgnored() { - if (this.isFromIgnored0 == TriBool.TriBool_unknown) { // L: 58 - this.fillIsFromIgnored(); // L: 59 + if (this.isFromIgnored0 == TriBool.TriBool_unknown) { + this.fillIsFromIgnored(); } - return this.isFromIgnored0 == TriBool.TriBool_true; // L: 61 + return this.isFromIgnored0 == TriBool.TriBool_true; } @ObfuscatedName("j") @@ -143,8 +143,8 @@ public class Message extends DualNode { ) @Export("fillIsFromIgnored") void fillIsFromIgnored() { - this.isFromIgnored0 = GameEngine.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 65 - } // L: 66 + this.isFromIgnored0 = GameEngine.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; + } @ObfuscatedName("w") @ObfuscatedSignature( @@ -153,13 +153,13 @@ public class Message extends DualNode { ) @Export("fillSenderUsername") final void fillSenderUsername() { - if (this.sender != null) { // L: 69 + if (this.sender != null) { this.senderUsername = new Username(AbstractWorldMapData.method4791(this.sender), class194.loginType); } else { - this.senderUsername = null; // L: 70 + this.senderUsername = null; } - } // L: 71 + } @ObfuscatedName("in") @ObfuscatedSignature( @@ -167,40 +167,40 @@ public class Message extends DualNode { garbageValue = "1989735073" ) static final void method1115() { - boolean var0 = false; // L: 10008 + boolean var0 = false; - while (!var0) { // L: 10009 - var0 = true; // L: 10010 + while (!var0) { + var0 = true; - for (int var1 = 0; var1 < Client.menuOptionsCount - 1; ++var1) { // L: 10011 - if (Client.menuOpcodes[var1] < 1000 && Client.menuOpcodes[var1 + 1] > 1000) { // L: 10012 - String var2 = Client.menuTargets[var1]; // L: 10013 - Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; // L: 10014 - Client.menuTargets[var1 + 1] = var2; // L: 10015 - String var3 = Client.menuActions[var1]; // L: 10016 - Client.menuActions[var1] = Client.menuActions[var1 + 1]; // L: 10017 - Client.menuActions[var1 + 1] = var3; // L: 10018 - int var4 = Client.menuOpcodes[var1]; // L: 10019 - Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; // L: 10020 - Client.menuOpcodes[var1 + 1] = var4; // L: 10021 - var4 = Client.menuArguments1[var1]; // L: 10022 - Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; // L: 10023 - Client.menuArguments1[var1 + 1] = var4; // L: 10024 - var4 = Client.menuArguments2[var1]; // L: 10025 - Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; // L: 10026 - Client.menuArguments2[var1 + 1] = var4; // L: 10027 - var4 = Client.menuIdentifiers[var1]; // L: 10028 - Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; // L: 10029 - Client.menuIdentifiers[var1 + 1] = var4; // L: 10030 - boolean var5 = Client.menuShiftClick[var1]; // L: 10031 - Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; // L: 10032 - Client.menuShiftClick[var1 + 1] = var5; // L: 10033 - var0 = false; // L: 10034 + for (int var1 = 0; var1 < Client.menuOptionsCount - 1; ++var1) { + if (Client.menuOpcodes[var1] < 1000 && Client.menuOpcodes[var1 + 1] > 1000) { + String var2 = Client.menuTargets[var1]; + Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; + Client.menuTargets[var1 + 1] = var2; + String var3 = Client.menuActions[var1]; + Client.menuActions[var1] = Client.menuActions[var1 + 1]; + Client.menuActions[var1 + 1] = var3; + int var4 = Client.menuOpcodes[var1]; + Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; + Client.menuOpcodes[var1 + 1] = var4; + var4 = Client.menuArguments1[var1]; + Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; + Client.menuArguments1[var1 + 1] = var4; + var4 = Client.menuArguments2[var1]; + Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; + Client.menuArguments2[var1 + 1] = var4; + var4 = Client.menuIdentifiers[var1]; + Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; + Client.menuIdentifiers[var1 + 1] = var4; + boolean var5 = Client.menuShiftClick[var1]; + Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; + Client.menuShiftClick[var1 + 1] = var5; + var0 = false; } } } - } // L: 10038 + } @ObfuscatedName("kf") @ObfuscatedSignature( @@ -209,8 +209,8 @@ public class Message extends DualNode { ) @Export("runIntfCloseListeners") static final void runIntfCloseListeners(int var0, int var1) { - if (class242.loadInterface(var0)) { // L: 11879 - Canvas.runComponentCloseListeners(MouseRecorder.Widget_interfaceComponents[var0], var1); // L: 11880 + if (class242.loadInterface(var0)) { + Canvas.runComponentCloseListeners(MouseRecorder.Widget_interfaceComponents[var0], var1); } - } // L: 11881 + } } diff --git a/runescape-client/src/main/java/Messages.java b/runescape-client/src/main/java/Messages.java index 795b23b5c8..3fc6ddbc9f 100644 --- a/runescape-client/src/main/java/Messages.java +++ b/runescape-client/src/main/java/Messages.java @@ -53,9 +53,9 @@ public class Messages { static int field1277; static { - Messages_channels = new HashMap(); // L: 9 - Messages_hashTable = new IterableNodeHashTable(1024); // L: 10 - Messages_queue = new IterableDualNodeQueue(); // L: 11 - Messages_count = 0; // L: 12 + Messages_channels = new HashMap(); + Messages_hashTable = new IterableNodeHashTable(1024); + Messages_queue = new IterableDualNodeQueue(); + Messages_count = 0; } } diff --git a/runescape-client/src/main/java/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java index a72033cfab..3d6ac888dd 100644 --- a/runescape-client/src/main/java/MidiFileReader.java +++ b/runescape-client/src/main/java/MidiFileReader.java @@ -34,229 +34,229 @@ public class MidiFileReader { long field3098; static { - field3106 = 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 + field3106 = new byte[]{2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; } MidiFileReader(byte[] var1) { this.buffer = new Buffer((byte[])null); - this.parse(var1); // L: 26 - } // L: 27 + this.parse(var1); + } MidiFileReader() { - this.buffer = new Buffer((byte[])null); // L: 8 - } // L: 23 + this.buffer = new Buffer((byte[])null); + } @ObfuscatedName("c") @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.field3103 = 500000; // L: 37 - this.trackStarts = new int[var2]; // L: 38 + this.buffer.array = var1; + this.buffer.offset = 10; + int var2 = this.buffer.readUnsignedShort(); + this.division = this.buffer.readUnsignedShort(); + this.field3103 = 500000; + this.trackStarts = new int[var2]; Buffer var10000; int var3; int var5; - for (var3 = 0; var3 < var2; var10000.offset += var5) { // L: 39 - int var4 = this.buffer.readInt(); // L: 40 - var5 = this.buffer.readInt(); // L: 41 - if (var4 == 1297379947) { // L: 42 - this.trackStarts[var3] = this.buffer.offset; // L: 43 - ++var3; // L: 44 + for (var3 = 0; var3 < var2; var10000.offset += var5) { + int var4 = this.buffer.readInt(); + var5 = this.buffer.readInt(); + if (var4 == 1297379947) { + this.trackStarts[var3] = this.buffer.offset; + ++var3; } - var10000 = this.buffer; // L: 46 + var10000 = this.buffer; } - this.field3098 = 0L; // L: 48 - this.trackPositions = new int[var2]; // L: 49 + this.field3098 = 0L; + this.trackPositions = new int[var2]; - for (var3 = 0; var3 < var2; ++var3) { // L: 50 + for (var3 = 0; var3 < var2; ++var3) { this.trackPositions[var3] = this.trackStarts[var3]; } - this.trackLengths = new int[var2]; // L: 51 - this.field3100 = new int[var2]; // L: 52 - } // L: 53 + this.trackLengths = new int[var2]; + this.field3100 = new int[var2]; + } @ObfuscatedName("b") @Export("clear") void clear() { - this.buffer.array = null; // L: 56 - this.trackStarts = null; // L: 57 - this.trackPositions = null; // L: 58 - this.trackLengths = null; // L: 59 - this.field3100 = null; // L: 60 - } // L: 61 + this.buffer.array = null; + this.trackStarts = null; + this.trackPositions = null; + this.trackLengths = null; + this.field3100 = null; + } @ObfuscatedName("p") @Export("isReady") boolean isReady() { - return this.buffer.array != null; // L: 64 + return this.buffer.array != null; } @ObfuscatedName("m") @Export("trackCount") int trackCount() { - return this.trackPositions.length; // L: 68 + return this.trackPositions.length; } @ObfuscatedName("t") @Export("gotoTrack") void gotoTrack(int var1) { - this.buffer.offset = this.trackPositions[var1]; // L: 72 - } // L: 73 + this.buffer.offset = this.trackPositions[var1]; + } @ObfuscatedName("s") @Export("markTrackPosition") void markTrackPosition(int var1) { - this.trackPositions[var1] = this.buffer.offset; // L: 76 - } // L: 77 + this.trackPositions[var1] = this.buffer.offset; + } @ObfuscatedName("j") @Export("setTrackDone") void setTrackDone() { - this.buffer.offset = -1; // L: 80 - } // L: 81 + this.buffer.offset = -1; + } @ObfuscatedName("w") @Export("readTrackLength") void readTrackLength(int var1) { - int var2 = this.buffer.readVarInt(); // L: 84 + int var2 = this.buffer.readVarInt(); int[] var10000 = this.trackLengths; - var10000[var1] += var2; // L: 85 - } // L: 86 + var10000[var1] += var2; + } @ObfuscatedName("n") @Export("readMessage") int readMessage(int var1) { - int var2 = this.readMessage0(var1); // L: 89 - return var2; // L: 90 + int var2 = this.readMessage0(var1); + return var2; } @ObfuscatedName("r") @Export("readMessage0") int readMessage0(int var1) { - byte var2 = this.buffer.array[this.buffer.offset]; // L: 94 + byte var2 = this.buffer.array[this.buffer.offset]; int var5; - if (var2 < 0) { // L: 95 - var5 = var2 & 255; // L: 96 - this.field3100[var1] = var5; // L: 97 - ++this.buffer.offset; // L: 98 + if (var2 < 0) { + var5 = var2 & 255; + this.field3100[var1] = var5; + ++this.buffer.offset; } else { - var5 = this.field3100[var1]; // L: 101 + var5 = this.field3100[var1]; } - if (var5 != 240 && var5 != 247) { // L: 103 - return this.method5208(var1, var5); // L: 116 + if (var5 != 240 && var5 != 247) { + return this.method5208(var1, var5); } 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.field3100[var1] = var4; // L: 109 - return this.method5208(var1, var4); // L: 110 + int var3 = this.buffer.readVarInt(); + if (var5 == 247 && var3 > 0) { + int var4 = this.buffer.array[this.buffer.offset] & 255; + if (var4 >= 241 && var4 <= 243 || var4 == 246 || var4 == 248 || var4 >= 250 && var4 <= 252 || var4 == 254) { + ++this.buffer.offset; + this.field3100[var1] = var4; + return this.method5208(var1, var4); } } - Buffer var10000 = this.buffer; // L: 113 + Buffer var10000 = this.buffer; var10000.offset += var3; - return 0; // L: 114 + return 0; } } @ObfuscatedName("o") int method5208(int var1, int var2) { int var4; - if (var2 == 255) { // L: 120 - int var7 = this.buffer.readUnsignedByte(); // L: 121 - var4 = this.buffer.readVarInt(); // L: 122 + if (var2 == 255) { + int var7 = this.buffer.readUnsignedByte(); + var4 = this.buffer.readVarInt(); Buffer var10000; - if (var7 == 47) { // L: 123 - var10000 = this.buffer; // L: 124 + if (var7 == 47) { + var10000 = this.buffer; var10000.offset += var4; - return 1; // L: 125 - } else if (var7 == 81) { // L: 127 - int var5 = this.buffer.readMedium(); // L: 128 - var4 -= 3; // L: 129 - int var6 = this.trackLengths[var1]; // L: 130 - this.field3098 += (long)var6 * (long)(this.field3103 - var5); // L: 131 - this.field3103 = var5; // L: 132 - var10000 = this.buffer; // L: 133 + return 1; + } else if (var7 == 81) { + int var5 = this.buffer.readMedium(); + var4 -= 3; + int var6 = this.trackLengths[var1]; + this.field3098 += (long)var6 * (long)(this.field3103 - var5); + this.field3103 = var5; + var10000 = this.buffer; var10000.offset += var4; - return 2; // L: 134 + return 2; } else { - var10000 = this.buffer; // L: 136 + var10000 = this.buffer; var10000.offset += var4; - return 3; // L: 137 + return 3; } } else { - byte var3 = field3106[var2 - 128]; // L: 139 - var4 = var2; // L: 140 - if (var3 >= 1) { // L: 141 + byte var3 = field3106[var2 - 128]; + var4 = var2; + if (var3 >= 1) { var4 = var2 | this.buffer.readUnsignedByte() << 8; } - if (var3 >= 2) { // L: 142 + if (var3 >= 2) { var4 |= this.buffer.readUnsignedByte() << 16; } - return var4; // L: 143 + return var4; } } @ObfuscatedName("v") long method5202(int var1) { - return this.field3098 + (long)var1 * (long)this.field3103; // L: 147 + return this.field3098 + (long)var1 * (long)this.field3103; } @ObfuscatedName("d") @Export("getPrioritizedTrack") int getPrioritizedTrack() { - int var1 = this.trackPositions.length; // L: 151 - int var2 = -1; // L: 152 - int var3 = Integer.MAX_VALUE; // L: 153 + int var1 = this.trackPositions.length; + int var2 = -1; + int var3 = Integer.MAX_VALUE; - for (int var4 = 0; var4 < var1; ++var4) { // L: 154 - if (this.trackPositions[var4] >= 0 && this.trackLengths[var4] < var3) { // L: 155 156 - var2 = var4; // L: 157 - var3 = this.trackLengths[var4]; // L: 158 + for (int var4 = 0; var4 < var1; ++var4) { + if (this.trackPositions[var4] >= 0 && this.trackLengths[var4] < var3) { + var2 = var4; + var3 = this.trackLengths[var4]; } } - return var2; // L: 161 + return var2; } @ObfuscatedName("h") @Export("isDone") boolean isDone() { - int var1 = this.trackPositions.length; // L: 165 + int var1 = this.trackPositions.length; - for (int var2 = 0; var2 < var1; ++var2) { // L: 166 + for (int var2 = 0; var2 < var1; ++var2) { if (this.trackPositions[var2] >= 0) { return false; } } - return true; // L: 167 + return true; } @ObfuscatedName("g") @Export("reset") void reset(long var1) { - this.field3098 = var1; // L: 171 - int var3 = this.trackPositions.length; // L: 172 + this.field3098 = var1; + int var3 = this.trackPositions.length; - for (int var4 = 0; var4 < var3; ++var4) { // L: 173 - this.trackLengths[var4] = 0; // L: 174 - this.field3100[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 + for (int var4 = 0; var4 < var3; ++var4) { + this.trackLengths[var4] = 0; + this.field3100[var4] = 0; + this.buffer.offset = this.trackStarts[var4]; + this.readTrackLength(var4); + this.trackPositions[var4] = this.buffer.offset; } - } // L: 180 + } } diff --git a/runescape-client/src/main/java/MidiPcmStream.java b/runescape-client/src/main/java/MidiPcmStream.java index 332c70f6fc..e3ffe1eddb 100644 --- a/runescape-client/src/main/java/MidiPcmStream.java +++ b/runescape-client/src/main/java/MidiPcmStream.java @@ -107,30 +107,30 @@ public class MidiPcmStream extends PcmStream { MusicPatchPcmStream patchStream; public MidiPcmStream() { - this.field3069 = 256; // L: 14 - this.field3075 = 1000000; // L: 15 - this.field3071 = new int[16]; // L: 16 - this.field3089 = new int[16]; // L: 17 - this.field3076 = new int[16]; // L: 18 - this.field3092 = new int[16]; // L: 19 - this.field3095 = new int[16]; // L: 20 - this.field3096 = new int[16]; // L: 21 - this.field3077 = new int[16]; // L: 22 - this.field3078 = new int[16]; // L: 23 - this.field3079 = new int[16]; // L: 24 - this.field3081 = new int[16]; // L: 28 - this.field3082 = new int[16]; // L: 29 - this.field3091 = new int[16]; // L: 30 - this.field3084 = new int[16]; // L: 31 - this.field3085 = new int[16]; // L: 32 - this.field3086 = new int[16]; // L: 33 - this.field3087 = new MusicPatchNode[16][128]; // L: 34 - this.field3088 = 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.method5091(); // L: 46 - } // L: 47 + this.field3069 = 256; + this.field3075 = 1000000; + this.field3071 = new int[16]; + this.field3089 = new int[16]; + this.field3076 = new int[16]; + this.field3092 = new int[16]; + this.field3095 = new int[16]; + this.field3096 = new int[16]; + this.field3077 = new int[16]; + this.field3078 = new int[16]; + this.field3079 = new int[16]; + this.field3081 = new int[16]; + this.field3082 = new int[16]; + this.field3091 = new int[16]; + this.field3084 = new int[16]; + this.field3085 = new int[16]; + this.field3086 = new int[16]; + this.field3087 = new MusicPatchNode[16][128]; + this.field3088 = new MusicPatchNode[16][128]; + this.midiFile = new MidiFileReader(); + this.patchStream = new MusicPatchPcmStream(this); + this.musicPatches = new NodeHashTable(128); + this.method5091(); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -139,8 +139,8 @@ public class MidiPcmStream extends PcmStream { ) @Export("setPcmStreamVolume") public synchronized void setPcmStreamVolume(int var1) { - this.field3069 = var1; // L: 50 - } // L: 51 + this.field3069 = var1; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -148,7 +148,7 @@ public class MidiPcmStream extends PcmStream { garbageValue = "600611451" ) int method5073() { - return this.field3069; // L: 54 + return this.field3069; } @ObfuscatedName("p") @@ -158,44 +158,44 @@ public class MidiPcmStream extends PcmStream { ) @Export("loadMusicTrack") public synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) { - var1.method5280(); // L: 58 - boolean var5 = true; // L: 59 - int[] var6 = null; // L: 60 - if (var4 > 0) { // L: 61 + var1.method5280(); + boolean var5 = true; + int[] var6 = null; + if (var4 > 0) { var6 = new int[]{var4}; } - for (ByteArrayNode var7 = (ByteArrayNode)var1.table.first(); var7 != null; var7 = (ByteArrayNode)var1.table.next()) { // L: 62 - int var8 = (int)var7.key; // L: 63 - MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)var8); // L: 64 - if (var9 == null) { // L: 65 - byte[] var11 = var2.takeFileFlat(var8); // L: 68 + for (ByteArrayNode var7 = (ByteArrayNode)var1.table.first(); var7 != null; var7 = (ByteArrayNode)var1.table.next()) { + int var8 = (int)var7.key; + MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)var8); + if (var9 == null) { + byte[] var11 = var2.takeFileFlat(var8); MusicPatch var10; - if (var11 == null) { // L: 69 - var10 = null; // L: 70 + if (var11 == null) { + var10 = null; } else { - var10 = new MusicPatch(var11); // L: 73 + var10 = new MusicPatch(var11); } - var9 = var10; // L: 75 - if (var10 == null) { // L: 76 - var5 = false; // L: 77 + var9 = var10; + if (var10 == null) { + var5 = false; continue; } - this.musicPatches.put(var10, (long)var8); // L: 80 + this.musicPatches.put(var10, (long)var8); } - if (!var9.method5253(var3, var7.byteArray, var6)) { // L: 82 + if (!var9.method5253(var3, var7.byteArray, var6)) { var5 = false; } } - if (var5) { // L: 84 + if (var5) { var1.clear(); } - return var5; // L: 85 + return var5; } @ObfuscatedName("m") @@ -205,11 +205,11 @@ public class MidiPcmStream extends PcmStream { ) @Export("clearAll") public synchronized void clearAll() { - for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { // L: 89 + for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { var1.clear(); } - } // L: 90 + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -218,11 +218,11 @@ public class MidiPcmStream extends PcmStream { ) @Export("removeAll") synchronized void removeAll() { - for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { // L: 93 + for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { var1.remove(); } - } // L: 94 + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -230,7 +230,7 @@ public class MidiPcmStream extends PcmStream { ) @Export("firstSubStream") protected synchronized PcmStream firstSubStream() { - return this.patchStream; // L: 469 + return this.patchStream; } @ObfuscatedName("j") @@ -239,38 +239,38 @@ public class MidiPcmStream extends PcmStream { ) @Export("nextSubStream") protected synchronized PcmStream nextSubStream() { - return null; // L: 473 + return null; } @ObfuscatedName("w") protected synchronized int vmethod5260() { - return 0; // L: 477 + return 0; } @ObfuscatedName("n") @Export("fill") protected synchronized void fill(int[] var1, int var2, int var3) { - if (this.midiFile.isReady()) { // L: 481 - int var4 = this.midiFile.division * this.field3075 / class339.field4058; // L: 482 + if (this.midiFile.isReady()) { + int var4 = this.midiFile.division * this.field3075 / class339.field4058; do { - long var5 = this.field3093 + (long)var4 * (long)var3; // L: 484 - if (this.field3094 - var5 >= 0L) { // L: 485 - this.field3093 = var5; // L: 486 + long var5 = this.field3093 + (long)var4 * (long)var3; + if (this.field3094 - var5 >= 0L) { + this.field3093 = var5; break; } - int var7 = (int)(((long)var4 + (this.field3094 - this.field3093) - 1L) / (long)var4); // L: 489 - this.field3093 += (long)var4 * (long)var7; // L: 490 - this.patchStream.fill(var1, var2, var7); // L: 491 - var2 += var7; // L: 492 - var3 -= var7; // L: 493 - this.method5104(); // L: 494 - } while(this.midiFile.isReady()); // L: 495 + int var7 = (int)(((long)var4 + (this.field3094 - this.field3093) - 1L) / (long)var4); + this.field3093 += (long)var4 * (long)var7; + this.patchStream.fill(var1, var2, var7); + var2 += var7; + var3 -= var7; + this.method5104(); + } while(this.midiFile.isReady()); } - this.patchStream.fill(var1, var2, var3); // L: 498 - } // L: 499 + this.patchStream.fill(var1, var2, var3); + } @ObfuscatedName("r") @ObfuscatedSignature( @@ -279,46 +279,46 @@ public class MidiPcmStream extends PcmStream { ) @Export("setMusicTrack") public synchronized void setMusicTrack(MusicTrack var1, boolean var2) { - this.clear(); // L: 97 - this.midiFile.parse(var1.midi); // L: 98 - this.field3072 = var2; // L: 99 - this.field3093 = 0L; // L: 100 - int var3 = this.midiFile.trackCount(); // L: 101 + this.clear(); + this.midiFile.parse(var1.midi); + this.field3072 = var2; + this.field3093 = 0L; + int var3 = this.midiFile.trackCount(); - for (int var4 = 0; var4 < var3; ++var4) { // L: 102 - this.midiFile.gotoTrack(var4); // L: 103 - this.midiFile.readTrackLength(var4); // L: 104 - this.midiFile.markTrackPosition(var4); // L: 105 + for (int var4 = 0; var4 < var3; ++var4) { + this.midiFile.gotoTrack(var4); + this.midiFile.readTrackLength(var4); + this.midiFile.markTrackPosition(var4); } - this.track = this.midiFile.getPrioritizedTrack(); // L: 107 - this.trackLength = this.midiFile.trackLengths[this.track]; // L: 108 - this.field3094 = this.midiFile.method5202(this.trackLength); // L: 109 - } // L: 110 + this.track = this.midiFile.getPrioritizedTrack(); + this.trackLength = this.midiFile.trackLengths[this.track]; + this.field3094 = this.midiFile.method5202(this.trackLength); + } @ObfuscatedName("o") @Export("skip") protected synchronized void skip(int var1) { - if (this.midiFile.isReady()) { // L: 502 - int var2 = this.midiFile.division * this.field3075 / class339.field4058; // L: 503 + if (this.midiFile.isReady()) { + int var2 = this.midiFile.division * this.field3075 / class339.field4058; do { - long var3 = this.field3093 + (long)var1 * (long)var2; // L: 505 - if (this.field3094 - var3 >= 0L) { // L: 506 - this.field3093 = var3; // L: 507 + long var3 = this.field3093 + (long)var1 * (long)var2; + if (this.field3094 - var3 >= 0L) { + this.field3093 = var3; break; } - int var5 = (int)(((long)var2 + (this.field3094 - this.field3093) - 1L) / (long)var2); // L: 510 - this.field3093 += (long)var5 * (long)var2; // L: 511 - this.patchStream.skip(var5); // L: 512 - var1 -= var5; // L: 513 - this.method5104(); // L: 514 - } while(this.midiFile.isReady()); // L: 515 + int var5 = (int)(((long)var2 + (this.field3094 - this.field3093) - 1L) / (long)var2); + this.field3093 += (long)var5 * (long)var2; + this.patchStream.skip(var5); + var1 -= var5; + this.method5104(); + } while(this.midiFile.isReady()); } - this.patchStream.skip(var1); // L: 518 - } // L: 519 + this.patchStream.skip(var1); + } @ObfuscatedName("v") @ObfuscatedSignature( @@ -327,9 +327,9 @@ public class MidiPcmStream extends PcmStream { ) @Export("clear") public synchronized void clear() { - this.midiFile.clear(); // L: 113 - this.method5091(); // L: 114 - } // L: 115 + this.midiFile.clear(); + this.method5091(); + } @ObfuscatedName("d") @ObfuscatedSignature( @@ -338,7 +338,7 @@ public class MidiPcmStream extends PcmStream { ) @Export("isReady") synchronized boolean isReady() { - return this.midiFile.isReady(); // L: 118 + return this.midiFile.isReady(); } @ObfuscatedName("h") @@ -347,8 +347,8 @@ public class MidiPcmStream extends PcmStream { garbageValue = "-1583384688" ) public synchronized void method5079(int var1, int var2) { - this.method5080(var1, var2); // L: 122 - } // L: 123 + this.method5080(var1, var2); + } @ObfuscatedName("g") @ObfuscatedSignature( @@ -356,10 +356,10 @@ public class MidiPcmStream extends PcmStream { garbageValue = "3" ) void method5080(int var1, int var2) { - this.field3092[var1] = var2; // L: 126 - this.field3096[var1] = var2 & -128; // L: 127 - this.method5081(var1, var2); // L: 128 - } // L: 129 + this.field3092[var1] = var2; + this.field3096[var1] = var2 & -128; + this.method5081(var1, var2); + } @ObfuscatedName("e") @ObfuscatedSignature( @@ -367,15 +367,15 @@ public class MidiPcmStream extends PcmStream { garbageValue = "-1761005899" ) void method5081(int var1, int var2) { - if (var2 != this.field3095[var1]) { // L: 132 - this.field3095[var1] = var2; // L: 133 + if (var2 != this.field3095[var1]) { + this.field3095[var1] = var2; - for (int var3 = 0; var3 < 128; ++var3) { // L: 134 + for (int var3 = 0; var3 < 128; ++var3) { this.field3088[var1][var3] = null; } } - } // L: 136 + } @ObfuscatedName("a") @ObfuscatedSignature( @@ -383,67 +383,67 @@ public class MidiPcmStream extends PcmStream { garbageValue = "-1972733350" ) void method5163(int var1, int var2, int var3) { - this.method5084(var1, var2, 64); // L: 139 - if ((this.field3081[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.field3149 == var1 && var4.field3142 < 0) { // L: 142 - this.field3087[var1][var4.field3133] = null; // L: 143 - this.field3087[var1][var2] = var4; // L: 144 - int var8 = (var4.field3137 * var4.field3138 >> 12) + var4.field3136; // L: 145 - var4.field3136 += var2 - var4.field3133 << 8; // L: 146 - var4.field3137 = var8 - var4.field3136; // L: 147 - var4.field3138 = 4096; // L: 148 - var4.field3133 = var2; // L: 149 - return; // L: 150 + this.method5084(var1, var2, 64); + if ((this.field3081[var1] & 2) != 0) { + for (MusicPatchNode var4 = (MusicPatchNode)this.patchStream.queue.first(); var4 != null; var4 = (MusicPatchNode)this.patchStream.queue.next()) { + if (var4.field3149 == var1 && var4.field3142 < 0) { + this.field3087[var1][var4.field3133] = null; + this.field3087[var1][var2] = var4; + int var8 = (var4.field3137 * var4.field3138 >> 12) + var4.field3136; + var4.field3136 += var2 - var4.field3133 << 8; + var4.field3137 = var8 - var4.field3136; + var4.field3138 = 4096; + var4.field3133 = var2; + return; } } } - MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field3095[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.field3149 = var1; // L: 159 - var6.patch = var9; // L: 160 - var6.rawSound = var5; // L: 161 - var6.field3131 = var9.field3117[var2]; // L: 162 - var6.field3128 = var9.field3119[var2]; // L: 163 - var6.field3133 = var2; // L: 164 - var6.field3132 = var3 * var3 * var9.field3111[var2] * var9.field3114 + 1024 >> 11; // L: 165 - var6.field3147 = var9.field3115[var2] & 255; // L: 166 - var6.field3136 = (var2 << 8) - (var9.field3113[var2] & 32767); // L: 167 - var6.field3139 = 0; // L: 168 - var6.field3140 = 0; // L: 169 - var6.field3141 = 0; // L: 170 - var6.field3142 = -1; // L: 171 - var6.field3143 = 0; // L: 172 - if (this.field3084[var1] == 0) { // L: 173 - var6.stream = RawPcmStream.method943(var5, this.method5170(var6), this.method5097(var6), this.method5098(var6)); // L: 174 + MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field3095[var1]); + if (var9 != null) { + RawSound var5 = var9.rawSounds[var2]; + if (var5 != null) { + MusicPatchNode var6 = new MusicPatchNode(); + var6.field3149 = var1; + var6.patch = var9; + var6.rawSound = var5; + var6.field3131 = var9.field3117[var2]; + var6.field3128 = var9.field3119[var2]; + var6.field3133 = var2; + var6.field3132 = var3 * var3 * var9.field3111[var2] * var9.field3114 + 1024 >> 11; + var6.field3147 = var9.field3115[var2] & 255; + var6.field3136 = (var2 << 8) - (var9.field3113[var2] & 32767); + var6.field3139 = 0; + var6.field3140 = 0; + var6.field3141 = 0; + var6.field3142 = -1; + var6.field3143 = 0; + if (this.field3084[var1] == 0) { + var6.stream = RawPcmStream.method943(var5, this.method5170(var6), this.method5097(var6), this.method5098(var6)); } else { - var6.stream = RawPcmStream.method943(var5, this.method5170(var6), 0, this.method5098(var6)); // L: 177 - this.method5083(var6, var9.field3113[var2] < 0); // L: 178 + var6.stream = RawPcmStream.method943(var5, this.method5170(var6), 0, this.method5098(var6)); + this.method5083(var6, var9.field3113[var2] < 0); } - if (var9.field3113[var2] < 0) { // L: 180 + if (var9.field3113[var2] < 0) { var6.stream.setNumLoops(-1); } - if (var6.field3128 >= 0) { // L: 181 - MusicPatchNode var7 = this.field3088[var1][var6.field3128]; // L: 182 - if (var7 != null && var7.field3142 < 0) { // L: 183 - this.field3087[var1][var7.field3133] = null; // L: 184 - var7.field3142 = 0; // L: 185 + if (var6.field3128 >= 0) { + MusicPatchNode var7 = this.field3088[var1][var6.field3128]; + if (var7 != null && var7.field3142 < 0) { + this.field3087[var1][var7.field3133] = null; + var7.field3142 = 0; } - this.field3088[var1][var6.field3128] = var6; // L: 187 + this.field3088[var1][var6.field3128] = var6; } - this.patchStream.queue.addFirst(var6); // L: 189 - this.field3087[var1][var2] = var6; // L: 190 + this.patchStream.queue.addFirst(var6); + this.field3087[var1][var2] = var6; } } - } // L: 191 + } @ObfuscatedName("u") @ObfuscatedSignature( @@ -451,22 +451,22 @@ public class MidiPcmStream extends PcmStream { garbageValue = "1432160102" ) void method5083(MusicPatchNode var1, boolean var2) { - int var3 = var1.rawSound.samples.length; // L: 194 + int var3 = var1.rawSound.samples.length; int var4; - if (var2 && var1.rawSound.field265) { // L: 196 - int var5 = var3 + var3 - var1.rawSound.start; // L: 197 - var4 = (int)((long)this.field3084[var1.field3149] * (long)var5 >> 6); // L: 198 - var3 <<= 8; // L: 199 + if (var2 && var1.rawSound.field265) { + int var5 = var3 + var3 - var1.rawSound.start; + var4 = (int)((long)this.field3084[var1.field3149] * (long)var5 >> 6); + var3 <<= 8; if (var4 >= var3) { var4 = var3 + var3 - 1 - var4; var1.stream.method925(); } } else { - var4 = (int)((long)var3 * (long)this.field3084[var1.field3149] >> 6); // L: 206 + var4 = (int)((long)var3 * (long)this.field3084[var1.field3149] >> 6); } - var1.stream.method848(var4); // L: 208 - } // L: 209 + var1.stream.method848(var4); + } @ObfuscatedName("k") @ObfuscatedSignature( @@ -474,22 +474,22 @@ public class MidiPcmStream extends PcmStream { garbageValue = "97" ) void method5084(int var1, int var2, int var3) { - MusicPatchNode var4 = this.field3087[var1][var2]; // L: 212 - if (var4 != null) { // L: 213 - this.field3087[var1][var2] = null; // L: 214 - if ((this.field3081[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.field3149 == var4.field3149 && var5.field3142 < 0 && var5 != var4) { // L: 217 - var4.field3142 = 0; // L: 218 - break; // L: 219 + MusicPatchNode var4 = this.field3087[var1][var2]; + if (var4 != null) { + this.field3087[var1][var2] = null; + if ((this.field3081[var1] & 2) != 0) { + for (MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) { + if (var5.field3149 == var4.field3149 && var5.field3142 < 0 && var5 != var4) { + var4.field3142 = 0; + break; } } } else { - var4.field3142 = 0; // L: 224 + var4.field3142 = 0; } } - } // L: 226 + } @ObfuscatedName("f") @ObfuscatedSignature( @@ -497,7 +497,7 @@ public class MidiPcmStream extends PcmStream { garbageValue = "1104599593" ) void method5085(int var1, int var2, int var3) { - } // L: 228 + } @ObfuscatedName("l") @ObfuscatedSignature( @@ -505,7 +505,7 @@ public class MidiPcmStream extends PcmStream { garbageValue = "-875274554" ) void method5086(int var1, int var2) { - } // L: 229 + } @ObfuscatedName("q") @ObfuscatedSignature( @@ -513,8 +513,8 @@ public class MidiPcmStream extends PcmStream { garbageValue = "0" ) void method5087(int var1, int var2) { - this.field3077[var1] = var2; // L: 232 - } // L: 233 + this.field3077[var1] = var2; + } @ObfuscatedName("x") @ObfuscatedSignature( @@ -522,26 +522,26 @@ public class MidiPcmStream extends PcmStream { garbageValue = "1499512267" ) void method5088(int var1) { - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 236 - if (var1 < 0 || var2.field3149 == var1) { // L: 237 - if (var2.stream != null) { // L: 238 - var2.stream.method954(class339.field4058 / 100); // L: 239 - if (var2.stream.method857()) { // L: 240 + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { + if (var1 < 0 || var2.field3149 == var1) { + if (var2.stream != null) { + var2.stream.method954(class339.field4058 / 100); + if (var2.stream.method857()) { this.patchStream.mixer.addSubStream(var2.stream); } - var2.method5292(); // L: 241 + var2.method5292(); } - if (var2.field3142 < 0) { // L: 243 + if (var2.field3142 < 0) { this.field3087[var2.field3149][var2.field3133] = null; } - var2.remove(); // L: 244 + var2.remove(); } } - } // L: 247 + } @ObfuscatedName("ax") @ObfuscatedSignature( @@ -549,27 +549,27 @@ public class MidiPcmStream extends PcmStream { garbageValue = "171384389" ) void method5089(int var1) { - if (var1 >= 0) { // L: 250 - this.field3071[var1] = 12800; // L: 254 - this.field3089[var1] = 8192; // L: 255 - this.field3076[var1] = 16383; // L: 256 - this.field3077[var1] = 8192; // L: 257 - this.field3078[var1] = 0; // L: 258 - this.field3079[var1] = 8192; // L: 259 - this.method5092(var1); // L: 260 - this.method5093(var1); // L: 261 - this.field3081[var1] = 0; // L: 262 - this.field3082[var1] = 32767; // L: 263 - this.field3091[var1] = 256; // L: 264 - this.field3084[var1] = 0; // L: 265 - this.method5095(var1, 8192); // L: 266 + if (var1 >= 0) { + this.field3071[var1] = 12800; + this.field3089[var1] = 8192; + this.field3076[var1] = 16383; + this.field3077[var1] = 8192; + this.field3078[var1] = 0; + this.field3079[var1] = 8192; + this.method5092(var1); + this.method5093(var1); + this.field3081[var1] = 0; + this.field3082[var1] = 32767; + this.field3091[var1] = 256; + this.field3084[var1] = 0; + this.method5095(var1, 8192); } else { - for (var1 = 0; var1 < 16; ++var1) { // L: 251 + for (var1 = 0; var1 < 16; ++var1) { this.method5089(var1); } } - } // L: 252 267 + } @ObfuscatedName("am") @ObfuscatedSignature( @@ -577,14 +577,14 @@ public class MidiPcmStream extends PcmStream { garbageValue = "38" ) void method5129(int var1) { - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 270 - if ((var1 < 0 || var2.field3149 == var1) && var2.field3142 < 0) { // L: 271 272 - this.field3087[var2.field3149][var2.field3133] = null; // L: 273 - var2.field3142 = 0; // L: 274 + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { + if ((var1 < 0 || var2.field3149 == var1) && var2.field3142 < 0) { + this.field3087[var2.field3149][var2.field3133] = null; + var2.field3142 = 0; } } - } // L: 278 + } @ObfuscatedName("au") @ObfuscatedSignature( @@ -592,19 +592,19 @@ public class MidiPcmStream extends PcmStream { garbageValue = "63" ) void method5091() { - this.method5088(-1); // L: 281 - this.method5089(-1); // L: 282 + this.method5088(-1); + this.method5089(-1); int var1; - for (var1 = 0; var1 < 16; ++var1) { // L: 283 + for (var1 = 0; var1 < 16; ++var1) { this.field3095[var1] = this.field3092[var1]; } - for (var1 = 0; var1 < 16; ++var1) { // L: 284 + for (var1 = 0; var1 < 16; ++var1) { this.field3096[var1] = this.field3092[var1] & -128; } - } // L: 285 + } @ObfuscatedName("aj") @ObfuscatedSignature( @@ -612,15 +612,15 @@ public class MidiPcmStream extends PcmStream { garbageValue = "-21" ) void method5092(int var1) { - if ((this.field3081[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.field3149 == var1 && this.field3087[var1][var2.field3133] == null && var2.field3142 < 0) { // L: 290 291 + if ((this.field3081[var1] & 2) != 0) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { + if (var2.field3149 == var1 && this.field3087[var1][var2.field3133] == null && var2.field3142 < 0) { var2.field3142 = 0; } } } - } // L: 295 + } @ObfuscatedName("af") @ObfuscatedSignature( @@ -628,15 +628,15 @@ public class MidiPcmStream extends PcmStream { garbageValue = "16256" ) void method5093(int var1) { - if ((this.field3081[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.field3149 == var1) { // L: 300 + if ((this.field3081[var1] & 4) != 0) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { + if (var2.field3149 == var1) { var2.field3135 = 0; } } } - } // L: 303 + } @ObfuscatedName("ar") @ObfuscatedSignature( @@ -644,193 +644,193 @@ public class MidiPcmStream extends PcmStream { garbageValue = "2130755368" ) void method5094(int var1) { - int var2 = var1 & 240; // L: 306 + int var2 = var1 & 240; int var3; int var4; int var5; - if (var2 == 128) { // L: 307 - var3 = var1 & 15; // L: 308 - var4 = var1 >> 8 & 127; // L: 309 - var5 = var1 >> 16 & 127; // L: 310 - this.method5084(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 + if (var2 == 128) { + var3 = var1 & 15; + var4 = var1 >> 8 & 127; + var5 = var1 >> 16 & 127; + this.method5084(var3, var4, var5); + } else if (var2 == 144) { + var3 = var1 & 15; + var4 = var1 >> 8 & 127; + var5 = var1 >> 16 & 127; + if (var5 > 0) { this.method5163(var3, var4, var5); } else { - this.method5084(var3, var4, 64); // L: 319 + this.method5084(var3, var4, 64); } - } else if (var2 == 160) { // L: 322 - var3 = var1 & 15; // L: 323 - var4 = var1 >> 8 & 127; // L: 324 - var5 = var1 >> 16 & 127; // L: 325 - this.method5085(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 + } else if (var2 == 160) { + var3 = var1 & 15; + var4 = var1 >> 8 & 127; + var5 = var1 >> 16 & 127; + this.method5085(var3, var4, var5); + } else if (var2 == 176) { + var3 = var1 & 15; + var4 = var1 >> 8 & 127; + var5 = var1 >> 16 & 127; + if (var4 == 0) { this.field3096[var3] = (var5 << 14) + (this.field3096[var3] & -2080769); } - if (var4 == 32) { // L: 334 + if (var4 == 32) { this.field3096[var3] = (var5 << 7) + (this.field3096[var3] & -16257); } - if (var4 == 1) { // L: 335 + if (var4 == 1) { this.field3078[var3] = (var5 << 7) + (this.field3078[var3] & -16257); } - if (var4 == 33) { // L: 336 + if (var4 == 33) { this.field3078[var3] = var5 + (this.field3078[var3] & -128); } - if (var4 == 5) { // L: 337 + if (var4 == 5) { this.field3079[var3] = (var5 << 7) + (this.field3079[var3] & -16257); } - if (var4 == 37) { // L: 338 + if (var4 == 37) { this.field3079[var3] = var5 + (this.field3079[var3] & -128); } - if (var4 == 7) { // L: 339 + if (var4 == 7) { this.field3071[var3] = (var5 << 7) + (this.field3071[var3] & -16257); } - if (var4 == 39) { // L: 340 + if (var4 == 39) { this.field3071[var3] = var5 + (this.field3071[var3] & -128); } - if (var4 == 10) { // L: 341 + if (var4 == 10) { this.field3089[var3] = (var5 << 7) + (this.field3089[var3] & -16257); } - if (var4 == 42) { // L: 342 + if (var4 == 42) { this.field3089[var3] = var5 + (this.field3089[var3] & -128); } - if (var4 == 11) { // L: 343 + if (var4 == 11) { this.field3076[var3] = (var5 << 7) + (this.field3076[var3] & -16257); } - if (var4 == 43) { // L: 344 + if (var4 == 43) { this.field3076[var3] = var5 + (this.field3076[var3] & -128); } int[] var10000; - if (var4 == 64) { // L: 345 - if (var5 >= 64) { // L: 346 + if (var4 == 64) { + if (var5 >= 64) { var10000 = this.field3081; var10000[var3] |= 1; } else { - var10000 = this.field3081; // L: 347 + var10000 = this.field3081; var10000[var3] &= -2; } } - if (var4 == 65) { // L: 349 - if (var5 >= 64) { // L: 350 + if (var4 == 65) { + if (var5 >= 64) { var10000 = this.field3081; var10000[var3] |= 2; } else { - this.method5092(var3); // L: 352 - var10000 = this.field3081; // L: 353 + this.method5092(var3); + var10000 = this.field3081; var10000[var3] &= -3; } } - if (var4 == 99) { // L: 356 + if (var4 == 99) { this.field3082[var3] = (var5 << 7) + (this.field3082[var3] & 127); } - if (var4 == 98) { // L: 357 + if (var4 == 98) { this.field3082[var3] = (this.field3082[var3] & 16256) + var5; } - if (var4 == 101) { // L: 358 + if (var4 == 101) { this.field3082[var3] = (var5 << 7) + (this.field3082[var3] & 127) + 16384; } - if (var4 == 100) { // L: 359 + if (var4 == 100) { this.field3082[var3] = (this.field3082[var3] & 16256) + var5 + 16384; } - if (var4 == 120) { // L: 360 + if (var4 == 120) { this.method5088(var3); } - if (var4 == 121) { // L: 361 + if (var4 == 121) { this.method5089(var3); } - if (var4 == 123) { // L: 362 + if (var4 == 123) { this.method5129(var3); } int var6; - if (var4 == 6) { // L: 363 - var6 = this.field3082[var3]; // L: 364 - if (var6 == 16384) { // L: 365 + if (var4 == 6) { + var6 = this.field3082[var3]; + if (var6 == 16384) { this.field3091[var3] = (var5 << 7) + (this.field3091[var3] & -16257); } } - if (var4 == 38) { // L: 367 - var6 = this.field3082[var3]; // L: 368 - if (var6 == 16384) { // L: 369 + if (var4 == 38) { + var6 = this.field3082[var3]; + if (var6 == 16384) { this.field3091[var3] = var5 + (this.field3091[var3] & -128); } } - if (var4 == 16) { // L: 371 + if (var4 == 16) { this.field3084[var3] = (var5 << 7) + (this.field3084[var3] & -16257); } - if (var4 == 48) { // L: 372 + if (var4 == 48) { this.field3084[var3] = var5 + (this.field3084[var3] & -128); } - if (var4 == 81) { // L: 373 - if (var5 >= 64) { // L: 374 + if (var4 == 81) { + if (var5 >= 64) { var10000 = this.field3081; var10000[var3] |= 4; } else { - this.method5093(var3); // L: 376 - var10000 = this.field3081; // L: 377 + this.method5093(var3); + var10000 = this.field3081; var10000[var3] &= -5; } } if (var4 == 17) { - this.method5095(var3, (var5 << 7) + (this.field3085[var3] & -16257)); // L: 380 + this.method5095(var3, (var5 << 7) + (this.field3085[var3] & -16257)); } - if (var4 == 49) { // L: 381 + if (var4 == 49) { this.method5095(var3, var5 + (this.field3085[var3] & -128)); } - } else if (var2 == 192) { // L: 384 - var3 = var1 & 15; // L: 385 - var4 = var1 >> 8 & 127; // L: 386 - this.method5081(var3, var4 + this.field3096[var3]); // L: 387 - } else if (var2 == 208) { // L: 390 - var3 = var1 & 15; // L: 391 - var4 = var1 >> 8 & 127; // L: 392 - this.method5086(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.method5087(var3, var4); // L: 399 + } else if (var2 == 192) { + var3 = var1 & 15; + var4 = var1 >> 8 & 127; + this.method5081(var3, var4 + this.field3096[var3]); + } else if (var2 == 208) { + var3 = var1 & 15; + var4 = var1 >> 8 & 127; + this.method5086(var3, var4); + } else if (var2 == 224) { + var3 = var1 & 15; + var4 = (var1 >> 8 & 127) + (var1 >> 9 & 16256); + this.method5087(var3, var4); } else { - var2 = var1 & 255; // L: 402 - if (var2 == 255) { // L: 403 - this.method5091(); // L: 404 + var2 = var1 & 255; + if (var2 == 255) { + this.method5091(); } } - } // L: 312 320 327 382 388 394 400 405 407 + } @ObfuscatedName("ag") @ObfuscatedSignature( @@ -838,9 +838,9 @@ public class MidiPcmStream extends PcmStream { garbageValue = "1" ) void method5095(int var1, int var2) { - this.field3085[var1] = var2; // L: 410 - this.field3086[var1] = (int)(2097152.0D * Math.pow(2.0D, (double)var2 * 5.4931640625E-4D) + 0.5D); // L: 411 - } // L: 412 + this.field3085[var1] = var2; + this.field3086[var1] = (int)(2097152.0D * Math.pow(2.0D, (double)var2 * 5.4931640625E-4D) + 0.5D); + } @ObfuscatedName("al") @ObfuscatedSignature( @@ -848,24 +848,24 @@ public class MidiPcmStream extends PcmStream { garbageValue = "-119" ) int method5170(MusicPatchNode var1) { - int var2 = (var1.field3138 * var1.field3137 >> 12) + var1.field3136; // L: 415 - var2 += (this.field3077[var1.field3149] - 8192) * this.field3091[var1.field3149] >> 12; // L: 416 - MusicPatchNode2 var3 = var1.field3131; // L: 417 + int var2 = (var1.field3138 * var1.field3137 >> 12) + var1.field3136; + var2 += (this.field3077[var1.field3149] - 8192) * this.field3091[var1.field3149] >> 12; + MusicPatchNode2 var3 = var1.field3131; int var4; - if (var3.field3059 > 0 && (var3.field3058 > 0 || this.field3078[var1.field3149] > 0)) { // L: 418 - var4 = var3.field3058 << 2; // L: 419 - int var5 = var3.field3060 << 1; // L: 420 - if (var1.field3144 < var5) { // L: 421 + if (var3.field3059 > 0 && (var3.field3058 > 0 || this.field3078[var1.field3149] > 0)) { + var4 = var3.field3058 << 2; + int var5 = var3.field3060 << 1; + if (var1.field3144 < var5) { var4 = var4 * var1.field3144 / var5; } - var4 += this.field3078[var1.field3149] >> 7; // L: 422 - double var6 = Math.sin((double)(var1.field3145 & 511) * 0.01227184630308513D); // L: 423 - var2 += (int)(var6 * (double)var4); // L: 424 + var4 += this.field3078[var1.field3149] >> 7; + double var6 = Math.sin((double)(var1.field3145 & 511) * 0.01227184630308513D); + var2 += (int)(var6 * (double)var4); } - var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, 3.255208333333333E-4D * (double)var2) / (double)class339.field4058 + 0.5D); // L: 426 - return var4 < 1 ? 1 : var4; // L: 427 + var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, 3.255208333333333E-4D * (double)var2) / (double)class339.field4058 + 0.5D); + return var4 < 1 ? 1 : var4; } @ObfuscatedName("aa") @@ -874,44 +874,44 @@ public class MidiPcmStream extends PcmStream { garbageValue = "1173638767" ) int method5097(MusicPatchNode var1) { - MusicPatchNode2 var2 = var1.field3131; // L: 431 - int var3 = this.field3071[var1.field3149] * this.field3076[var1.field3149] + 4096 >> 13; // L: 432 - var3 = var3 * var3 + 16384 >> 15; // L: 433 - var3 = var3 * var1.field3132 + 16384 >> 15; // L: 434 - var3 = var3 * this.field3069 + 128 >> 8; // L: 435 - if (var2.field3052 > 0) { // L: 436 - var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field3052 * 1.953125E-5D * (double)var1.field3139) + 0.5D); // L: 437 + MusicPatchNode2 var2 = var1.field3131; + int var3 = this.field3071[var1.field3149] * this.field3076[var1.field3149] + 4096 >> 13; + var3 = var3 * var3 + 16384 >> 15; + var3 = var3 * var1.field3132 + 16384 >> 15; + var3 = var3 * this.field3069 + 128 >> 8; + if (var2.field3052 > 0) { + var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field3052 * 1.953125E-5D * (double)var1.field3139) + 0.5D); } int var4; int var5; int var6; int var7; - if (var2.field3056 != null) { // L: 439 - var4 = var1.field3140; // L: 440 - var5 = var2.field3056[var1.field3141 + 1]; // L: 441 - if (var1.field3141 < var2.field3056.length - 2) { // L: 442 - var6 = (var2.field3056[var1.field3141] & 255) << 8; // L: 443 - var7 = (var2.field3056[var1.field3141 + 2] & 255) << 8; // L: 444 - var5 += (var2.field3056[var1.field3141 + 3] - var5) * (var4 - var6) / (var7 - var6); // L: 445 + if (var2.field3056 != null) { + var4 = var1.field3140; + var5 = var2.field3056[var1.field3141 + 1]; + if (var1.field3141 < var2.field3056.length - 2) { + var6 = (var2.field3056[var1.field3141] & 255) << 8; + var7 = (var2.field3056[var1.field3141 + 2] & 255) << 8; + var5 += (var2.field3056[var1.field3141 + 3] - var5) * (var4 - var6) / (var7 - var6); } - var3 = var5 * var3 + 32 >> 6; // L: 447 + var3 = var5 * var3 + 32 >> 6; } - if (var1.field3142 > 0 && var2.field3054 != null) { // L: 449 - var4 = var1.field3142; // L: 450 - var5 = var2.field3054[var1.field3143 + 1]; // L: 451 - if (var1.field3143 < var2.field3054.length - 2) { // L: 452 - var6 = (var2.field3054[var1.field3143] & 255) << 8; // L: 453 - var7 = (var2.field3054[var1.field3143 + 2] & 255) << 8; // L: 454 - var5 += (var2.field3054[var1.field3143 + 3] - var5) * (var4 - var6) / (var7 - var6); // L: 455 + if (var1.field3142 > 0 && var2.field3054 != null) { + var4 = var1.field3142; + var5 = var2.field3054[var1.field3143 + 1]; + if (var1.field3143 < var2.field3054.length - 2) { + var6 = (var2.field3054[var1.field3143] & 255) << 8; + var7 = (var2.field3054[var1.field3143 + 2] & 255) << 8; + var5 += (var2.field3054[var1.field3143 + 3] - var5) * (var4 - var6) / (var7 - var6); } - var3 = var3 * var5 + 32 >> 6; // L: 457 + var3 = var3 * var5 + 32 >> 6; } - return var3; // L: 459 + return var3; } @ObfuscatedName("as") @@ -920,8 +920,8 @@ public class MidiPcmStream extends PcmStream { garbageValue = "1815861721" ) int method5098(MusicPatchNode var1) { - int var2 = this.field3089[var1.field3149]; // L: 463 - return var2 < 8192 ? var2 * var1.field3147 + 32 >> 6 : 16384 - ((128 - var1.field3147) * (16384 - var2) + 32 >> 6); // L: 464 465 + int var2 = this.field3089[var1.field3149]; + return var2 < 8192 ? var2 * var1.field3147 + 32 >> 6 : 16384 - ((128 - var1.field3147) * (16384 - var2) + 32 >> 6); } @ObfuscatedName("at") @@ -930,45 +930,45 @@ public class MidiPcmStream extends PcmStream { garbageValue = "100" ) void method5104() { - int var1 = this.track; // L: 522 - int var2 = this.trackLength; // L: 523 + int var1 = this.track; + int var2 = this.trackLength; long var3; - for (var3 = this.field3094; var2 == this.trackLength; var3 = this.midiFile.method5202(var2)) { // L: 524 525 547 - while (var2 == this.midiFile.trackLengths[var1]) { // L: 526 - this.midiFile.gotoTrack(var1); // L: 527 - int var5 = this.midiFile.readMessage(var1); // L: 528 - if (var5 == 1) { // L: 529 - this.midiFile.setTrackDone(); // L: 530 - this.midiFile.markTrackPosition(var1); // L: 531 - if (this.midiFile.isDone()) { // L: 532 - if (!this.field3072 || var2 == 0) { // L: 533 - this.method5091(); // L: 537 - this.midiFile.clear(); // L: 538 - return; // L: 539 + for (var3 = this.field3094; var2 == this.trackLength; var3 = this.midiFile.method5202(var2)) { + while (var2 == this.midiFile.trackLengths[var1]) { + this.midiFile.gotoTrack(var1); + int var5 = this.midiFile.readMessage(var1); + if (var5 == 1) { + this.midiFile.setTrackDone(); + this.midiFile.markTrackPosition(var1); + if (this.midiFile.isDone()) { + if (!this.field3072 || var2 == 0) { + this.method5091(); + this.midiFile.clear(); + return; } - this.midiFile.reset(var3); // L: 534 + this.midiFile.reset(var3); } break; } - if ((var5 & 128) != 0) { // L: 541 + if ((var5 & 128) != 0) { this.method5094(var5); } - this.midiFile.readTrackLength(var1); // L: 542 - this.midiFile.markTrackPosition(var1); // L: 543 + this.midiFile.readTrackLength(var1); + this.midiFile.markTrackPosition(var1); } - var1 = this.midiFile.getPrioritizedTrack(); // L: 545 - var2 = this.midiFile.trackLengths[var1]; // L: 546 + var1 = this.midiFile.getPrioritizedTrack(); + var2 = this.midiFile.trackLengths[var1]; } - this.track = var1; // L: 549 - this.trackLength = var2; // L: 550 - this.field3094 = var3; // L: 551 - } // L: 552 + this.track = var1; + this.trackLength = var2; + this.field3094 = var3; + } @ObfuscatedName("ai") @ObfuscatedSignature( @@ -976,17 +976,17 @@ public class MidiPcmStream extends PcmStream { garbageValue = "-1286504674" ) boolean method5105(MusicPatchNode var1) { - if (var1.stream == null) { // L: 555 - if (var1.field3142 >= 0) { // L: 556 - var1.remove(); // L: 557 - if (var1.field3128 > 0 && var1 == this.field3088[var1.field3149][var1.field3128]) { // L: 558 - this.field3088[var1.field3149][var1.field3128] = null; // L: 559 + if (var1.stream == null) { + if (var1.field3142 >= 0) { + var1.remove(); + if (var1.field3128 > 0 && var1 == this.field3088[var1.field3149][var1.field3128]) { + this.field3088[var1.field3149][var1.field3128] = null; } } - return true; // L: 562 + return true; } else { - return false; // L: 564 + return false; } } @@ -996,97 +996,97 @@ public class MidiPcmStream extends PcmStream { garbageValue = "-28" ) boolean method5106(MusicPatchNode var1, int[] var2, int var3, int var4) { - var1.field3134 = class339.field4058 / 100; // L: 568 - if (var1.field3142 < 0 || var1.stream != null && !var1.stream.method854()) { // L: 569 - int var5 = var1.field3138; // L: 577 - if (var5 > 0) { // L: 578 - var5 -= (int)(16.0D * Math.pow(2.0D, (double)this.field3079[var1.field3149] * 4.921259842519685E-4D) + 0.5D); // L: 579 - if (var5 < 0) { // L: 580 + var1.field3134 = class339.field4058 / 100; + if (var1.field3142 < 0 || var1.stream != null && !var1.stream.method854()) { + int var5 = var1.field3138; + if (var5 > 0) { + var5 -= (int)(16.0D * Math.pow(2.0D, (double)this.field3079[var1.field3149] * 4.921259842519685E-4D) + 0.5D); + if (var5 < 0) { var5 = 0; } - var1.field3138 = var5; // L: 581 + var1.field3138 = var5; } - var1.stream.method963(this.method5170(var1)); // L: 583 - MusicPatchNode2 var6 = var1.field3131; // L: 584 - boolean var7 = false; // L: 585 - ++var1.field3144; // L: 586 - var1.field3145 += var6.field3059; // L: 587 - double var8 = 5.086263020833333E-6D * (double)((var1.field3133 - 60 << 8) + (var1.field3137 * var1.field3138 >> 12)); // L: 588 - if (var6.field3052 > 0) { // L: 589 - if (var6.field3057 > 0) { // L: 590 + var1.stream.method963(this.method5170(var1)); + MusicPatchNode2 var6 = var1.field3131; + boolean var7 = false; + ++var1.field3144; + var1.field3145 += var6.field3059; + double var8 = 5.086263020833333E-6D * (double)((var1.field3133 - 60 << 8) + (var1.field3137 * var1.field3138 >> 12)); + if (var6.field3052 > 0) { + if (var6.field3057 > 0) { var1.field3139 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field3057) + 0.5D); } else { - var1.field3139 += 128; // L: 591 + var1.field3139 += 128; } } - if (var6.field3056 != null) { // L: 593 - if (var6.field3055 > 0) { // L: 594 + if (var6.field3056 != null) { + if (var6.field3055 > 0) { var1.field3140 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field3055) + 0.5D); } else { - var1.field3140 += 128; // L: 595 + var1.field3140 += 128; } - while (var1.field3141 < var6.field3056.length - 2 && var1.field3140 > (var6.field3056[var1.field3141 + 2] & 255) << 8) { // L: 596 + while (var1.field3141 < var6.field3056.length - 2 && var1.field3140 > (var6.field3056[var1.field3141 + 2] & 255) << 8) { var1.field3141 += 2; } - if (var6.field3056.length - 2 == var1.field3141 && var6.field3056[var1.field3141 + 1] == 0) { // L: 597 + if (var6.field3056.length - 2 == var1.field3141 && var6.field3056[var1.field3141 + 1] == 0) { var7 = true; } } - if (var1.field3142 >= 0 && var6.field3054 != null && (this.field3081[var1.field3149] & 1) == 0 && (var1.field3128 < 0 || var1 != this.field3088[var1.field3149][var1.field3128])) { // L: 599 600 - if (var6.field3053 > 0) { // L: 601 + if (var1.field3142 >= 0 && var6.field3054 != null && (this.field3081[var1.field3149] & 1) == 0 && (var1.field3128 < 0 || var1 != this.field3088[var1.field3149][var1.field3128])) { + if (var6.field3053 > 0) { var1.field3142 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field3053) + 0.5D); } else { - var1.field3142 += 128; // L: 602 + var1.field3142 += 128; } - while (var1.field3143 < var6.field3054.length - 2 && var1.field3142 > (var6.field3054[var1.field3143 + 2] & 255) << 8) { // L: 603 + while (var1.field3143 < var6.field3054.length - 2 && var1.field3142 > (var6.field3054[var1.field3143 + 2] & 255) << 8) { var1.field3143 += 2; } - if (var6.field3054.length - 2 == var1.field3143) { // L: 604 + if (var6.field3054.length - 2 == var1.field3143) { var7 = true; } } - if (var7) { // L: 607 - var1.stream.method954(var1.field3134); // L: 608 - if (var2 != null) { // L: 609 + if (var7) { + var1.stream.method954(var1.field3134); + if (var2 != null) { var1.stream.fill(var2, var3, var4); } else { - var1.stream.skip(var4); // L: 610 + var1.stream.skip(var4); } - if (var1.stream.method857()) { // L: 611 + if (var1.stream.method857()) { this.patchStream.mixer.addSubStream(var1.stream); } - var1.method5292(); // L: 612 - if (var1.field3142 >= 0) { // L: 613 - var1.remove(); // L: 614 - if (var1.field3128 > 0 && var1 == this.field3088[var1.field3149][var1.field3128]) { // L: 615 - this.field3088[var1.field3149][var1.field3128] = null; // L: 616 + var1.method5292(); + if (var1.field3142 >= 0) { + var1.remove(); + if (var1.field3128 > 0 && var1 == this.field3088[var1.field3149][var1.field3128]) { + this.field3088[var1.field3149][var1.field3128] = null; } } - return true; // L: 619 + return true; } else { - var1.stream.method932(var1.field3134, this.method5097(var1), this.method5098(var1)); // L: 621 - return false; // L: 622 + var1.stream.method932(var1.field3134, this.method5097(var1), this.method5098(var1)); + return false; } } else { - var1.method5292(); // L: 570 - var1.remove(); // L: 571 - if (var1.field3128 > 0 && var1 == this.field3088[var1.field3149][var1.field3128]) { // L: 572 - this.field3088[var1.field3149][var1.field3128] = null; // L: 573 + var1.method5292(); + var1.remove(); + if (var1.field3128 > 0 && var1 == this.field3088[var1.field3149][var1.field3128]) { + this.field3088[var1.field3149][var1.field3128] = null; } - return true; // L: 575 + return true; } } @@ -1096,12 +1096,12 @@ public class MidiPcmStream extends PcmStream { garbageValue = "-941170538" ) static float method5196(float[] var0, int var1, float var2) { - float var3 = var0[var1]; // L: 200 + float var3 = var0[var1]; - for (int var4 = var1 - 1; var4 >= 0; --var4) { // L: 201 - var3 = var0[var4] + var2 * var3; // L: 202 + for (int var4 = var1 - 1; var4 >= 0; --var4) { + var3 = var0[var4] + var2 * var3; } - return var3; // L: 204 + return var3; } } diff --git a/runescape-client/src/main/java/MilliClock.java b/runescape-client/src/main/java/MilliClock.java index 29b26baaa5..697e617794 100644 --- a/runescape-client/src/main/java/MilliClock.java +++ b/runescape-client/src/main/java/MilliClock.java @@ -36,17 +36,17 @@ public class MilliClock extends Clock { int field1715; public MilliClock() { - this.field1718 = new long[10]; // L: 7 - this.field1719 = 256; // L: 15 - this.field1716 = 1; // L: 16 - this.field1714 = 0; // L: 17 - this.field1717 = Ignored.method6459(); // L: 18 + this.field1718 = new long[10]; + this.field1719 = 256; + this.field1716 = 1; + this.field1714 = 0; + this.field1717 = Ignored.method6459(); - for (int var1 = 0; var1 < 10; ++var1) { // L: 19 - this.field1718[var1] = this.field1717; // L: 20 + for (int var1 = 0; var1 < 10; ++var1) { + this.field1718[var1] = this.field1717; } - } // L: 22 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -55,11 +55,11 @@ public class MilliClock extends Clock { ) @Export("mark") public void mark() { - for (int var1 = 0; var1 < 10; ++var1) { // L: 25 - this.field1718[var1] = 0L; // L: 26 + for (int var1 = 0; var1 < 10; ++var1) { + this.field1718[var1] = 0L; } - } // L: 28 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -68,54 +68,54 @@ public class MilliClock extends Clock { ) @Export("wait") public int wait(int var1, int var2) { - int var3 = this.field1719; // L: 31 - int var4 = this.field1716; // L: 32 - this.field1719 = 300; // L: 33 - this.field1716 = 1; // L: 34 - this.field1717 = Ignored.method6459(); // L: 35 - if (0L == this.field1718[this.field1715]) { // L: 36 - this.field1719 = var3; // L: 37 - this.field1716 = var4; // L: 38 - } else if (this.field1717 > this.field1718[this.field1715]) { // L: 40 + int var3 = this.field1719; + int var4 = this.field1716; + this.field1719 = 300; + this.field1716 = 1; + this.field1717 = Ignored.method6459(); + if (0L == this.field1718[this.field1715]) { + this.field1719 = var3; + this.field1716 = var4; + } else if (this.field1717 > this.field1718[this.field1715]) { this.field1719 = (int)((long)(var1 * 2560) / (this.field1717 - this.field1718[this.field1715])); } - if (this.field1719 < 25) { // L: 41 + if (this.field1719 < 25) { this.field1719 = 25; } - if (this.field1719 > 256) { // L: 42 - this.field1719 = 256; // L: 43 - this.field1716 = (int)((long)var1 - (this.field1717 - this.field1718[this.field1715]) / 10L); // L: 44 + if (this.field1719 > 256) { + this.field1719 = 256; + this.field1716 = (int)((long)var1 - (this.field1717 - this.field1718[this.field1715]) / 10L); } - if (this.field1716 > var1) { // L: 46 + if (this.field1716 > var1) { this.field1716 = var1; } - this.field1718[this.field1715] = this.field1717; // L: 47 - this.field1715 = (this.field1715 + 1) % 10; // L: 48 + this.field1718[this.field1715] = this.field1717; + this.field1715 = (this.field1715 + 1) % 10; int var5; - if (this.field1716 > 1) { // L: 49 - for (var5 = 0; var5 < 10; ++var5) { // L: 50 - if (0L != this.field1718[var5]) { // L: 51 + if (this.field1716 > 1) { + for (var5 = 0; var5 < 10; ++var5) { + if (0L != this.field1718[var5]) { this.field1718[var5] += (long)this.field1716; } } } - if (this.field1716 < var2) { // L: 54 + if (this.field1716 < var2) { this.field1716 = var2; } - Bounds.method6608((long)this.field1716); // L: 55 + Bounds.method6608((long)this.field1716); - for (var5 = 0; this.field1714 < 256; this.field1714 += this.field1719) { // L: 56 57 59 - ++var5; // L: 58 + for (var5 = 0; this.field1714 < 256; this.field1714 += this.field1719) { + ++var5; } - this.field1714 &= 255; // L: 61 - return var5; // L: 62 + this.field1714 &= 255; + return var5; } @ObfuscatedName("hl") @@ -124,6 +124,6 @@ public class MilliClock extends Clock { garbageValue = "322688664" ) static boolean method3121() { - return (Client.drawPlayerNames & 4) != 0; // L: 5584 + return (Client.drawPlayerNames & 4) != 0; } } diff --git a/runescape-client/src/main/java/ModeWhere.java b/runescape-client/src/main/java/ModeWhere.java index 1a80a4943b..4bccc613c2 100644 --- a/runescape-client/src/main/java/ModeWhere.java +++ b/runescape-client/src/main/java/ModeWhere.java @@ -102,20 +102,20 @@ public enum ModeWhere implements MouseWheel { ) ModeWhere(String var3, int var4, class313[] var5) { this.field3950 = new HashSet(); - this.id = var4; // L: 39 - class313[] var6 = var5; // L: 41 + this.id = var4; + class313[] var6 = var5; - for (int var7 = 0; var7 < var6.length; ++var7) { // L: 42 - class313 var8 = var6[var7]; // L: 43 - this.field3950.add(var8); // L: 44 + for (int var7 = 0; var7 < var6.length; ++var7) { + class313 var8 = var6[var7]; + this.field3950.add(var8); } - } // L: 47 + } ModeWhere(String var3, int var4) { - this.field3950 = new HashSet(); // L: 32 - this.id = var4; // L: 35 - } // L: 36 + this.field3950 = new HashSet(); + this.id = var4; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -124,7 +124,7 @@ public enum ModeWhere implements MouseWheel { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 51 + return this.id; } @ObfuscatedName("ht") @@ -134,31 +134,31 @@ public enum ModeWhere implements MouseWheel { ) @Export("worldToScreen") static final void worldToScreen(int var0, int var1, int var2) { - if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { // L: 6049 - int var3 = FaceNormal.getTileHeight(var0, var1, class20.Client_plane) - var2; // L: 6054 - var0 -= UserComparator7.cameraX; // L: 6055 - var3 -= AbstractByteArrayCopier.cameraY; // L: 6056 - var1 -= UserComparator10.cameraZ; // L: 6057 - int var4 = Rasterizer3D.Rasterizer3D_sine[UserComparator7.cameraPitch]; // L: 6058 - int var5 = Rasterizer3D.Rasterizer3D_cosine[UserComparator7.cameraPitch]; // L: 6059 - int var6 = Rasterizer3D.Rasterizer3D_sine[class379.cameraYaw]; // L: 6060 - int var7 = Rasterizer3D.Rasterizer3D_cosine[class379.cameraYaw]; // L: 6061 - int var8 = var6 * var1 + var0 * var7 >> 16; // L: 6062 - var1 = var7 * var1 - var0 * var6 >> 16; // L: 6063 - var0 = var8; // L: 6064 - var8 = var5 * var3 - var4 * var1 >> 16; // L: 6065 - var1 = var5 * var1 + var4 * var3 >> 16; // L: 6066 - if (var1 >= 50) { // L: 6068 - Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; // L: 6069 - Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2; // L: 6070 + if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { + int var3 = FaceNormal.getTileHeight(var0, var1, class20.Client_plane) - var2; + var0 -= UserComparator7.cameraX; + var3 -= AbstractByteArrayCopier.cameraY; + var1 -= UserComparator10.cameraZ; + int var4 = Rasterizer3D.Rasterizer3D_sine[UserComparator7.cameraPitch]; + int var5 = Rasterizer3D.Rasterizer3D_cosine[UserComparator7.cameraPitch]; + int var6 = Rasterizer3D.Rasterizer3D_sine[class379.cameraYaw]; + int var7 = Rasterizer3D.Rasterizer3D_cosine[class379.cameraYaw]; + int var8 = var6 * var1 + var0 * var7 >> 16; + var1 = var7 * var1 - var0 * var6 >> 16; + var0 = var8; + var8 = var5 * var3 - var4 * var1 >> 16; + var1 = var5 * var1 + var4 * var3 >> 16; + if (var1 >= 50) { + Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; + Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2; } else { - Client.viewportTempX = -1; // L: 6073 - Client.viewportTempY = -1; // L: 6074 + Client.viewportTempX = -1; + Client.viewportTempY = -1; } } else { - Client.viewportTempX = -1; // L: 6050 - Client.viewportTempY = -1; // L: 6051 + Client.viewportTempX = -1; + Client.viewportTempY = -1; } - } // L: 6052 6076 + } } diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java index dfa254bf08..f19045b261 100644 --- a/runescape-client/src/main/java/Model.java +++ b/runescape-client/src/main/java/Model.java @@ -206,36 +206,36 @@ public class Model extends Renderable { public byte field2474; static { - Model_sharedSequenceModel = new Model(); // L: 11 - Model_sharedSequenceModelFaceAlphas = new byte[1]; // L: 12 - Model_sharedSpotAnimationModel = new Model(); // L: 13 - Model_sharedSpotAnimationModelFaceAlphas = new byte[1]; // L: 14 - field2452 = new class366(); // L: 15 - field2424 = new class366(); // L: 16 - field2419 = new class366(); // L: 17 - field2463 = new boolean[6500]; // L: 55 - field2476 = new boolean[6500]; // L: 56 - modelViewportXs = new int[6500]; // L: 57 - modelViewportYs = new int[6500]; // L: 58 - field2497 = new int[6500]; // L: 59 - field2468 = new int[6500]; // L: 60 - field2469 = new int[6500]; // L: 61 - field2470 = new int[6500]; // L: 62 - field2422 = new int[1600]; // L: 64 - field2477 = new int[1600][512]; // L: 65 - field2496 = new int[12]; // L: 66 - field2475 = new int[12][2000]; // L: 67 - field2432 = new int[2000]; // L: 68 - field2434 = new int[2000]; // L: 69 - field2478 = new int[12]; // L: 70 - field2467 = new int[10]; // L: 71 - field2480 = new int[10]; // L: 72 - field2453 = new int[10]; // L: 73 - field2492 = true; // L: 77 - field2465 = Rasterizer3D.Rasterizer3D_sine; // L: 80 - field2489 = Rasterizer3D.Rasterizer3D_cosine; // L: 81 - field2490 = Rasterizer3D.Rasterizer3D_colorPalette; // L: 82 - field2491 = Rasterizer3D.field2271; // L: 83 + Model_sharedSequenceModel = new Model(); + Model_sharedSequenceModelFaceAlphas = new byte[1]; + Model_sharedSpotAnimationModel = new Model(); + Model_sharedSpotAnimationModelFaceAlphas = new byte[1]; + field2452 = new class366(); + field2424 = new class366(); + field2419 = new class366(); + field2463 = new boolean[6500]; + field2476 = new boolean[6500]; + modelViewportXs = new int[6500]; + modelViewportYs = new int[6500]; + field2497 = new int[6500]; + field2468 = new int[6500]; + field2469 = new int[6500]; + field2470 = new int[6500]; + field2422 = new int[1600]; + field2477 = new int[1600][512]; + field2496 = new int[12]; + field2475 = new int[12][2000]; + field2432 = new int[2000]; + field2434 = new int[2000]; + field2478 = new int[12]; + field2467 = new int[10]; + field2480 = new int[10]; + field2453 = new int[10]; + field2492 = true; + field2465 = Rasterizer3D.Rasterizer3D_sine; + field2489 = Rasterizer3D.Rasterizer3D_cosine; + field2490 = Rasterizer3D.Rasterizer3D_colorPalette; + field2491 = Rasterizer3D.field2271; } Model() { @@ -247,149 +247,149 @@ public class Model extends Renderable { this.xMidOffset = -1; this.yMidOffset = -1; this.zMidOffset = -1; - } // L: 91 + } @ObfuscatedSignature( descriptor = "([Lgo;I)V" ) public Model(Model[] var1, int var2) { - this.verticesCount = 0; // L: 18 - this.indicesCount = 0; // L: 22 - this.field2444 = 0; // L: 33 - this.field2442 = 0; // L: 34 - this.isSingleTile = false; // L: 42 - this.xMidOffset = -1; // L: 51 - this.yMidOffset = -1; // L: 52 - this.zMidOffset = -1; // L: 53 - boolean var3 = false; // L: 94 - boolean var4 = false; // L: 95 - boolean var5 = false; // L: 96 - boolean var6 = false; // L: 97 - this.verticesCount = 0; // L: 98 - this.indicesCount = 0; // L: 99 - this.field2442 = 0; // L: 100 - this.field2444 = -1; // L: 101 + this.verticesCount = 0; + this.indicesCount = 0; + this.field2444 = 0; + this.field2442 = 0; + this.isSingleTile = false; + this.xMidOffset = -1; + this.yMidOffset = -1; + this.zMidOffset = -1; + boolean var3 = false; + boolean var4 = false; + boolean var5 = false; + boolean var6 = false; + this.verticesCount = 0; + this.indicesCount = 0; + this.field2442 = 0; + this.field2444 = -1; int var7; Model var8; - for (var7 = 0; var7 < var2; ++var7) { // L: 102 - var8 = var1[var7]; // L: 103 - if (var8 != null) { // L: 104 - this.verticesCount += var8.verticesCount; // L: 105 - this.indicesCount += var8.indicesCount; // L: 106 - this.field2442 += var8.field2442; // L: 107 - if (var8.faceRenderPriorities != null) { // L: 108 + for (var7 = 0; var7 < var2; ++var7) { + var8 = var1[var7]; + if (var8 != null) { + this.verticesCount += var8.verticesCount; + this.indicesCount += var8.indicesCount; + this.field2442 += var8.field2442; + if (var8.faceRenderPriorities != null) { var3 = true; } else { - if (this.field2444 == -1) { // L: 110 + if (this.field2444 == -1) { this.field2444 = var8.field2444; } - if (this.field2444 != var8.field2444) { // L: 111 + if (this.field2444 != var8.field2444) { var3 = true; } } - var4 |= var8.faceAlphas != null; // L: 113 - var5 |= var8.faceTextures != null; // L: 114 - var6 |= var8.field2439 != null; // L: 115 + var4 |= var8.faceAlphas != null; + var5 |= var8.faceTextures != null; + var6 |= var8.field2439 != null; } } - this.verticesX = new int[this.verticesCount]; // L: 118 - this.verticesY = new int[this.verticesCount]; // L: 119 - this.verticesZ = new int[this.verticesCount]; // L: 120 - this.indices1 = new int[this.indicesCount]; // L: 121 - this.indices2 = new int[this.indicesCount]; // L: 122 - this.indices3 = new int[this.indicesCount]; // L: 123 - this.faceColors1 = new int[this.indicesCount]; // L: 124 - this.faceColors2 = new int[this.indicesCount]; // L: 125 - this.faceColors3 = new int[this.indicesCount]; // L: 126 - if (var3) { // L: 127 + this.verticesX = new int[this.verticesCount]; + this.verticesY = new int[this.verticesCount]; + this.verticesZ = new int[this.verticesCount]; + this.indices1 = new int[this.indicesCount]; + this.indices2 = new int[this.indicesCount]; + this.indices3 = new int[this.indicesCount]; + this.faceColors1 = new int[this.indicesCount]; + this.faceColors2 = new int[this.indicesCount]; + this.faceColors3 = new int[this.indicesCount]; + if (var3) { this.faceRenderPriorities = new byte[this.indicesCount]; } - if (var4) { // L: 128 + if (var4) { this.faceAlphas = new byte[this.indicesCount]; } - if (var5) { // L: 129 + if (var5) { this.faceTextures = new short[this.indicesCount]; } - if (var6) { // L: 130 + if (var6) { this.field2439 = new byte[this.indicesCount]; } - if (this.field2442 > 0) { // L: 131 - this.field2443 = new int[this.field2442]; // L: 132 - this.field2471 = new int[this.field2442]; // L: 133 - this.field2445 = new int[this.field2442]; // L: 134 + if (this.field2442 > 0) { + this.field2443 = new int[this.field2442]; + this.field2471 = new int[this.field2442]; + this.field2445 = new int[this.field2442]; } - this.verticesCount = 0; // L: 136 - this.indicesCount = 0; // L: 137 - this.field2442 = 0; // L: 138 + this.verticesCount = 0; + this.indicesCount = 0; + this.field2442 = 0; - for (var7 = 0; var7 < var2; ++var7) { // L: 139 - var8 = var1[var7]; // L: 140 - if (var8 != null) { // L: 141 + for (var7 = 0; var7 < var2; ++var7) { + var8 = var1[var7]; + if (var8 != null) { int var9; - for (var9 = 0; var9 < var8.indicesCount; ++var9) { // L: 142 - this.indices1[this.indicesCount] = this.verticesCount + var8.indices1[var9]; // L: 143 - this.indices2[this.indicesCount] = this.verticesCount + var8.indices2[var9]; // L: 144 - this.indices3[this.indicesCount] = this.verticesCount + var8.indices3[var9]; // L: 145 - this.faceColors1[this.indicesCount] = var8.faceColors1[var9]; // L: 146 - this.faceColors2[this.indicesCount] = var8.faceColors2[var9]; // L: 147 - this.faceColors3[this.indicesCount] = var8.faceColors3[var9]; // L: 148 - if (var3) { // L: 149 - if (var8.faceRenderPriorities != null) { // L: 150 + for (var9 = 0; var9 < var8.indicesCount; ++var9) { + this.indices1[this.indicesCount] = this.verticesCount + var8.indices1[var9]; + this.indices2[this.indicesCount] = this.verticesCount + var8.indices2[var9]; + this.indices3[this.indicesCount] = this.verticesCount + var8.indices3[var9]; + this.faceColors1[this.indicesCount] = var8.faceColors1[var9]; + this.faceColors2[this.indicesCount] = var8.faceColors2[var9]; + this.faceColors3[this.indicesCount] = var8.faceColors3[var9]; + if (var3) { + if (var8.faceRenderPriorities != null) { this.faceRenderPriorities[this.indicesCount] = var8.faceRenderPriorities[var9]; } else { - this.faceRenderPriorities[this.indicesCount] = var8.field2444; // L: 151 + this.faceRenderPriorities[this.indicesCount] = var8.field2444; } } - if (var4 && var8.faceAlphas != null) { // L: 153 154 + if (var4 && var8.faceAlphas != null) { this.faceAlphas[this.indicesCount] = var8.faceAlphas[var9]; } - if (var5) { // L: 156 - if (var8.faceTextures != null) { // L: 157 + if (var5) { + if (var8.faceTextures != null) { this.faceTextures[this.indicesCount] = var8.faceTextures[var9]; } else { - this.faceTextures[this.indicesCount] = -1; // L: 158 + this.faceTextures[this.indicesCount] = -1; } } - if (var6) { // L: 160 - if (var8.field2439 != null && var8.field2439[var9] != -1) { // L: 161 + if (var6) { + if (var8.field2439 != null && var8.field2439[var9] != -1) { this.field2439[this.indicesCount] = (byte)(this.field2442 + var8.field2439[var9]); } else { - this.field2439[this.indicesCount] = -1; // L: 162 + this.field2439[this.indicesCount] = -1; } } - ++this.indicesCount; // L: 164 + ++this.indicesCount; } - for (var9 = 0; var9 < var8.field2442; ++var9) { // L: 166 - this.field2443[this.field2442] = this.verticesCount + var8.field2443[var9]; // L: 167 - this.field2471[this.field2442] = this.verticesCount + var8.field2471[var9]; // L: 168 - this.field2445[this.field2442] = this.verticesCount + var8.field2445[var9]; // L: 169 - ++this.field2442; // L: 170 + for (var9 = 0; var9 < var8.field2442; ++var9) { + this.field2443[this.field2442] = this.verticesCount + var8.field2443[var9]; + this.field2471[this.field2442] = this.verticesCount + var8.field2471[var9]; + this.field2445[this.field2442] = this.verticesCount + var8.field2445[var9]; + ++this.field2442; } - for (var9 = 0; var9 < var8.verticesCount; ++var9) { // L: 172 - this.verticesX[this.verticesCount] = var8.verticesX[var9]; // L: 173 - this.verticesY[this.verticesCount] = var8.verticesY[var9]; // L: 174 - this.verticesZ[this.verticesCount] = var8.verticesZ[var9]; // L: 175 - ++this.verticesCount; // L: 176 + for (var9 = 0; var9 < var8.verticesCount; ++var9) { + this.verticesX[this.verticesCount] = var8.verticesX[var9]; + this.verticesY[this.verticesCount] = var8.verticesY[var9]; + this.verticesZ[this.verticesCount] = var8.verticesZ[var9]; + ++this.verticesCount; } } } - } // L: 180 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -397,47 +397,47 @@ public class Model extends Renderable { ) @Export("contourGround") public Model contourGround(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { - this.calculateBoundsCylinder(); // L: 183 - int var7 = var2 - this.xzRadius; // L: 184 - int var8 = var2 + this.xzRadius; // L: 185 - int var9 = var4 - this.xzRadius; // L: 186 - int var10 = var4 + this.xzRadius; // L: 187 - if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { // L: 188 - var7 >>= 7; // L: 189 - var8 = var8 + 127 >> 7; // L: 190 - var9 >>= 7; // L: 191 - var10 = var10 + 127 >> 7; // L: 192 - if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) { // L: 193 + this.calculateBoundsCylinder(); + int var7 = var2 - this.xzRadius; + int var8 = var2 + this.xzRadius; + int var9 = var4 - this.xzRadius; + int var10 = var4 + this.xzRadius; + if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { + var7 >>= 7; + var8 = var8 + 127 >> 7; + var9 >>= 7; + var10 = var10 + 127 >> 7; + if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) { return this; } else { Model var11; - if (var5) { // L: 195 - var11 = new Model(); // L: 196 - var11.verticesCount = this.verticesCount; // L: 197 - var11.indicesCount = this.indicesCount; // L: 198 - var11.field2442 = this.field2442; // L: 199 - var11.verticesX = this.verticesX; // L: 200 - var11.verticesZ = this.verticesZ; // L: 201 - var11.indices1 = this.indices1; // L: 202 - var11.indices2 = this.indices2; // L: 203 - var11.indices3 = this.indices3; // L: 204 - var11.faceColors1 = this.faceColors1; // L: 205 - var11.faceColors2 = this.faceColors2; // L: 206 - var11.faceColors3 = this.faceColors3; // L: 207 - var11.faceRenderPriorities = this.faceRenderPriorities; // L: 208 - var11.faceAlphas = this.faceAlphas; // L: 209 - var11.field2439 = this.field2439; // L: 210 - var11.faceTextures = this.faceTextures; // L: 211 - var11.field2444 = this.field2444; // L: 212 - var11.field2443 = this.field2443; // L: 213 - var11.field2471 = this.field2471; // L: 214 - var11.field2445 = this.field2445; // L: 215 - var11.vertexLabels = this.vertexLabels; // L: 216 - var11.faceLabelsAlpha = this.faceLabelsAlpha; // L: 217 - var11.isSingleTile = this.isSingleTile; // L: 218 - var11.verticesY = new int[var11.verticesCount]; // L: 219 + if (var5) { + var11 = new Model(); + var11.verticesCount = this.verticesCount; + var11.indicesCount = this.indicesCount; + var11.field2442 = this.field2442; + var11.verticesX = this.verticesX; + var11.verticesZ = this.verticesZ; + var11.indices1 = this.indices1; + var11.indices2 = this.indices2; + var11.indices3 = this.indices3; + var11.faceColors1 = this.faceColors1; + var11.faceColors2 = this.faceColors2; + var11.faceColors3 = this.faceColors3; + var11.faceRenderPriorities = this.faceRenderPriorities; + var11.faceAlphas = this.faceAlphas; + var11.field2439 = this.field2439; + var11.faceTextures = this.faceTextures; + var11.field2444 = this.field2444; + var11.field2443 = this.field2443; + var11.field2471 = this.field2471; + var11.field2445 = this.field2445; + var11.vertexLabels = this.vertexLabels; + var11.faceLabelsAlpha = this.faceLabelsAlpha; + var11.isSingleTile = this.isSingleTile; + var11.verticesY = new int[var11.verticesCount]; } else { - var11 = this; // L: 222 + var11 = this; } int var12; @@ -450,39 +450,39 @@ public class Model extends Renderable { int var19; int var20; int var21; - if (var6 == 0) { // L: 224 - for (var12 = 0; var12 < var11.verticesCount; ++var12) { // L: 225 - var13 = var2 + this.verticesX[var12]; // L: 226 - var14 = var4 + this.verticesZ[var12]; // L: 227 - var15 = var13 & 127; // L: 228 - var16 = var14 & 127; // L: 229 - var17 = var13 >> 7; // L: 230 - var18 = var14 >> 7; // L: 231 - var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7; // L: 232 - var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7; // L: 233 - var21 = var19 * (128 - var16) + var20 * var16 >> 7; // L: 234 - var11.verticesY[var12] = var21 + this.verticesY[var12] - var3; // L: 235 + if (var6 == 0) { + for (var12 = 0; var12 < var11.verticesCount; ++var12) { + var13 = var2 + this.verticesX[var12]; + var14 = var4 + this.verticesZ[var12]; + var15 = var13 & 127; + var16 = var14 & 127; + var17 = var13 >> 7; + var18 = var14 >> 7; + var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7; + var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7; + var21 = var19 * (128 - var16) + var20 * var16 >> 7; + var11.verticesY[var12] = var21 + this.verticesY[var12] - var3; } } else { - for (var12 = 0; var12 < var11.verticesCount; ++var12) { // L: 239 - var13 = (-this.verticesY[var12] << 16) / super.height; // L: 240 - if (var13 < var6) { // L: 241 - var14 = var2 + this.verticesX[var12]; // L: 242 - var15 = var4 + this.verticesZ[var12]; // L: 243 - var16 = var14 & 127; // L: 244 - var17 = var15 & 127; // L: 245 - var18 = var14 >> 7; // L: 246 - var19 = var15 >> 7; // L: 247 - var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7; // L: 248 - var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7; // L: 249 - int var22 = var20 * (128 - var17) + var21 * var17 >> 7; // L: 250 - var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12]; // L: 251 + for (var12 = 0; var12 < var11.verticesCount; ++var12) { + var13 = (-this.verticesY[var12] << 16) / super.height; + if (var13 < var6) { + var14 = var2 + this.verticesX[var12]; + var15 = var4 + this.verticesZ[var12]; + var16 = var14 & 127; + var17 = var15 & 127; + var18 = var14 >> 7; + var19 = var15 >> 7; + var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7; + var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7; + int var22 = var20 * (128 - var17) + var21 * var17 >> 7; + var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12]; } } } - var11.resetBounds(); // L: 255 - return var11; // L: 256 + var11.resetBounds(); + return var11; } } else { return this; @@ -495,11 +495,11 @@ public class Model extends Renderable { ) @Export("toSharedSequenceModel") public Model toSharedSequenceModel(boolean var1) { - if (!var1 && Model_sharedSequenceModelFaceAlphas.length < this.indicesCount) { // L: 260 + if (!var1 && Model_sharedSequenceModelFaceAlphas.length < this.indicesCount) { Model_sharedSequenceModelFaceAlphas = new byte[this.indicesCount + 100]; } - return this.buildSharedModel(var1, Model_sharedSequenceModel, Model_sharedSequenceModelFaceAlphas); // L: 261 + return this.buildSharedModel(var1, Model_sharedSequenceModel, Model_sharedSequenceModelFaceAlphas); } @ObfuscatedName("m") @@ -508,11 +508,11 @@ public class Model extends Renderable { ) @Export("toSharedSpotAnimationModel") public Model toSharedSpotAnimationModel(boolean var1) { - if (!var1 && Model_sharedSpotAnimationModelFaceAlphas.length < this.indicesCount) { // L: 265 + if (!var1 && Model_sharedSpotAnimationModelFaceAlphas.length < this.indicesCount) { Model_sharedSpotAnimationModelFaceAlphas = new byte[this.indicesCount + 100]; } - return this.buildSharedModel(var1, Model_sharedSpotAnimationModel, Model_sharedSpotAnimationModelFaceAlphas); // L: 266 + return this.buildSharedModel(var1, Model_sharedSpotAnimationModel, Model_sharedSpotAnimationModelFaceAlphas); } @ObfuscatedName("t") @@ -521,193 +521,193 @@ public class Model extends Renderable { ) @Export("buildSharedModel") Model buildSharedModel(boolean var1, Model var2, byte[] var3) { - var2.verticesCount = this.verticesCount; // L: 270 - var2.indicesCount = this.indicesCount; // L: 271 - var2.field2442 = this.field2442; // 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 - var2.verticesZ = new int[this.verticesCount + 100]; // L: 276 + var2.verticesCount = this.verticesCount; + var2.indicesCount = this.indicesCount; + var2.field2442 = this.field2442; + if (var2.verticesX == null || var2.verticesX.length < this.verticesCount) { + var2.verticesX = new int[this.verticesCount + 100]; + var2.verticesY = new int[this.verticesCount + 100]; + var2.verticesZ = new int[this.verticesCount + 100]; } int var4; - for (var4 = 0; var4 < this.verticesCount; ++var4) { // L: 278 - var2.verticesX[var4] = this.verticesX[var4]; // L: 279 - var2.verticesY[var4] = this.verticesY[var4]; // L: 280 - var2.verticesZ[var4] = this.verticesZ[var4]; // L: 281 + for (var4 = 0; var4 < this.verticesCount; ++var4) { + var2.verticesX[var4] = this.verticesX[var4]; + var2.verticesY[var4] = this.verticesY[var4]; + var2.verticesZ[var4] = this.verticesZ[var4]; } - if (var1) { // L: 283 + if (var1) { var2.faceAlphas = this.faceAlphas; } else { - var2.faceAlphas = var3; // L: 285 - if (this.faceAlphas == null) { // L: 286 - for (var4 = 0; var4 < this.indicesCount; ++var4) { // L: 287 + var2.faceAlphas = var3; + if (this.faceAlphas == null) { + for (var4 = 0; var4 < this.indicesCount; ++var4) { var2.faceAlphas[var4] = 0; } } else { - for (var4 = 0; var4 < this.indicesCount; ++var4) { // L: 290 + for (var4 = 0; var4 < this.indicesCount; ++var4) { var2.faceAlphas[var4] = this.faceAlphas[var4]; } } } - var2.indices1 = this.indices1; // L: 293 - var2.indices2 = this.indices2; // L: 294 - var2.indices3 = this.indices3; // L: 295 - var2.faceColors1 = this.faceColors1; // L: 296 - var2.faceColors2 = this.faceColors2; // L: 297 - var2.faceColors3 = this.faceColors3; // L: 298 - var2.faceRenderPriorities = this.faceRenderPriorities; // L: 299 - var2.field2439 = this.field2439; // L: 300 - var2.faceTextures = this.faceTextures; // L: 301 - var2.field2444 = this.field2444; // L: 302 - var2.field2443 = this.field2443; // L: 303 - var2.field2471 = this.field2471; // L: 304 - var2.field2445 = this.field2445; // L: 305 - var2.vertexLabels = this.vertexLabels; // L: 306 - var2.faceLabelsAlpha = this.faceLabelsAlpha; // L: 307 - var2.field2448 = this.field2448; // L: 308 - var2.field2449 = this.field2449; // L: 309 - var2.isSingleTile = this.isSingleTile; // L: 310 - var2.resetBounds(); // L: 311 - var2.field2474 = 0; // L: 312 - return var2; // L: 313 + var2.indices1 = this.indices1; + var2.indices2 = this.indices2; + var2.indices3 = this.indices3; + var2.faceColors1 = this.faceColors1; + var2.faceColors2 = this.faceColors2; + var2.faceColors3 = this.faceColors3; + var2.faceRenderPriorities = this.faceRenderPriorities; + var2.field2439 = this.field2439; + var2.faceTextures = this.faceTextures; + var2.field2444 = this.field2444; + var2.field2443 = this.field2443; + var2.field2471 = this.field2471; + var2.field2445 = this.field2445; + var2.vertexLabels = this.vertexLabels; + var2.faceLabelsAlpha = this.faceLabelsAlpha; + var2.field2448 = this.field2448; + var2.field2449 = this.field2449; + var2.isSingleTile = this.isSingleTile; + var2.resetBounds(); + var2.field2474 = 0; + return var2; } @ObfuscatedName("r") @Export("calculateBoundingBox") void calculateBoundingBox(int var1) { - if (this.xMidOffset == -1) { // L: 317 - int var2 = 0; // L: 318 - int var3 = 0; // L: 319 - int var4 = 0; // L: 320 - int var5 = 0; // L: 321 - int var6 = 0; // L: 322 - int var7 = 0; // L: 323 - int var8 = field2489[var1]; // L: 324 - int var9 = field2465[var1]; // L: 325 + if (this.xMidOffset == -1) { + int var2 = 0; + int var3 = 0; + int var4 = 0; + int var5 = 0; + int var6 = 0; + int var7 = 0; + int var8 = field2489[var1]; + int var9 = field2465[var1]; - for (int var10 = 0; var10 < this.verticesCount; ++var10) { // L: 326 - int var11 = Rasterizer3D.method3847(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 327 - int var12 = this.verticesY[var10]; // L: 328 - int var13 = Rasterizer3D.method3864(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 329 - if (var11 < var2) { // L: 330 + for (int var10 = 0; var10 < this.verticesCount; ++var10) { + int var11 = Rasterizer3D.method3847(this.verticesX[var10], this.verticesZ[var10], var8, var9); + int var12 = this.verticesY[var10]; + int var13 = Rasterizer3D.method3864(this.verticesX[var10], this.verticesZ[var10], var8, var9); + if (var11 < var2) { var2 = var11; } - if (var11 > var5) { // L: 331 + if (var11 > var5) { var5 = var11; } - if (var12 < var3) { // L: 332 + if (var12 < var3) { var3 = var12; } - if (var12 > var6) { // L: 333 + if (var12 > var6) { var6 = var12; } - if (var13 < var4) { // L: 334 + if (var13 < var4) { var4 = var13; } - if (var13 > var7) { // L: 335 + if (var13 > var7) { var7 = var13; } } - this.xMid = (var5 + var2) / 2; // L: 337 - this.yMid = (var6 + var3) / 2; // L: 338 - this.zMid = (var7 + var4) / 2; // L: 339 - 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.xMid = (var5 + var2) / 2; + this.yMid = (var6 + var3) / 2; + this.zMid = (var7 + var4) / 2; + this.xMidOffset = (var5 - var2 + 1) / 2; + this.yMidOffset = (var6 - var3 + 1) / 2; + this.zMidOffset = (var7 - var4 + 1) / 2; + boolean var14 = true; + if (this.xMidOffset < 32) { this.xMidOffset = 32; } - if (this.zMidOffset < 32) { // L: 345 + if (this.zMidOffset < 32) { this.zMidOffset = 32; } - if (this.isSingleTile) { // L: 346 - boolean var15 = true; // L: 347 - this.xMidOffset += 8; // L: 348 - this.zMidOffset += 8; // L: 349 + if (this.isSingleTile) { + boolean var15 = true; + this.xMidOffset += 8; + this.zMidOffset += 8; } } - } // L: 351 + } @ObfuscatedName("o") @Export("calculateBoundsCylinder") public void calculateBoundsCylinder() { - if (this.boundsType != 1) { // L: 354 - this.boundsType = 1; // L: 355 - super.height = 0; // L: 356 - this.bottomY = 0; // L: 357 - this.xzRadius = 0; // L: 358 + if (this.boundsType != 1) { + this.boundsType = 1; + super.height = 0; + this.bottomY = 0; + this.xzRadius = 0; - for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 359 - int var2 = this.verticesX[var1]; // L: 360 - int var3 = this.verticesY[var1]; // L: 361 - int var4 = this.verticesZ[var1]; // L: 362 - if (-var3 > super.height) { // L: 363 + for (int var1 = 0; var1 < this.verticesCount; ++var1) { + int var2 = this.verticesX[var1]; + int var3 = this.verticesY[var1]; + int var4 = this.verticesZ[var1]; + if (-var3 > super.height) { super.height = -var3; } - if (var3 > this.bottomY) { // L: 364 + if (var3 > this.bottomY) { this.bottomY = var3; } - int var5 = var2 * var2 + var4 * var4; // L: 365 - if (var5 > this.xzRadius) { // L: 366 + int var5 = var2 * var2 + var4 * var4; + if (var5 > this.xzRadius) { this.xzRadius = var5; } } - this.xzRadius = (int)(Math.sqrt((double)this.xzRadius) + 0.99D); // L: 368 - this.radius = (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + super.height * super.height)) + 0.99D); // L: 369 - this.diameter = this.radius + (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + this.bottomY * this.bottomY)) + 0.99D); // L: 370 + this.xzRadius = (int)(Math.sqrt((double)this.xzRadius) + 0.99D); + this.radius = (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + super.height * super.height)) + 0.99D); + this.diameter = this.radius + (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + this.bottomY * this.bottomY)) + 0.99D); } - } // L: 371 + } @ObfuscatedName("v") void method4194() { - if (this.boundsType != 2) { // L: 374 - this.boundsType = 2; // L: 375 - this.xzRadius = 0; // L: 376 + if (this.boundsType != 2) { + this.boundsType = 2; + this.xzRadius = 0; - for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 377 - int var2 = this.verticesX[var1]; // L: 378 - int var3 = this.verticesY[var1]; // L: 379 - int var4 = this.verticesZ[var1]; // L: 380 - int var5 = var2 * var2 + var4 * var4 + var3 * var3; // L: 381 - if (var5 > this.xzRadius) { // L: 382 + for (int var1 = 0; var1 < this.verticesCount; ++var1) { + int var2 = this.verticesX[var1]; + int var3 = this.verticesY[var1]; + int var4 = this.verticesZ[var1]; + int var5 = var2 * var2 + var4 * var4 + var3 * var3; + if (var5 > this.xzRadius) { this.xzRadius = var5; } } - this.xzRadius = (int)(Math.sqrt((double)this.xzRadius) + 0.99D); // L: 384 - this.radius = this.xzRadius; // L: 385 - this.diameter = this.xzRadius + this.xzRadius; // L: 386 + this.xzRadius = (int)(Math.sqrt((double)this.xzRadius) + 0.99D); + this.radius = this.xzRadius; + this.diameter = this.xzRadius + this.xzRadius; } - } // L: 387 + } @ObfuscatedName("d") public int method4222() { - this.calculateBoundsCylinder(); // L: 390 - return this.xzRadius; // L: 391 + this.calculateBoundsCylinder(); + return this.xzRadius; } @ObfuscatedName("h") @Export("resetBounds") public void resetBounds() { - this.boundsType = 0; // L: 395 - this.xMidOffset = -1; // L: 396 - } // L: 397 + this.boundsType = 0; + this.xMidOffset = -1; + } @ObfuscatedName("g") @ObfuscatedSignature( @@ -715,87 +715,87 @@ public class Model extends Renderable { ) @Export("animate") public void animate(Frames var1, int var2) { - if (this.vertexLabels != null) { // L: 400 - if (var2 != -1) { // L: 401 - Animation var3 = var1.frames[var2]; // L: 402 - Skeleton var4 = var3.skeleton; // L: 403 - Model_transformTempX = 0; // L: 404 - Model_transformTempY = 0; // L: 405 - Model_transformTempZ = 0; // L: 406 + if (this.vertexLabels != null) { + if (var2 != -1) { + Animation var3 = var1.frames[var2]; + Skeleton var4 = var3.skeleton; + Model_transformTempX = 0; + Model_transformTempY = 0; + Model_transformTempZ = 0; - for (int var5 = 0; var5 < var3.transformCount; ++var5) { // L: 407 - int var6 = var3.transformSkeletonLabels[var5]; // L: 408 - this.transform(var4.transformTypes[var6], var4.labels[var6], var3.transformXs[var5], var3.transformYs[var5], var3.transformZs[var5]); // L: 409 + for (int var5 = 0; var5 < var3.transformCount; ++var5) { + int var6 = var3.transformSkeletonLabels[var5]; + this.transform(var4.transformTypes[var6], var4.labels[var6], var3.transformXs[var5], var3.transformYs[var5], var3.transformZs[var5]); } - this.resetBounds(); // L: 411 + this.resetBounds(); } } - } // L: 412 + } @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(Ldb;I)V" ) public void method4271(class120 var1, int var2) { - Skeleton var3 = var1.field1457; // L: 415 - class194 var4 = var3.method3943(); // L: 416 - if (var4 != null) { // L: 417 - var3.method3943().method3939(var1, var2); // L: 418 - this.method4200(var3.method3943(), var1.method2694()); // L: 419 + Skeleton var3 = var1.field1457; + class194 var4 = var3.method3943(); + if (var4 != null) { + var3.method3943().method3939(var1, var2); + this.method4200(var3.method3943(), var1.method2694()); } - if (var1.method2695()) { // L: 421 - this.method4199(var1, var2); // L: 422 + if (var1.method2695()) { + this.method4199(var1, var2); } - this.resetBounds(); // L: 424 - } // L: 425 + this.resetBounds(); + } @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(Ldb;I)V" ) void method4199(class120 var1, int var2) { - Skeleton var3 = var1.field1457; // L: 428 + Skeleton var3 = var1.field1457; - for (int var4 = 0; var4 < var3.count; ++var4) { // L: 429 - int var5 = var3.transformTypes[var4]; // L: 430 - if (var5 == 5 && var1.field1453 != null && var1.field1453[var4] != null && var1.field1453[var4][0] != null && this.faceLabelsAlpha != null && this.faceAlphas != null) { // L: 431 432 - class115 var6 = var1.field1453[var4][0]; // L: 433 - int[] var7 = var3.labels[var4]; // L: 434 - int var8 = var7.length; // L: 435 + for (int var4 = 0; var4 < var3.count; ++var4) { + int var5 = var3.transformTypes[var4]; + if (var5 == 5 && var1.field1453 != null && var1.field1453[var4] != null && var1.field1453[var4][0] != null && this.faceLabelsAlpha != null && this.faceAlphas != null) { + class115 var6 = var1.field1453[var4][0]; + int[] var7 = var3.labels[var4]; + int var8 = var7.length; - for (int var9 = 0; var9 < var8; ++var9) { // L: 436 - int var10 = var7[var9]; // L: 437 - if (var10 < this.faceLabelsAlpha.length) { // L: 438 - int[] var11 = this.faceLabelsAlpha[var10]; // L: 439 + for (int var9 = 0; var9 < var8; ++var9) { + int var10 = var7[var9]; + if (var10 < this.faceLabelsAlpha.length) { + int[] var11 = this.faceLabelsAlpha[var10]; - 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.method2632(var2) * 255.0F); // L: 442 - if (var14 < 0) { // L: 443 + for (int var12 = 0; var12 < var11.length; ++var12) { + int var13 = var11[var12]; + int var14 = (int)((float)(this.faceAlphas[var13] & 255) + var6.method2632(var2) * 255.0F); + if (var14 < 0) { var14 = 0; - } else if (var14 > 255) { // L: 444 + } else if (var14 > 255) { var14 = 255; } - this.faceAlphas[var13] = (byte)var14; // L: 445 + this.faceAlphas[var13] = (byte)var14; } } } } } - } // L: 452 + } @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(Lgq;I)V" ) void method4200(class194 var1, int var2) { - this.method4218(var1, var2); // L: 456 - } // L: 458 + this.method4218(var1, var2); + } @ObfuscatedName("k") @ObfuscatedSignature( @@ -803,263 +803,263 @@ public class Model extends Renderable { ) @Export("animate2") public void animate2(Frames var1, int var2, Frames var3, int var4, int[] var5) { - if (var2 != -1) { // L: 461 - if (var5 != null && var4 != -1) { // L: 462 - Animation var6 = var1.frames[var2]; // L: 466 - Animation var7 = var3.frames[var4]; // L: 467 - Skeleton var8 = var6.skeleton; // L: 468 - Model_transformTempX = 0; // L: 469 - Model_transformTempY = 0; // L: 470 - Model_transformTempZ = 0; // L: 471 - byte var9 = 0; // L: 472 - int var13 = var9 + 1; // L: 473 + if (var2 != -1) { + if (var5 != null && var4 != -1) { + Animation var6 = var1.frames[var2]; + Animation var7 = var3.frames[var4]; + Skeleton var8 = var6.skeleton; + Model_transformTempX = 0; + Model_transformTempY = 0; + Model_transformTempZ = 0; + byte var9 = 0; + int var13 = var9 + 1; int var10 = var5[var9]; int var11; int var12; - for (var11 = 0; var11 < var6.transformCount; ++var11) { // L: 474 - for (var12 = var6.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) { // L: 475 476 + for (var11 = 0; var11 < var6.transformCount; ++var11) { + for (var12 = var6.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) { } - if (var12 != var10 || var8.transformTypes[var12] == 0) { // L: 477 + if (var12 != var10 || var8.transformTypes[var12] == 0) { this.transform(var8.transformTypes[var12], var8.labels[var12], var6.transformXs[var11], var6.transformYs[var11], var6.transformZs[var11]); } } - Model_transformTempX = 0; // L: 479 - Model_transformTempY = 0; // L: 480 - Model_transformTempZ = 0; // L: 481 - var9 = 0; // L: 482 - var13 = var9 + 1; // L: 483 + Model_transformTempX = 0; + Model_transformTempY = 0; + Model_transformTempZ = 0; + var9 = 0; + var13 = var9 + 1; var10 = var5[var9]; - for (var11 = 0; var11 < var7.transformCount; ++var11) { // L: 484 - for (var12 = var7.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) { // L: 485 486 + for (var11 = 0; var11 < var7.transformCount; ++var11) { + for (var12 = var7.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) { } - if (var12 == var10 || var8.transformTypes[var12] == 0) { // L: 487 + if (var12 == var10 || var8.transformTypes[var12] == 0) { this.transform(var8.transformTypes[var12], var8.labels[var12], var7.transformXs[var11], var7.transformYs[var11], var7.transformZs[var11]); } } - this.resetBounds(); // L: 489 + this.resetBounds(); } else { - this.animate(var1, var2); // L: 463 + this.animate(var1, var2); } } - } // L: 464 490 + } @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(Ldb;I[ZZ)V" ) public void method4202(class120 var1, int var2, boolean[] var3, boolean var4) { - Skeleton var5 = var1.field1457; // L: 493 - class194 var6 = var5.method3943(); // L: 494 - if (var6 != null) { // L: 495 - var6.method3940(var1, var2, var3, var4); // L: 496 - this.method4200(var6, var1.method2694()); // L: 497 + Skeleton var5 = var1.field1457; + class194 var6 = var5.method3943(); + if (var6 != null) { + var6.method3940(var1, var2, var3, var4); + this.method4200(var6, var1.method2694()); } - if (var1.method2695()) { // L: 499 - this.method4199(var1, var2); // L: 500 + if (var1.method2695()) { + this.method4199(var1, var2); } - } // L: 502 + } @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(Lgg;I[IZ)V" ) public void method4203(Frames var1, int var2, int[] var3, boolean var4) { - if (var3 == null) { // L: 505 - this.animate(var1, var2); // L: 506 + if (var3 == null) { + this.animate(var1, var2); } else { - Animation var5 = var1.frames[var2]; // L: 509 - Skeleton var6 = var5.skeleton; // L: 510 - byte var7 = 0; // L: 511 - int var11 = var7 + 1; // L: 512 + Animation var5 = var1.frames[var2]; + Skeleton var6 = var5.skeleton; + byte var7 = 0; + int var11 = var7 + 1; int var8 = var3[var7]; - Model_transformTempX = 0; // L: 513 - Model_transformTempY = 0; // L: 514 - Model_transformTempZ = 0; // L: 515 + Model_transformTempX = 0; + Model_transformTempY = 0; + Model_transformTempZ = 0; - for (int var9 = 0; var9 < var5.transformCount; ++var9) { // L: 516 + for (int var9 = 0; var9 < var5.transformCount; ++var9) { int var10; - for (var10 = var5.transformSkeletonLabels[var9]; var10 > var8; var8 = var3[var11++]) { // L: 517 518 + for (var10 = var5.transformSkeletonLabels[var9]; var10 > var8; var8 = var3[var11++]) { } - if (var4) { // L: 519 - if (var10 == var8 || var6.transformTypes[var10] == 0) { // L: 520 + if (var4) { + if (var10 == var8 || var6.transformTypes[var10] == 0) { this.transform(var6.transformTypes[var10], var6.labels[var10], var5.transformXs[var9], var5.transformYs[var9], var5.transformZs[var9]); } } else if (var10 != var8 || var6.transformTypes[var10] == 0) { - this.transform(var6.transformTypes[var10], var6.labels[var10], var5.transformXs[var9], var5.transformYs[var9], var5.transformZs[var9]); // L: 523 + this.transform(var6.transformTypes[var10], var6.labels[var10], var5.transformXs[var9], var5.transformYs[var9], var5.transformZs[var9]); } } } - } // L: 507 526 + } @ObfuscatedName("q") @Export("transform") void transform(int var1, int[] var2, int var3, int var4, int var5) { - int var6 = var2.length; // L: 529 + int var6 = var2.length; int var7; int var8; int var11; int var12; - if (var1 == 0) { // L: 530 - var7 = 0; // L: 531 - Model_transformTempX = 0; // L: 532 - Model_transformTempY = 0; // L: 533 - Model_transformTempZ = 0; // L: 534 + if (var1 == 0) { + var7 = 0; + Model_transformTempX = 0; + Model_transformTempY = 0; + Model_transformTempZ = 0; - for (var8 = 0; var8 < var6; ++var8) { // L: 535 - int var18 = var2[var8]; // L: 536 - if (var18 < this.vertexLabels.length) { // L: 537 - int[] var19 = this.vertexLabels[var18]; // L: 538 + for (var8 = 0; var8 < var6; ++var8) { + int var18 = var2[var8]; + if (var18 < this.vertexLabels.length) { + int[] var19 = this.vertexLabels[var18]; - for (var11 = 0; var11 < var19.length; ++var11) { // L: 539 - var12 = var19[var11]; // L: 540 - Model_transformTempX += this.verticesX[var12]; // L: 541 - Model_transformTempY += this.verticesY[var12]; // L: 542 - Model_transformTempZ += this.verticesZ[var12]; // L: 543 - ++var7; // L: 544 + for (var11 = 0; var11 < var19.length; ++var11) { + var12 = var19[var11]; + Model_transformTempX += this.verticesX[var12]; + Model_transformTempY += this.verticesY[var12]; + Model_transformTempZ += this.verticesZ[var12]; + ++var7; } } } - if (var7 > 0) { // L: 548 - Model_transformTempX = var3 + Model_transformTempX / var7; // L: 549 - Model_transformTempY = var4 + Model_transformTempY / var7; // L: 550 - Model_transformTempZ = var5 + Model_transformTempZ / var7; // L: 551 + if (var7 > 0) { + Model_transformTempX = var3 + Model_transformTempX / var7; + Model_transformTempY = var4 + Model_transformTempY / var7; + Model_transformTempZ = var5 + Model_transformTempZ / var7; } else { - Model_transformTempX = var3; // L: 554 - Model_transformTempY = var4; // L: 555 - Model_transformTempZ = var5; // L: 556 + Model_transformTempX = var3; + Model_transformTempY = var4; + Model_transformTempZ = var5; } } else { int[] var9; int var10; int[] var10000; - if (var1 == 1) { // L: 560 - for (var7 = 0; var7 < var6; ++var7) { // L: 561 - var8 = var2[var7]; // L: 562 - if (var8 < this.vertexLabels.length) { // L: 563 - var9 = this.vertexLabels[var8]; // L: 564 + if (var1 == 1) { + for (var7 = 0; var7 < var6; ++var7) { + var8 = var2[var7]; + if (var8 < this.vertexLabels.length) { + var9 = this.vertexLabels[var8]; - for (var10 = 0; var10 < var9.length; ++var10) { // L: 565 - var11 = var9[var10]; // L: 566 - var10000 = this.verticesX; // L: 567 + for (var10 = 0; var10 < var9.length; ++var10) { + var11 = var9[var10]; + var10000 = this.verticesX; var10000[var11] += var3; - var10000 = this.verticesY; // L: 568 + var10000 = this.verticesY; var10000[var11] += var4; - var10000 = this.verticesZ; // L: 569 + var10000 = this.verticesZ; var10000[var11] += var5; } } } - } else if (var1 == 2) { // L: 575 - for (var7 = 0; var7 < var6; ++var7) { // L: 576 - var8 = var2[var7]; // L: 577 - if (var8 < this.vertexLabels.length) { // L: 578 - var9 = this.vertexLabels[var8]; // L: 579 + } else if (var1 == 2) { + for (var7 = 0; var7 < var6; ++var7) { + var8 = var2[var7]; + if (var8 < this.vertexLabels.length) { + var9 = this.vertexLabels[var8]; - for (var10 = 0; var10 < var9.length; ++var10) { // L: 580 - var11 = var9[var10]; // L: 581 - var10000 = this.verticesX; // L: 582 + for (var10 = 0; var10 < var9.length; ++var10) { + var11 = var9[var10]; + var10000 = this.verticesX; var10000[var11] -= Model_transformTempX; - var10000 = this.verticesY; // L: 583 + var10000 = this.verticesY; var10000[var11] -= Model_transformTempY; - var10000 = this.verticesZ; // L: 584 + var10000 = this.verticesZ; var10000[var11] -= Model_transformTempZ; - var12 = (var3 & 255) * 8; // L: 585 - int var13 = (var4 & 255) * 8; // L: 586 - int var14 = (var5 & 255) * 8; // L: 587 + var12 = (var3 & 255) * 8; + int var13 = (var4 & 255) * 8; + int var14 = (var5 & 255) * 8; int var15; int var16; int var17; - if (var14 != 0) { // L: 588 - var15 = field2465[var14]; // L: 589 - var16 = field2489[var14]; // L: 590 - var17 = var15 * this.verticesY[var11] + var16 * this.verticesX[var11] >> 16; // L: 591 - this.verticesY[var11] = var16 * this.verticesY[var11] - var15 * this.verticesX[var11] >> 16; // L: 592 - this.verticesX[var11] = var17; // L: 593 + if (var14 != 0) { + var15 = field2465[var14]; + var16 = field2489[var14]; + var17 = var15 * this.verticesY[var11] + var16 * this.verticesX[var11] >> 16; + this.verticesY[var11] = var16 * this.verticesY[var11] - var15 * this.verticesX[var11] >> 16; + this.verticesX[var11] = var17; } - if (var12 != 0) { // L: 595 - var15 = field2465[var12]; // L: 596 - var16 = field2489[var12]; // L: 597 - var17 = var16 * this.verticesY[var11] - var15 * this.verticesZ[var11] >> 16; // L: 598 - this.verticesZ[var11] = var15 * this.verticesY[var11] + var16 * this.verticesZ[var11] >> 16; // L: 599 - this.verticesY[var11] = var17; // L: 600 + if (var12 != 0) { + var15 = field2465[var12]; + var16 = field2489[var12]; + var17 = var16 * this.verticesY[var11] - var15 * this.verticesZ[var11] >> 16; + this.verticesZ[var11] = var15 * this.verticesY[var11] + var16 * this.verticesZ[var11] >> 16; + this.verticesY[var11] = var17; } - if (var13 != 0) { // L: 602 - var15 = field2465[var13]; // L: 603 - var16 = field2489[var13]; // L: 604 - var17 = var15 * this.verticesZ[var11] + var16 * this.verticesX[var11] >> 16; // L: 605 - this.verticesZ[var11] = var16 * this.verticesZ[var11] - var15 * this.verticesX[var11] >> 16; // L: 606 - this.verticesX[var11] = var17; // L: 607 + if (var13 != 0) { + var15 = field2465[var13]; + var16 = field2489[var13]; + var17 = var15 * this.verticesZ[var11] + var16 * this.verticesX[var11] >> 16; + this.verticesZ[var11] = var16 * this.verticesZ[var11] - var15 * this.verticesX[var11] >> 16; + this.verticesX[var11] = var17; } - var10000 = this.verticesX; // L: 609 + var10000 = this.verticesX; var10000[var11] += Model_transformTempX; - var10000 = this.verticesY; // L: 610 + var10000 = this.verticesY; var10000[var11] += Model_transformTempY; - var10000 = this.verticesZ; // L: 611 + var10000 = this.verticesZ; var10000[var11] += Model_transformTempZ; } } } - } else if (var1 == 3) { // L: 617 - for (var7 = 0; var7 < var6; ++var7) { // L: 618 - var8 = var2[var7]; // L: 619 - if (var8 < this.vertexLabels.length) { // L: 620 - var9 = this.vertexLabels[var8]; // L: 621 + } else if (var1 == 3) { + for (var7 = 0; var7 < var6; ++var7) { + var8 = var2[var7]; + if (var8 < this.vertexLabels.length) { + var9 = this.vertexLabels[var8]; - for (var10 = 0; var10 < var9.length; ++var10) { // L: 622 - var11 = var9[var10]; // L: 623 - var10000 = this.verticesX; // L: 624 + for (var10 = 0; var10 < var9.length; ++var10) { + var11 = var9[var10]; + var10000 = this.verticesX; var10000[var11] -= Model_transformTempX; - var10000 = this.verticesY; // L: 625 + var10000 = this.verticesY; var10000[var11] -= Model_transformTempY; - var10000 = this.verticesZ; // L: 626 + var10000 = this.verticesZ; var10000[var11] -= Model_transformTempZ; - this.verticesX[var11] = var3 * this.verticesX[var11] / 128; // L: 627 - this.verticesY[var11] = var4 * this.verticesY[var11] / 128; // L: 628 - this.verticesZ[var11] = var5 * this.verticesZ[var11] / 128; // L: 629 - var10000 = this.verticesX; // L: 630 + this.verticesX[var11] = var3 * this.verticesX[var11] / 128; + this.verticesY[var11] = var4 * this.verticesY[var11] / 128; + this.verticesZ[var11] = var5 * this.verticesZ[var11] / 128; + var10000 = this.verticesX; var10000[var11] += Model_transformTempX; - var10000 = this.verticesY; // L: 631 + var10000 = this.verticesY; var10000[var11] += Model_transformTempY; - var10000 = this.verticesZ; // L: 632 + var10000 = this.verticesZ; var10000[var11] += Model_transformTempZ; } } } - } else if (var1 == 5) { // L: 638 - if (this.faceLabelsAlpha != null && this.faceAlphas != null) { // L: 639 - for (var7 = 0; var7 < var6; ++var7) { // L: 640 - var8 = var2[var7]; // L: 641 - if (var8 < this.faceLabelsAlpha.length) { // L: 642 - var9 = this.faceLabelsAlpha[var8]; // L: 643 + } else if (var1 == 5) { + if (this.faceLabelsAlpha != null && this.faceAlphas != null) { + for (var7 = 0; var7 < var6; ++var7) { + var8 = var2[var7]; + if (var8 < this.faceLabelsAlpha.length) { + var9 = this.faceLabelsAlpha[var8]; - for (var10 = 0; var10 < var9.length; ++var10) { // L: 644 - var11 = var9[var10]; // L: 645 - var12 = (this.faceAlphas[var11] & 255) + var3 * 8; // L: 646 - if (var12 < 0) { // L: 647 + for (var10 = 0; var10 < var9.length; ++var10) { + var11 = var9[var10]; + var12 = (this.faceAlphas[var11] & 255) + var3 * 8; + if (var12 < 0) { var12 = 0; - } else if (var12 > 255) { // L: 648 + } else if (var12 > 255) { var12 = 255; } - this.faceAlphas[var11] = (byte)var12; // L: 649 + this.faceAlphas[var11] = (byte)var12; } } } @@ -1067,223 +1067,221 @@ public class Model extends Renderable { } } - } // L: 558 573 615 636 654 656 + } @ObfuscatedName("x") @Export("rotateY90Ccw") public void rotateY90Ccw() { - for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 659 - int var2 = this.verticesX[var1]; // L: 660 - this.verticesX[var1] = this.verticesZ[var1]; // L: 661 - this.verticesZ[var1] = -var2; // L: 662 + for (int var1 = 0; var1 < this.verticesCount; ++var1) { + int var2 = this.verticesX[var1]; + this.verticesX[var1] = this.verticesZ[var1]; + this.verticesZ[var1] = -var2; } - this.resetBounds(); // L: 664 - } // L: 665 + this.resetBounds(); + } @ObfuscatedName("z") - @Export("rotateY180") - public void rotateY180() { - for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 668 - this.verticesX[var1] = -this.verticesX[var1]; // L: 669 - this.verticesZ[var1] = -this.verticesZ[var1]; // L: 670 + public void method4206() { + for (int var1 = 0; var1 < this.verticesCount; ++var1) { + this.verticesX[var1] = -this.verticesX[var1]; + this.verticesZ[var1] = -this.verticesZ[var1]; } - this.resetBounds(); // L: 672 - } // L: 673 + this.resetBounds(); + } @ObfuscatedName("i") - @Export("rotateY270Ccw") - public void rotateY270Ccw() { - for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 676 - int var2 = this.verticesZ[var1]; // L: 677 - this.verticesZ[var1] = this.verticesX[var1]; // L: 678 - this.verticesX[var1] = -var2; // L: 679 + public void method4190() { + for (int var1 = 0; var1 < this.verticesCount; ++var1) { + int var2 = this.verticesZ[var1]; + this.verticesZ[var1] = this.verticesX[var1]; + this.verticesX[var1] = -var2; } - this.resetBounds(); // L: 681 - } // L: 682 + this.resetBounds(); + } @ObfuscatedName("y") @Export("rotateZ") public void rotateZ(int var1) { - int var2 = field2465[var1]; // L: 685 - int var3 = field2489[var1]; // L: 686 + int var2 = field2465[var1]; + int var3 = field2489[var1]; - for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 687 - int var5 = var3 * this.verticesY[var4] - var2 * this.verticesZ[var4] >> 16; // L: 688 - this.verticesZ[var4] = var2 * this.verticesY[var4] + var3 * this.verticesZ[var4] >> 16; // L: 689 - this.verticesY[var4] = var5; // L: 690 + for (int var4 = 0; var4 < this.verticesCount; ++var4) { + int var5 = var3 * this.verticesY[var4] - var2 * this.verticesZ[var4] >> 16; + this.verticesZ[var4] = var2 * this.verticesY[var4] + var3 * this.verticesZ[var4] >> 16; + this.verticesY[var4] = var5; } - this.resetBounds(); // L: 692 - } // L: 693 + this.resetBounds(); + } @ObfuscatedName("ah") @Export("offsetBy") public void offsetBy(int var1, int var2, int var3) { - for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 696 - int[] var10000 = this.verticesX; // L: 697 + for (int var4 = 0; var4 < this.verticesCount; ++var4) { + int[] var10000 = this.verticesX; var10000[var4] += var1; - var10000 = this.verticesY; // L: 698 + var10000 = this.verticesY; var10000[var4] += var2; - var10000 = this.verticesZ; // L: 699 + var10000 = this.verticesZ; var10000[var4] += var3; } - this.resetBounds(); // L: 701 - } // L: 702 + this.resetBounds(); + } @ObfuscatedName("ao") @Export("scale") public void scale(int var1, int var2, int var3) { - for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 705 - this.verticesX[var4] = this.verticesX[var4] * var1 / 128; // L: 706 - this.verticesY[var4] = var2 * this.verticesY[var4] / 128; // L: 707 - this.verticesZ[var4] = var3 * this.verticesZ[var4] / 128; // L: 708 + for (int var4 = 0; var4 < this.verticesCount; ++var4) { + this.verticesX[var4] = this.verticesX[var4] * var1 / 128; + this.verticesY[var4] = var2 * this.verticesY[var4] / 128; + this.verticesZ[var4] = var3 * this.verticesZ[var4] / 128; } - this.resetBounds(); // L: 710 - } // L: 711 + this.resetBounds(); + } @ObfuscatedName("ab") public final void method4241(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - field2422[0] = -1; // L: 714 - if (this.boundsType != 2 && this.boundsType != 1) { // L: 715 + field2422[0] = -1; + if (this.boundsType != 2 && this.boundsType != 1) { this.method4194(); } - int var8 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 716 - int var9 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 717 - int var10 = field2465[var1]; // L: 718 - int var11 = field2489[var1]; // L: 719 - int var12 = field2465[var2]; // L: 720 - int var13 = field2489[var2]; // L: 721 - int var14 = field2465[var3]; // L: 722 - int var15 = field2489[var3]; // L: 723 - int var16 = field2465[var4]; // L: 724 - int var17 = field2489[var4]; // L: 725 - int var18 = var16 * var6 + var17 * var7 >> 16; // L: 726 + int var8 = Rasterizer3D.Rasterizer3D_clipMidX; + int var9 = Rasterizer3D.Rasterizer3D_clipMidY; + int var10 = field2465[var1]; + int var11 = field2489[var1]; + int var12 = field2465[var2]; + int var13 = field2489[var2]; + int var14 = field2465[var3]; + int var15 = field2489[var3]; + int var16 = field2465[var4]; + int var17 = field2489[var4]; + int var18 = var16 * var6 + var17 * var7 >> 16; - for (int var19 = 0; var19 < this.verticesCount; ++var19) { // L: 727 - int var20 = this.verticesX[var19]; // L: 728 - int var21 = this.verticesY[var19]; // L: 729 - int var22 = this.verticesZ[var19]; // L: 730 + for (int var19 = 0; var19 < this.verticesCount; ++var19) { + int var20 = this.verticesX[var19]; + int var21 = this.verticesY[var19]; + int var22 = this.verticesZ[var19]; int var23; - if (var3 != 0) { // L: 731 - var23 = var21 * var14 + var20 * var15 >> 16; // L: 732 - var21 = var21 * var15 - var20 * var14 >> 16; // L: 733 - var20 = var23; // L: 734 + if (var3 != 0) { + var23 = var21 * var14 + var20 * var15 >> 16; + var21 = var21 * var15 - var20 * var14 >> 16; + var20 = var23; } - if (var1 != 0) { // L: 736 - var23 = var21 * var11 - var22 * var10 >> 16; // L: 737 - var22 = var21 * var10 + var22 * var11 >> 16; // L: 738 - var21 = var23; // L: 739 + if (var1 != 0) { + var23 = var21 * var11 - var22 * var10 >> 16; + var22 = var21 * var10 + var22 * var11 >> 16; + var21 = var23; } - if (var2 != 0) { // L: 741 - var23 = var22 * var12 + var20 * var13 >> 16; // L: 742 - var22 = var22 * var13 - var20 * var12 >> 16; // L: 743 - var20 = var23; // L: 744 + if (var2 != 0) { + var23 = var22 * var12 + var20 * var13 >> 16; + var22 = var22 * var13 - var20 * var12 >> 16; + var20 = var23; } - var20 += var5; // L: 746 - var21 += var6; // L: 747 - var22 += var7; // L: 748 - var23 = var21 * var17 - var22 * var16 >> 16; // L: 749 - var22 = var21 * var16 + var22 * var17 >> 16; // L: 750 - field2497[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.field2442 > 0) { // L: 755 - field2468[var19] = var20; // L: 756 - field2469[var19] = var23; // L: 757 - field2470[var19] = var22; // L: 758 + var20 += var5; + var21 += var6; + var22 += var7; + var23 = var21 * var17 - var22 * var16 >> 16; + var22 = var21 * var16 + var22 * var17 >> 16; + field2497[var19] = var22 - var18; + modelViewportXs[var19] = var20 * Rasterizer3D.Rasterizer3D_zoom / var22 + var8; + modelViewportYs[var19] = var23 * Rasterizer3D.Rasterizer3D_zoom / var22 + var9; + if (this.field2442 > 0) { + field2468[var19] = var20; + field2469[var19] = var23; + field2470[var19] = var22; } } try { - this.draw0(false, false, false, 0L); // L: 762 - } catch (Exception var25) { // L: 764 + this.draw0(false, false, false, 0L); + } catch (Exception var25) { } - } // L: 765 + } @ObfuscatedName("an") public final void method4211(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - field2422[0] = -1; // L: 768 - if (this.boundsType != 2 && this.boundsType != 1) { // L: 769 + field2422[0] = -1; + if (this.boundsType != 2 && this.boundsType != 1) { this.method4194(); } - int var9 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 770 - int var10 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 771 - int var11 = field2465[var1]; // L: 772 - int var12 = field2489[var1]; // L: 773 - int var13 = field2465[var2]; // L: 774 - int var14 = field2489[var2]; // L: 775 - int var15 = field2465[var3]; // L: 776 - int var16 = field2489[var3]; // L: 777 - int var17 = field2465[var4]; // L: 778 - int var18 = field2489[var4]; // L: 779 - int var19 = var17 * var6 + var18 * var7 >> 16; // L: 780 + int var9 = Rasterizer3D.Rasterizer3D_clipMidX; + int var10 = Rasterizer3D.Rasterizer3D_clipMidY; + int var11 = field2465[var1]; + int var12 = field2489[var1]; + int var13 = field2465[var2]; + int var14 = field2489[var2]; + int var15 = field2465[var3]; + int var16 = field2489[var3]; + int var17 = field2465[var4]; + int var18 = field2489[var4]; + int var19 = var17 * var6 + var18 * var7 >> 16; - for (int var20 = 0; var20 < this.verticesCount; ++var20) { // L: 781 - int var21 = this.verticesX[var20]; // L: 782 - int var22 = this.verticesY[var20]; // L: 783 - int var23 = this.verticesZ[var20]; // L: 784 + for (int var20 = 0; var20 < this.verticesCount; ++var20) { + int var21 = this.verticesX[var20]; + int var22 = this.verticesY[var20]; + int var23 = this.verticesZ[var20]; int var24; - if (var3 != 0) { // L: 785 - var24 = var22 * var15 + var21 * var16 >> 16; // L: 786 - var22 = var22 * var16 - var21 * var15 >> 16; // L: 787 - var21 = var24; // L: 788 + if (var3 != 0) { + var24 = var22 * var15 + var21 * var16 >> 16; + var22 = var22 * var16 - var21 * var15 >> 16; + var21 = var24; } - if (var1 != 0) { // L: 790 - var24 = var22 * var12 - var23 * var11 >> 16; // L: 791 - var23 = var22 * var11 + var23 * var12 >> 16; // L: 792 - var22 = var24; // L: 793 + if (var1 != 0) { + var24 = var22 * var12 - var23 * var11 >> 16; + var23 = var22 * var11 + var23 * var12 >> 16; + var22 = var24; } - if (var2 != 0) { // L: 795 - var24 = var23 * var13 + var21 * var14 >> 16; // L: 796 - var23 = var23 * var14 - var21 * var13 >> 16; // L: 797 - var21 = var24; // L: 798 + if (var2 != 0) { + var24 = var23 * var13 + var21 * var14 >> 16; + var23 = var23 * var14 - var21 * var13 >> 16; + var21 = var24; } - var21 += var5; // L: 800 - var22 += var6; // L: 801 - var23 += var7; // L: 802 - var24 = var22 * var18 - var23 * var17 >> 16; // L: 803 - var23 = var22 * var17 + var23 * var18 >> 16; // L: 804 - field2497[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.field2442 > 0) { // L: 809 - field2468[var20] = var21; // L: 810 - field2469[var20] = var24; // L: 811 - field2470[var20] = var23; // L: 812 + var21 += var5; + var22 += var6; + var23 += var7; + var24 = var22 * var18 - var23 * var17 >> 16; + var23 = var22 * var17 + var23 * var18 >> 16; + field2497[var20] = var23 - var19; + modelViewportXs[var20] = var9 + var21 * Rasterizer3D.Rasterizer3D_zoom / var8; + modelViewportYs[var20] = var10 + var24 * Rasterizer3D.Rasterizer3D_zoom / var8; + if (this.field2442 > 0) { + field2468[var20] = var21; + field2469[var20] = var24; + field2470[var20] = var23; } } try { - this.draw0(false, false, false, 0L); // L: 816 - } catch (Exception var26) { // L: 818 + this.draw0(false, false, false, 0L); + } catch (Exception var26) { } - } // L: 819 + } @ObfuscatedName("ax") @Export("draw0") final void draw0(boolean var1, boolean var2, boolean var3, long var4) { - if (this.diameter < 1600) { // L: 1022 + if (this.diameter < 1600) { int var6; - for (var6 = 0; var6 < this.diameter; ++var6) { // L: 1023 + for (var6 = 0; var6 < this.diameter; ++var6) { field2422[var6] = 0; } - var6 = var3 ? 20 : 5; // L: 1024 + var6 = var3 ? 20 : 5; int var7; int var8; @@ -1295,475 +1293,475 @@ public class Model extends Renderable { int var16; int var18; int var28; - for (var7 = 0; var7 < this.indicesCount; ++var7) { // L: 1025 - if (this.faceColors3[var7] != -2) { // L: 1026 - var8 = this.indices1[var7]; // L: 1027 - var9 = this.indices2[var7]; // L: 1028 - var10 = this.indices3[var7]; // L: 1029 - var11 = modelViewportXs[var8]; // L: 1030 - var12 = modelViewportXs[var9]; // L: 1031 - var28 = modelViewportXs[var10]; // L: 1032 + for (var7 = 0; var7 < this.indicesCount; ++var7) { + if (this.faceColors3[var7] != -2) { + var8 = this.indices1[var7]; + var9 = this.indices2[var7]; + var10 = this.indices3[var7]; + var11 = modelViewportXs[var8]; + var12 = modelViewportXs[var9]; + var28 = modelViewportXs[var10]; int var29; int var30; - if (!var1 || var11 != -5000 && var12 != -5000 && var28 != -5000) { // L: 1033 - if (var2) { // L: 1059 - var15 = modelViewportYs[var8]; // L: 1061 - var16 = modelViewportYs[var9]; // L: 1062 - var29 = modelViewportYs[var10]; // L: 1063 - var18 = var6 + ViewportMouse.ViewportMouse_y; // L: 1065 + if (!var1 || var11 != -5000 && var12 != -5000 && var28 != -5000) { + if (var2) { + var15 = modelViewportYs[var8]; + var16 = modelViewportYs[var9]; + var29 = modelViewportYs[var10]; + var18 = var6 + ViewportMouse.ViewportMouse_y; boolean var34; - if (var18 < var15 && var18 < var16 && var18 < var29) { // L: 1066 - var34 = false; // L: 1067 + if (var18 < var15 && var18 < var16 && var18 < var29) { + var34 = false; } else { - var18 = ViewportMouse.ViewportMouse_y - var6; // L: 1070 - if (var18 > var15 && var18 > var16 && var18 > var29) { // L: 1071 - var34 = false; // L: 1072 + var18 = ViewportMouse.ViewportMouse_y - var6; + if (var18 > var15 && var18 > var16 && var18 > var29) { + var34 = false; } else { - var18 = var6 + ViewportMouse.ViewportMouse_x; // L: 1075 - if (var18 < var11 && var18 < var12 && var18 < var28) { // L: 1076 - var34 = false; // L: 1077 + var18 = var6 + ViewportMouse.ViewportMouse_x; + if (var18 < var11 && var18 < var12 && var18 < var28) { + var34 = false; } else { - var18 = ViewportMouse.ViewportMouse_x - var6; // L: 1080 - if (var18 > var11 && var18 > var12 && var18 > var28) { // L: 1081 - var34 = false; // L: 1082 + var18 = ViewportMouse.ViewportMouse_x - var6; + if (var18 > var11 && var18 > var12 && var18 > var28) { + var34 = false; } else { - var34 = true; // L: 1085 + var34 = true; } } } } - if (var34) { // L: 1087 - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var4; // L: 1090 - var2 = false; // L: 1092 + if (var34) { + ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var4; + var2 = false; } } - if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var28 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { // L: 1095 - field2476[var7] = false; // L: 1096 - if (var11 >= 0 && var12 >= 0 && var28 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var28 <= Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1097 - field2463[var7] = false; // L: 1098 + if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var28 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { + field2476[var7] = false; + if (var11 >= 0 && var12 >= 0 && var28 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var28 <= Rasterizer3D.Rasterizer3D_clipWidth) { + field2463[var7] = false; } else { field2463[var7] = true; } - var30 = (field2497[var8] + field2497[var9] + field2497[var10]) / 3 + this.radius; // L: 1099 - field2477[var30][field2422[var30]++] = var7; // L: 1100 + var30 = (field2497[var8] + field2497[var9] + field2497[var10]) / 3 + this.radius; + field2477[var30][field2422[var30]++] = var7; } } else { - var30 = field2468[var8]; // L: 1034 - var15 = field2468[var9]; // L: 1035 - var16 = field2468[var10]; // L: 1036 - var29 = field2469[var8]; // L: 1037 - var18 = field2469[var9]; // L: 1038 - int var19 = field2469[var10]; // L: 1039 - int var20 = field2470[var8]; // L: 1040 - int var21 = field2470[var9]; // L: 1041 - int var22 = field2470[var10]; // L: 1042 - var30 -= var15; // L: 1043 - var16 -= var15; // L: 1044 - var29 -= var18; // L: 1045 - var19 -= var18; // L: 1046 - var20 -= var21; // L: 1047 - var22 -= var21; // L: 1048 - int var23 = var29 * var22 - var20 * var19; // L: 1049 - int var24 = var20 * var16 - var30 * var22; // L: 1050 - int var25 = var30 * var19 - var29 * var16; // L: 1051 - if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { // L: 1052 - field2476[var7] = true; // L: 1053 - int var26 = (field2497[var8] + field2497[var9] + field2497[var10]) / 3 + this.radius; // L: 1054 - field2477[var26][field2422[var26]++] = var7; // L: 1055 + var30 = field2468[var8]; + var15 = field2468[var9]; + var16 = field2468[var10]; + var29 = field2469[var8]; + var18 = field2469[var9]; + int var19 = field2469[var10]; + int var20 = field2470[var8]; + int var21 = field2470[var9]; + int var22 = field2470[var10]; + var30 -= var15; + var16 -= var15; + var29 -= var18; + var19 -= var18; + var20 -= var21; + var22 -= var21; + int var23 = var29 * var22 - var20 * var19; + int var24 = var20 * var16 - var30 * var22; + int var25 = var30 * var19 - var29 * var16; + if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { + field2476[var7] = true; + int var26 = (field2497[var8] + field2497[var9] + field2497[var10]) / 3 + this.radius; + field2477[var26][field2422[var26]++] = var7; } } } } int[] var27; - if (this.faceRenderPriorities == null) { // L: 1104 - for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 1105 - var8 = field2422[var7]; // L: 1106 - if (var8 > 0) { // L: 1107 - var27 = field2477[var7]; // L: 1108 + if (this.faceRenderPriorities == null) { + for (var7 = this.diameter - 1; var7 >= 0; --var7) { + var8 = field2422[var7]; + if (var8 > 0) { + var27 = field2477[var7]; - for (var10 = 0; var10 < var8; ++var10) { // L: 1109 + for (var10 = 0; var10 < var8; ++var10) { this.drawFace(var27[var10]); } } } } else { - for (var7 = 0; var7 < 12; ++var7) { // L: 1114 - field2496[var7] = 0; // L: 1115 - field2478[var7] = 0; // L: 1116 + for (var7 = 0; var7 < 12; ++var7) { + field2496[var7] = 0; + field2478[var7] = 0; } - for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 1118 - var8 = field2422[var7]; // L: 1119 - if (var8 > 0) { // L: 1120 - var27 = field2477[var7]; // L: 1121 + for (var7 = this.diameter - 1; var7 >= 0; --var7) { + var8 = field2422[var7]; + if (var8 > 0) { + var27 = field2477[var7]; - for (var10 = 0; var10 < var8; ++var10) { // L: 1122 - var11 = var27[var10]; // L: 1123 - byte var33 = this.faceRenderPriorities[var11]; // L: 1124 - var28 = field2496[var33]++; // L: 1125 - field2475[var33][var28] = var11; // L: 1126 - if (var33 < 10) { // L: 1127 + for (var10 = 0; var10 < var8; ++var10) { + var11 = var27[var10]; + byte var33 = this.faceRenderPriorities[var11]; + var28 = field2496[var33]++; + field2475[var33][var28] = var11; + if (var33 < 10) { int[] var10000 = field2478; var10000[var33] += var7; - } else if (var33 == 10) { // L: 1128 + } else if (var33 == 10) { field2432[var28] = var7; } else { - field2434[var28] = var7; // L: 1129 + field2434[var28] = var7; } } } } - var7 = 0; // L: 1133 - if (field2496[1] > 0 || field2496[2] > 0) { // L: 1134 + var7 = 0; + if (field2496[1] > 0 || field2496[2] > 0) { var7 = (field2478[1] + field2478[2]) / (field2496[1] + field2496[2]); } - var8 = 0; // L: 1135 - if (field2496[3] > 0 || field2496[4] > 0) { // L: 1136 + var8 = 0; + if (field2496[3] > 0 || field2496[4] > 0) { var8 = (field2478[3] + field2478[4]) / (field2496[3] + field2496[4]); } - var9 = 0; // L: 1137 - if (field2496[6] > 0 || field2496[8] > 0) { // L: 1138 + var9 = 0; + if (field2496[6] > 0 || field2496[8] > 0) { var9 = (field2478[8] + field2478[6]) / (field2496[8] + field2496[6]); } - var11 = 0; // L: 1140 - var12 = field2496[10]; // L: 1141 - int[] var13 = field2475[10]; // L: 1142 - int[] var14 = field2432; // L: 1143 - if (var11 == var12) { // L: 1144 - var11 = 0; // L: 1145 - var12 = field2496[11]; // L: 1146 - var13 = field2475[11]; // L: 1147 - var14 = field2434; // L: 1148 + var11 = 0; + var12 = field2496[10]; + int[] var13 = field2475[10]; + int[] var14 = field2432; + if (var11 == var12) { + var11 = 0; + var12 = field2496[11]; + var13 = field2475[11]; + var14 = field2434; } - if (var11 < var12) { // L: 1150 + if (var11 < var12) { var10 = var14[var11]; } else { - var10 = -1000; // L: 1151 + var10 = -1000; } - for (var15 = 0; var15 < 10; ++var15) { // L: 1152 - while (var15 == 0 && var10 > var7) { // L: 1153 - this.drawFace(var13[var11++]); // L: 1154 - if (var11 == var12 && var13 != field2475[11]) { // L: 1155 - var11 = 0; // L: 1156 - var12 = field2496[11]; // L: 1157 - var13 = field2475[11]; // L: 1158 - var14 = field2434; // L: 1159 + for (var15 = 0; var15 < 10; ++var15) { + while (var15 == 0 && var10 > var7) { + this.drawFace(var13[var11++]); + if (var11 == var12 && var13 != field2475[11]) { + var11 = 0; + var12 = field2496[11]; + var13 = field2475[11]; + var14 = field2434; } - if (var11 < var12) { // L: 1161 + if (var11 < var12) { var10 = var14[var11]; } else { - var10 = -1000; // L: 1162 + var10 = -1000; } } - while (var15 == 3 && var10 > var8) { // L: 1164 - this.drawFace(var13[var11++]); // L: 1165 - if (var11 == var12 && var13 != field2475[11]) { // L: 1166 - var11 = 0; // L: 1167 - var12 = field2496[11]; // L: 1168 - var13 = field2475[11]; // L: 1169 - var14 = field2434; // L: 1170 + while (var15 == 3 && var10 > var8) { + this.drawFace(var13[var11++]); + if (var11 == var12 && var13 != field2475[11]) { + var11 = 0; + var12 = field2496[11]; + var13 = field2475[11]; + var14 = field2434; } - if (var11 < var12) { // L: 1172 + if (var11 < var12) { var10 = var14[var11]; } else { - var10 = -1000; // L: 1173 + var10 = -1000; } } - while (var15 == 5 && var10 > var9) { // L: 1175 - this.drawFace(var13[var11++]); // L: 1176 - if (var11 == var12 && var13 != field2475[11]) { // L: 1177 - var11 = 0; // L: 1178 - var12 = field2496[11]; // L: 1179 - var13 = field2475[11]; // L: 1180 - var14 = field2434; // L: 1181 + while (var15 == 5 && var10 > var9) { + this.drawFace(var13[var11++]); + if (var11 == var12 && var13 != field2475[11]) { + var11 = 0; + var12 = field2496[11]; + var13 = field2475[11]; + var14 = field2434; } - if (var11 < var12) { // L: 1183 + if (var11 < var12) { var10 = var14[var11]; } else { - var10 = -1000; // L: 1184 + var10 = -1000; } } - var16 = field2496[var15]; // L: 1186 - int[] var17 = field2475[var15]; // L: 1187 + var16 = field2496[var15]; + int[] var17 = field2475[var15]; - for (var18 = 0; var18 < var16; ++var18) { // L: 1188 - this.drawFace(var17[var18]); // L: 1189 + for (var18 = 0; var18 < var16; ++var18) { + this.drawFace(var17[var18]); } } - while (var10 != -1000) { // L: 1192 - this.drawFace(var13[var11++]); // L: 1193 - if (var11 == var12 && var13 != field2475[11]) { // L: 1194 - var11 = 0; // L: 1195 - var13 = field2475[11]; // L: 1196 - var12 = field2496[11]; // L: 1197 - var14 = field2434; // L: 1198 + while (var10 != -1000) { + this.drawFace(var13[var11++]); + if (var11 == var12 && var13 != field2475[11]) { + var11 = 0; + var13 = field2475[11]; + var12 = field2496[11]; + var14 = field2434; } - if (var11 < var12) { // L: 1200 + if (var11 < var12) { var10 = var14[var11]; } else { - var10 = -1000; // L: 1201 + var10 = -1000; } } } } - } // L: 1112 1203 + } @ObfuscatedName("am") @Export("drawFace") final void drawFace(int var1) { - if (field2476[var1]) { // L: 1206 - this.method4272(var1); // L: 1207 + if (field2476[var1]) { + this.method4272(var1); } else { - int var2 = this.indices1[var1]; // L: 1210 - int var3 = this.indices2[var1]; // L: 1211 - int var4 = this.indices3[var1]; // L: 1212 - Rasterizer3D.field2253 = field2463[var1]; // L: 1213 - if (this.faceAlphas == null) { // L: 1214 + int var2 = this.indices1[var1]; + int var3 = this.indices2[var1]; + int var4 = this.indices3[var1]; + Rasterizer3D.field2253 = field2463[var1]; + if (this.faceAlphas == null) { Rasterizer3D.Rasterizer3D_alpha = 0; } else { - Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1215 + Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; } int var5; int var6; int var7; - if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1216 - if (this.field2439 != null && this.field2439[var1] != -1) { // L: 1230 - int var8 = this.field2439[var1] & 255; // L: 1231 - var5 = this.field2443[var8]; // L: 1232 - var6 = this.field2471[var8]; // L: 1233 - var7 = this.field2445[var8]; // L: 1234 + if (this.faceTextures != null && this.faceTextures[var1] != -1) { + if (this.field2439 != null && this.field2439[var1] != -1) { + int var8 = this.field2439[var1] & 255; + var5 = this.field2443[var8]; + var6 = this.field2471[var8]; + var7 = this.field2445[var8]; } else { - var5 = var2; // L: 1237 - var6 = var3; // L: 1238 - var7 = var4; // L: 1239 + var5 = var2; + var6 = var3; + var7 = var4; } - if (this.faceColors3[var1] == -1) { // L: 1241 + if (this.faceColors3[var1] == -1) { Rasterizer3D.method3876(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2468[var5], field2468[var6], field2468[var7], field2469[var5], field2469[var6], field2469[var7], field2470[var5], field2470[var6], field2470[var7], this.faceTextures[var1]); } else { - Rasterizer3D.method3876(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field2468[var5], field2468[var6], field2468[var7], field2469[var5], field2469[var6], field2469[var7], field2470[var5], field2470[var6], field2470[var7], this.faceTextures[var1]); // L: 1242 + Rasterizer3D.method3876(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field2468[var5], field2468[var6], field2468[var7], field2469[var5], field2469[var6], field2469[var7], field2470[var5], field2470[var6], field2470[var7], this.faceTextures[var1]); } - } else if (this.faceColors3[var1] == -1) { // L: 1217 + } else if (this.faceColors3[var1] == -1) { Rasterizer3D.method3856(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field2490[this.faceColors1[var1]]); - } else if (this.field2474 > 0) { // L: 1218 - var5 = this.method4216(this.faceColors1[var1], this.field2494, this.field2495, this.field2479, this.field2474); // L: 1219 - var6 = this.method4216(this.faceColors2[var1], this.field2494, this.field2495, this.field2479, this.field2474); // L: 1220 - var7 = this.method4216(this.faceColors3[var1], this.field2494, this.field2495, this.field2479, this.field2474); // L: 1221 - Rasterizer3D.method3854(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], var5, var6, var7); // L: 1222 + } else if (this.field2474 > 0) { + var5 = this.method4216(this.faceColors1[var1], this.field2494, this.field2495, this.field2479, this.field2474); + var6 = this.method4216(this.faceColors2[var1], this.field2494, this.field2495, this.field2479, this.field2474); + var7 = this.method4216(this.faceColors3[var1], this.field2494, this.field2495, this.field2479, this.field2474); + Rasterizer3D.method3854(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], var5, var6, var7); } else { - Rasterizer3D.method3854(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); // L: 1224 + Rasterizer3D.method3854(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); } } - } // L: 1208 1244 + } @ObfuscatedName("az") final void method4272(int var1) { - int var2 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 1247 - int var3 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 1248 - int var4 = 0; // L: 1249 - int var5 = this.indices1[var1]; // L: 1250 - int var6 = this.indices2[var1]; // L: 1251 - int var7 = this.indices3[var1]; // L: 1252 - int var8 = field2470[var5]; // L: 1253 - int var9 = field2470[var6]; // L: 1254 - int var10 = field2470[var7]; // L: 1255 - if (this.faceAlphas == null) { // L: 1256 + int var2 = Rasterizer3D.Rasterizer3D_clipMidX; + int var3 = Rasterizer3D.Rasterizer3D_clipMidY; + int var4 = 0; + int var5 = this.indices1[var1]; + int var6 = this.indices2[var1]; + int var7 = this.indices3[var1]; + int var8 = field2470[var5]; + int var9 = field2470[var6]; + int var10 = field2470[var7]; + if (this.faceAlphas == null) { Rasterizer3D.Rasterizer3D_alpha = 0; } else { - Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1257 + Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; } int var11; int var12; int var13; int var14; - if (var8 >= 50) { // L: 1258 - field2467[var4] = modelViewportXs[var5]; // L: 1259 - field2480[var4] = modelViewportYs[var5]; // L: 1260 - field2453[var4++] = this.faceColors1[var1]; // L: 1261 + if (var8 >= 50) { + field2467[var4] = modelViewportXs[var5]; + field2480[var4] = modelViewportYs[var5]; + field2453[var4++] = this.faceColors1[var1]; } else { - var11 = field2468[var5]; // L: 1264 - var12 = field2469[var5]; // L: 1265 - var13 = this.faceColors1[var1]; // L: 1266 - if (var10 >= 50) { // L: 1267 - var14 = field2491[var10 - var8] * (50 - var8); // L: 1268 - field2467[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2468[var7] - var11) * var14 >> 16)) / 50; // L: 1269 - field2480[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2469[var7] - var12) * var14 >> 16)) / 50; // L: 1270 - field2453[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1271 + var11 = field2468[var5]; + var12 = field2469[var5]; + var13 = this.faceColors1[var1]; + if (var10 >= 50) { + var14 = field2491[var10 - var8] * (50 - var8); + field2467[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2468[var7] - var11) * var14 >> 16)) / 50; + field2480[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2469[var7] - var12) * var14 >> 16)) / 50; + field2453[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); } - if (var9 >= 50) { // L: 1273 - var14 = field2491[var9 - var8] * (50 - var8); // L: 1274 - field2467[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2468[var6] - var11) * var14 >> 16)) / 50; // L: 1275 - field2480[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2469[var6] - var12) * var14 >> 16)) / 50; // L: 1276 - field2453[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1277 + if (var9 >= 50) { + var14 = field2491[var9 - var8] * (50 - var8); + field2467[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2468[var6] - var11) * var14 >> 16)) / 50; + field2480[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2469[var6] - var12) * var14 >> 16)) / 50; + field2453[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); } } - if (var9 >= 50) { // L: 1280 - field2467[var4] = modelViewportXs[var6]; // L: 1281 - field2480[var4] = modelViewportYs[var6]; // L: 1282 - field2453[var4++] = this.faceColors2[var1]; // L: 1283 + if (var9 >= 50) { + field2467[var4] = modelViewportXs[var6]; + field2480[var4] = modelViewportYs[var6]; + field2453[var4++] = this.faceColors2[var1]; } else { - var11 = field2468[var6]; // L: 1286 - var12 = field2469[var6]; // L: 1287 - var13 = this.faceColors2[var1]; // L: 1288 - if (var8 >= 50) { // L: 1289 - var14 = field2491[var8 - var9] * (50 - var9); // L: 1290 - field2467[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2468[var5] - var11) * var14 >> 16)) / 50; // L: 1291 - field2480[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2469[var5] - var12) * var14 >> 16)) / 50; // L: 1292 - field2453[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1293 + var11 = field2468[var6]; + var12 = field2469[var6]; + var13 = this.faceColors2[var1]; + if (var8 >= 50) { + var14 = field2491[var8 - var9] * (50 - var9); + field2467[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2468[var5] - var11) * var14 >> 16)) / 50; + field2480[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2469[var5] - var12) * var14 >> 16)) / 50; + field2453[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); } - if (var10 >= 50) { // L: 1295 - var14 = field2491[var10 - var9] * (50 - var9); // L: 1296 - field2467[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2468[var7] - var11) * var14 >> 16)) / 50; // L: 1297 - field2480[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2469[var7] - var12) * var14 >> 16)) / 50; // L: 1298 - field2453[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1299 + if (var10 >= 50) { + var14 = field2491[var10 - var9] * (50 - var9); + field2467[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2468[var7] - var11) * var14 >> 16)) / 50; + field2480[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2469[var7] - var12) * var14 >> 16)) / 50; + field2453[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); } } - if (var10 >= 50) { // L: 1302 - field2467[var4] = modelViewportXs[var7]; // L: 1303 - field2480[var4] = modelViewportYs[var7]; // L: 1304 - field2453[var4++] = this.faceColors3[var1]; // L: 1305 + if (var10 >= 50) { + field2467[var4] = modelViewportXs[var7]; + field2480[var4] = modelViewportYs[var7]; + field2453[var4++] = this.faceColors3[var1]; } else { - var11 = field2468[var7]; // L: 1308 - var12 = field2469[var7]; // L: 1309 - var13 = this.faceColors3[var1]; // L: 1310 - if (var9 >= 50) { // L: 1311 - var14 = field2491[var9 - var10] * (50 - var10); // L: 1312 - field2467[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2468[var6] - var11) * var14 >> 16)) / 50; // L: 1313 - field2480[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2469[var6] - var12) * var14 >> 16)) / 50; // L: 1314 - field2453[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1315 + var11 = field2468[var7]; + var12 = field2469[var7]; + var13 = this.faceColors3[var1]; + if (var9 >= 50) { + var14 = field2491[var9 - var10] * (50 - var10); + field2467[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2468[var6] - var11) * var14 >> 16)) / 50; + field2480[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2469[var6] - var12) * var14 >> 16)) / 50; + field2453[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); } - if (var8 >= 50) { // L: 1317 - var14 = field2491[var8 - var10] * (50 - var10); // L: 1318 - field2467[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2468[var5] - var11) * var14 >> 16)) / 50; // L: 1319 - field2480[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2469[var5] - var12) * var14 >> 16)) / 50; // L: 1320 - field2453[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1321 + if (var8 >= 50) { + var14 = field2491[var8 - var10] * (50 - var10); + field2467[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2468[var5] - var11) * var14 >> 16)) / 50; + field2480[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2469[var5] - var12) * var14 >> 16)) / 50; + field2453[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); } } - var11 = field2467[0]; // L: 1324 - var12 = field2467[1]; // L: 1325 - var13 = field2467[2]; // L: 1326 - var14 = field2480[0]; // L: 1327 - int var15 = field2480[1]; // L: 1328 - int var16 = field2480[2]; // L: 1329 - Rasterizer3D.field2253 = false; // L: 1330 + var11 = field2467[0]; + var12 = field2467[1]; + var13 = field2467[2]; + var14 = field2480[0]; + int var15 = field2480[1]; + int var16 = field2480[2]; + Rasterizer3D.field2253 = false; int var17; int var18; int var19; int var20; - if (var4 == 3) { // L: 1331 - if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1332 + if (var4 == 3) { + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) { Rasterizer3D.field2253 = true; } - if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1333 - if (this.field2439 != null && this.field2439[var1] != -1) { // L: 1341 - var20 = this.field2439[var1] & 255; // L: 1342 - var17 = this.field2443[var20]; // L: 1343 - var18 = this.field2471[var20]; // L: 1344 - var19 = this.field2445[var20]; // L: 1345 + if (this.faceTextures != null && this.faceTextures[var1] != -1) { + if (this.field2439 != null && this.field2439[var1] != -1) { + var20 = this.field2439[var1] & 255; + var17 = this.field2443[var20]; + var18 = this.field2471[var20]; + var19 = this.field2445[var20]; } else { - var17 = var5; // L: 1348 - var18 = var6; // L: 1349 - var19 = var7; // L: 1350 + var17 = var5; + var18 = var6; + var19 = var7; } - if (this.faceColors3[var1] == -1) { // L: 1352 + if (this.faceColors3[var1] == -1) { Rasterizer3D.method3876(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2468[var17], field2468[var18], field2468[var19], field2469[var17], field2469[var18], field2469[var19], field2470[var17], field2470[var18], field2470[var19], this.faceTextures[var1]); } else { - Rasterizer3D.method3876(var14, var15, var16, var11, var12, var13, field2453[0], field2453[1], field2453[2], field2468[var17], field2468[var18], field2468[var19], field2469[var17], field2469[var18], field2469[var19], field2470[var17], field2470[var18], field2470[var19], this.faceTextures[var1]); // L: 1353 + Rasterizer3D.method3876(var14, var15, var16, var11, var12, var13, field2453[0], field2453[1], field2453[2], field2468[var17], field2468[var18], field2468[var19], field2469[var17], field2469[var18], field2469[var19], field2470[var17], field2470[var18], field2470[var19], this.faceTextures[var1]); } - } else if (this.faceColors3[var1] == -1) { // L: 1334 + } else if (this.faceColors3[var1] == -1) { Rasterizer3D.method3856(var14, var15, var16, var11, var12, var13, field2490[this.faceColors1[var1]]); } else { - Rasterizer3D.method3854(var14, var15, var16, var11, var12, var13, field2453[0], field2453[1], field2453[2]); // L: 1335 + Rasterizer3D.method3854(var14, var15, var16, var11, var12, var13, field2453[0], field2453[1], field2453[2]); } } - if (var4 == 4) { // L: 1356 - if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field2467[3] < 0 || field2467[3] > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1357 + if (var4 == 4) { + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field2467[3] < 0 || field2467[3] > Rasterizer3D.Rasterizer3D_clipWidth) { Rasterizer3D.field2253 = true; } - if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1358 - if (this.field2439 != null && this.field2439[var1] != -1) { // L: 1373 - var20 = this.field2439[var1] & 255; // L: 1374 - var17 = this.field2443[var20]; // L: 1375 - var18 = this.field2471[var20]; // L: 1376 - var19 = this.field2445[var20]; // L: 1377 + if (this.faceTextures != null && this.faceTextures[var1] != -1) { + if (this.field2439 != null && this.field2439[var1] != -1) { + var20 = this.field2439[var1] & 255; + var17 = this.field2443[var20]; + var18 = this.field2471[var20]; + var19 = this.field2445[var20]; } else { - var17 = var5; // L: 1380 - var18 = var6; // L: 1381 - var19 = var7; // L: 1382 + var17 = var5; + var18 = var6; + var19 = var7; } - short var21 = this.faceTextures[var1]; // L: 1384 - if (this.faceColors3[var1] == -1) { // L: 1385 - Rasterizer3D.method3876(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2468[var17], field2468[var18], field2468[var19], field2469[var17], field2469[var18], field2469[var19], field2470[var17], field2470[var18], field2470[var19], var21); // L: 1386 - Rasterizer3D.method3876(var14, var16, field2480[3], var11, var13, field2467[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2468[var17], field2468[var18], field2468[var19], field2469[var17], field2469[var18], field2469[var19], field2470[var17], field2470[var18], field2470[var19], var21); // L: 1387 + short var21 = this.faceTextures[var1]; + if (this.faceColors3[var1] == -1) { + Rasterizer3D.method3876(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2468[var17], field2468[var18], field2468[var19], field2469[var17], field2469[var18], field2469[var19], field2470[var17], field2470[var18], field2470[var19], var21); + Rasterizer3D.method3876(var14, var16, field2480[3], var11, var13, field2467[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2468[var17], field2468[var18], field2468[var19], field2469[var17], field2469[var18], field2469[var19], field2470[var17], field2470[var18], field2470[var19], var21); } else { - Rasterizer3D.method3876(var14, var15, var16, var11, var12, var13, field2453[0], field2453[1], field2453[2], field2468[var17], field2468[var18], field2468[var19], field2469[var17], field2469[var18], field2469[var19], field2470[var17], field2470[var18], field2470[var19], var21); // L: 1390 - Rasterizer3D.method3876(var14, var16, field2480[3], var11, var13, field2467[3], field2453[0], field2453[2], field2453[3], field2468[var17], field2468[var18], field2468[var19], field2469[var17], field2469[var18], field2469[var19], field2470[var17], field2470[var18], field2470[var19], var21); // L: 1391 + Rasterizer3D.method3876(var14, var15, var16, var11, var12, var13, field2453[0], field2453[1], field2453[2], field2468[var17], field2468[var18], field2468[var19], field2469[var17], field2469[var18], field2469[var19], field2470[var17], field2470[var18], field2470[var19], var21); + Rasterizer3D.method3876(var14, var16, field2480[3], var11, var13, field2467[3], field2453[0], field2453[2], field2453[3], field2468[var17], field2468[var18], field2468[var19], field2469[var17], field2469[var18], field2469[var19], field2470[var17], field2470[var18], field2470[var19], var21); } - } else if (this.faceColors3[var1] == -1) { // L: 1359 - var17 = field2490[this.faceColors1[var1]]; // L: 1360 - Rasterizer3D.method3856(var14, var15, var16, var11, var12, var13, var17); // L: 1361 - Rasterizer3D.method3856(var14, var16, field2480[3], var11, var13, field2467[3], var17); // L: 1362 + } else if (this.faceColors3[var1] == -1) { + var17 = field2490[this.faceColors1[var1]]; + Rasterizer3D.method3856(var14, var15, var16, var11, var12, var13, var17); + Rasterizer3D.method3856(var14, var16, field2480[3], var11, var13, field2467[3], var17); } else { - Rasterizer3D.method3854(var14, var15, var16, var11, var12, var13, field2453[0], field2453[1], field2453[2]); // L: 1365 - Rasterizer3D.method3854(var14, var16, field2480[3], var11, var13, field2467[3], field2453[0], field2453[2], field2453[3]); // L: 1366 + Rasterizer3D.method3854(var14, var15, var16, var11, var12, var13, field2453[0], field2453[1], field2453[2]); + Rasterizer3D.method3854(var14, var16, field2480[3], var11, var13, field2467[3], field2453[0], field2453[2], field2453[3]); } } - } // L: 1395 + } @ObfuscatedName("au") int method4216(int var1, byte var2, byte var3, byte var4, byte var5) { - int var6 = var1 >> 10 & 63; // L: 1398 - int var7 = var1 >> 7 & 7; // L: 1399 - int var8 = var1 & 127; // L: 1400 - int var9 = var5 & 255; // L: 1401 - if (var2 != -1) { // L: 1402 - var6 += var9 * (var2 - var6) >> 7; // L: 1403 + int var6 = var1 >> 10 & 63; + int var7 = var1 >> 7 & 7; + int var8 = var1 & 127; + int var9 = var5 & 255; + if (var2 != -1) { + var6 += var9 * (var2 - var6) >> 7; } - if (var3 != -1) { // L: 1405 - var7 += var9 * (var3 - var7) >> 7; // L: 1406 + if (var3 != -1) { + var7 += var9 * (var3 - var7) >> 7; } - if (var4 != -1) { // L: 1408 - var8 += var9 * (var4 - var8) >> 7; // L: 1409 + if (var4 != -1) { + var8 += var9 * (var4 - var8) >> 7; } - return (var6 << 10 | var7 << 7 | var8) & 65535; // L: 1411 + return (var6 << 10 | var7 << 7 | var8) & 65535; } @ObfuscatedName("av") @@ -1771,85 +1769,85 @@ public class Model extends Renderable { descriptor = "(ILno;)V" ) void method4217(int var1, class366 var2) { - float var3 = (float)this.verticesX[var1]; // L: 1415 - float var4 = (float)(-this.verticesY[var1]); // L: 1416 - float var5 = (float)(-this.verticesZ[var1]); // L: 1417 - float var6 = 1.0F; // L: 1418 - this.verticesX[var1] = (int)(var2.field4196[0] * var3 + var2.field4196[4] * var4 + var2.field4196[8] * var5 + var2.field4196[12] * var6); // L: 1419 - this.verticesY[var1] = -((int)(var2.field4196[1] * var3 + var2.field4196[5] * var4 + var2.field4196[9] * var5 + var2.field4196[13] * var6)); // L: 1420 - this.verticesZ[var1] = -((int)(var2.field4196[2] * var3 + var2.field4196[6] * var4 + var2.field4196[10] * var5 + var2.field4196[14] * var6)); // L: 1421 - } // L: 1422 + float var3 = (float)this.verticesX[var1]; + float var4 = (float)(-this.verticesY[var1]); + float var5 = (float)(-this.verticesZ[var1]); + float var6 = 1.0F; + this.verticesX[var1] = (int)(var2.field4196[0] * var3 + var2.field4196[4] * var4 + var2.field4196[8] * var5 + var2.field4196[12] * var6); + this.verticesY[var1] = -((int)(var2.field4196[1] * var3 + var2.field4196[5] * var4 + var2.field4196[9] * var5 + var2.field4196[13] * var6)); + this.verticesZ[var1] = -((int)(var2.field4196[2] * var3 + var2.field4196[6] * var4 + var2.field4196[10] * var5 + var2.field4196[14] * var6)); + } @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(Lgq;I)V" ) void method4218(class194 var1, int var2) { - if (this.field2448 != null) { // L: 1425 - for (int var3 = 0; var3 < this.verticesCount; ++var3) { // L: 1426 - int[] var4 = this.field2448[var3]; // L: 1427 - if (var4 != null && var4.length != 0) { // L: 1428 - int[] var5 = this.field2449[var3]; // L: 1429 - field2452.method6708(); // L: 1430 + if (this.field2448 != null) { + for (int var3 = 0; var3 < this.verticesCount; ++var3) { + int[] var4 = this.field2448[var3]; + if (var4 != null && var4.length != 0) { + int[] var5 = this.field2449[var3]; + field2452.method6708(); - for (int var6 = 0; var6 < var4.length; ++var6) { // L: 1431 - int var7 = var4[var6]; // L: 1432 - class113 var8 = var1.method3923(var7); // L: 1433 - if (var8 != null) { // L: 1434 - field2424.method6655((float)var5[var6] / 255.0F); // L: 1435 - field2419.method6654(var8.method2582(var2)); // L: 1436 - field2419.method6670(field2424); // L: 1437 - field2452.method6657(field2419); // L: 1438 + for (int var6 = 0; var6 < var4.length; ++var6) { + int var7 = var4[var6]; + class113 var8 = var1.method3923(var7); + if (var8 != null) { + field2424.method6655((float)var5[var6] / 255.0F); + field2419.method6654(var8.method2582(var2)); + field2419.method6670(field2424); + field2452.method6657(field2419); } } - this.method4217(var3, field2452); // L: 1440 + this.method4217(var3, field2452); } } } - } // L: 1442 + } @ObfuscatedName("cq") @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { - field2422[0] = -1; // L: 822 - if (this.boundsType != 1) { // L: 823 + field2422[0] = -1; + if (this.boundsType != 1) { this.calculateBoundsCylinder(); } - this.calculateBoundingBox(var1); // L: 824 - int var11 = var5 * var8 - var4 * var6 >> 16; // L: 825 - int var12 = var2 * var7 + var3 * var11 >> 16; // L: 826 - int var13 = var3 * this.xzRadius >> 16; // L: 827 - int var14 = var12 + var13; // L: 828 - if (var14 > 50 && var12 < 3500) { // L: 829 - int var15 = var8 * var4 + var5 * var6 >> 16; // L: 830 - int var16 = (var15 - this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; // L: 831 - if (var16 / var14 < Rasterizer3D.Rasterizer3D_clipMidX2) { // L: 832 - int var17 = (var15 + this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; // L: 833 - if (var17 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidX) { // L: 834 - int var18 = var3 * var7 - var11 * var2 >> 16; // L: 835 - int var19 = var2 * this.xzRadius >> 16; // L: 836 - int var20 = (var3 * this.bottomY >> 16) + var19; // L: 837 - int var21 = (var18 + var20) * Rasterizer3D.Rasterizer3D_zoom; // L: 838 - if (var21 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidY) { // L: 839 - int var22 = (var3 * super.height >> 16) + var19; // L: 840 - int var23 = (var18 - var22) * Rasterizer3D.Rasterizer3D_zoom; // L: 841 - if (var23 / var14 < Rasterizer3D.Rasterizer3D_clipMidY2) { // L: 842 - int var24 = var13 + (var2 * super.height >> 16); // L: 843 - boolean var25 = false; // L: 844 - boolean var26 = false; // L: 845 - if (var12 - var24 <= 50) { // L: 846 + this.calculateBoundingBox(var1); + int var11 = var5 * var8 - var4 * var6 >> 16; + int var12 = var2 * var7 + var3 * var11 >> 16; + int var13 = var3 * this.xzRadius >> 16; + int var14 = var12 + var13; + if (var14 > 50 && var12 < 3500) { + int var15 = var8 * var4 + var5 * var6 >> 16; + int var16 = (var15 - this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; + if (var16 / var14 < Rasterizer3D.Rasterizer3D_clipMidX2) { + int var17 = (var15 + this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; + if (var17 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidX) { + int var18 = var3 * var7 - var11 * var2 >> 16; + int var19 = var2 * this.xzRadius >> 16; + int var20 = (var3 * this.bottomY >> 16) + var19; + int var21 = (var18 + var20) * Rasterizer3D.Rasterizer3D_zoom; + if (var21 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidY) { + int var22 = (var3 * super.height >> 16) + var19; + int var23 = (var18 - var22) * Rasterizer3D.Rasterizer3D_zoom; + if (var23 / var14 < Rasterizer3D.Rasterizer3D_clipMidY2) { + int var24 = var13 + (var2 * super.height >> 16); + boolean var25 = false; + boolean var26 = false; + if (var12 - var24 <= 50) { var26 = true; } - boolean var27 = var26 || this.field2442 > 0; // L: 847 - int var28 = class91.method2332(); // L: 848 - int var29 = ViewportMouse.ViewportMouse_y; // L: 851 - boolean var31 = class139.method2931(); // L: 854 - boolean var32 = class116.method2671(var9); // L: 855 - boolean var33 = false; // L: 856 + boolean var27 = var26 || this.field2442 > 0; + int var28 = class91.method2332(); + int var29 = ViewportMouse.ViewportMouse_y; + boolean var31 = class139.method2931(); + boolean var32 = class116.method2671(var9); + boolean var33 = false; int var37; int var38; int var39; @@ -1858,160 +1856,160 @@ public class Model extends Renderable { int var54; int var55; int var56; - if (var32 && var31) { // L: 857 - boolean var34 = false; // L: 858 - if (field2492) { // L: 859 + if (var32 && var31) { + boolean var34 = false; + if (field2492) { boolean var35; - if (!class139.method2931()) { // L: 863 - var35 = false; // L: 864 + if (!class139.method2931()) { + var35 = false; } else { int var43; int var44; int var45; - if (!ViewportMouse.ViewportMouse_false0) { // L: 868 - var37 = Scene.Scene_cameraPitchSine; // L: 869 - var38 = Scene.Scene_cameraPitchCosine; // L: 870 - var39 = Scene.Scene_cameraYawSine; // L: 871 - var40 = Scene.Scene_cameraYawCosine; // L: 872 - byte var41 = 50; // L: 873 - short var42 = 3500; // L: 874 - var43 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var41 / Rasterizer3D.Rasterizer3D_zoom; // L: 875 - var44 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var41 / Rasterizer3D.Rasterizer3D_zoom; // L: 876 - var45 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var42 / Rasterizer3D.Rasterizer3D_zoom; // L: 877 - int var46 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var42 / Rasterizer3D.Rasterizer3D_zoom; // L: 878 - int var47 = Rasterizer3D.method3917(var44, var41, var38, var37); // L: 880 - var55 = Rasterizer3D.method3868(var44, var41, var38, var37); // L: 881 - var44 = var47; // L: 882 - var47 = Rasterizer3D.method3917(var46, var42, var38, var37); // L: 883 - var56 = Rasterizer3D.method3868(var46, var42, var38, var37); // L: 884 - var46 = var47; // L: 885 - var47 = Rasterizer3D.method3859(var43, var55, var40, var39); // L: 886 - var55 = Rasterizer3D.method3866(var43, var55, var40, var39); // L: 887 - var43 = var47; // L: 888 - var47 = Rasterizer3D.method3859(var45, var56, var40, var39); // L: 889 - var56 = Rasterizer3D.method3866(var45, var56, var40, var39); // L: 890 - ViewportMouse.field2503 = (var43 + var47) / 2; // L: 892 - HealthBar.field1209 = (var46 + var44) / 2; // L: 893 - class257.field3042 = (var56 + var55) / 2; // L: 894 - class28.field168 = (var47 - var43) / 2; // L: 895 - class149.field1661 = (var46 - var44) / 2; // L: 896 - class186.field2135 = (var56 - var55) / 2; // L: 897 - class17.field93 = Math.abs(class28.field168); // L: 898 - ScriptFrame.field446 = Math.abs(class149.field1661); // L: 899 - class338.field4055 = Math.abs(class186.field2135); // L: 900 + if (!ViewportMouse.ViewportMouse_false0) { + var37 = Scene.Scene_cameraPitchSine; + var38 = Scene.Scene_cameraPitchCosine; + var39 = Scene.Scene_cameraYawSine; + var40 = Scene.Scene_cameraYawCosine; + byte var41 = 50; + short var42 = 3500; + var43 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var41 / Rasterizer3D.Rasterizer3D_zoom; + var44 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var41 / Rasterizer3D.Rasterizer3D_zoom; + var45 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var42 / Rasterizer3D.Rasterizer3D_zoom; + int var46 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var42 / Rasterizer3D.Rasterizer3D_zoom; + int var47 = Rasterizer3D.method3917(var44, var41, var38, var37); + var55 = Rasterizer3D.method3868(var44, var41, var38, var37); + var44 = var47; + var47 = Rasterizer3D.method3917(var46, var42, var38, var37); + var56 = Rasterizer3D.method3868(var46, var42, var38, var37); + var46 = var47; + var47 = Rasterizer3D.method3859(var43, var55, var40, var39); + var55 = Rasterizer3D.method3866(var43, var55, var40, var39); + var43 = var47; + var47 = Rasterizer3D.method3859(var45, var56, var40, var39); + var56 = Rasterizer3D.method3866(var45, var56, var40, var39); + ViewportMouse.field2503 = (var43 + var47) / 2; + HealthBar.field1209 = (var46 + var44) / 2; + class257.field3042 = (var56 + var55) / 2; + class28.field168 = (var47 - var43) / 2; + class149.field1661 = (var46 - var44) / 2; + class186.field2135 = (var56 - var55) / 2; + class17.field93 = Math.abs(class28.field168); + ScriptFrame.field446 = Math.abs(class149.field1661); + class338.field4055 = Math.abs(class186.field2135); } - var37 = this.xMid + var6; // L: 902 - var38 = var7 + this.yMid; // L: 903 - var39 = var8 + this.zMid; // L: 904 - var40 = this.xMidOffset; // L: 905 - var55 = this.yMidOffset; // L: 906 - var56 = this.zMidOffset; // L: 907 - var43 = ViewportMouse.field2503 - var37; // L: 908 - var44 = HealthBar.field1209 - var38; // L: 909 - var45 = class257.field3042 - var39; // L: 910 - if (Math.abs(var43) > var40 + class17.field93) { // L: 911 - var35 = false; // L: 912 - } else if (Math.abs(var44) > var55 + ScriptFrame.field446) { // L: 915 - var35 = false; // L: 916 - } else if (Math.abs(var45) > var56 + class338.field4055) { // L: 919 - var35 = false; // L: 920 - } else if (Math.abs(var45 * class149.field1661 - var44 * class186.field2135) > var56 * ScriptFrame.field446 + var55 * class338.field4055) { // L: 923 - var35 = false; // L: 924 - } else if (Math.abs(var43 * class186.field2135 - var45 * class28.field168) > var40 * class338.field4055 + var56 * class17.field93) { // L: 927 - var35 = false; // L: 928 - } else if (Math.abs(var44 * class28.field168 - var43 * class149.field1661) > var40 * ScriptFrame.field446 + var55 * class17.field93) { // L: 931 - var35 = false; // L: 932 + var37 = this.xMid + var6; + var38 = var7 + this.yMid; + var39 = var8 + this.zMid; + var40 = this.xMidOffset; + var55 = this.yMidOffset; + var56 = this.zMidOffset; + var43 = ViewportMouse.field2503 - var37; + var44 = HealthBar.field1209 - var38; + var45 = class257.field3042 - var39; + if (Math.abs(var43) > var40 + class17.field93) { + var35 = false; + } else if (Math.abs(var44) > var55 + ScriptFrame.field446) { + var35 = false; + } else if (Math.abs(var45) > var56 + class338.field4055) { + var35 = false; + } else if (Math.abs(var45 * class149.field1661 - var44 * class186.field2135) > var56 * ScriptFrame.field446 + var55 * class338.field4055) { + var35 = false; + } else if (Math.abs(var43 * class186.field2135 - var45 * class28.field168) > var40 * class338.field4055 + var56 * class17.field93) { + var35 = false; + } else if (Math.abs(var44 * class28.field168 - var43 * class149.field1661) > var40 * ScriptFrame.field446 + var55 * class17.field93) { + var35 = false; } else { - var35 = true; // L: 935 + var35 = true; } } - var34 = var35; // L: 937 + var34 = var35; } else { - var54 = var12 - var13; // L: 940 - if (var54 <= 50) { // L: 941 + var54 = var12 - var13; + if (var54 <= 50) { var54 = 50; } - if (var15 > 0) { // L: 942 - var16 /= var14; // L: 943 - var17 /= var54; // L: 944 + if (var15 > 0) { + var16 /= var14; + var17 /= var54; } else { - var17 /= var14; // L: 947 - var16 /= var54; // L: 948 + var17 /= var14; + var16 /= var54; } - if (var18 > 0) { // L: 950 - var23 /= var14; // L: 951 - var21 /= var54; // L: 952 + if (var18 > 0) { + var23 /= var14; + var21 /= var54; } else { - var21 /= var14; // L: 955 - var23 /= var54; // L: 956 + var21 /= var14; + var23 /= var54; } - var48 = var28 - Rasterizer3D.Rasterizer3D_clipMidX; // L: 958 - var37 = var29 - Rasterizer3D.Rasterizer3D_clipMidY; // L: 959 - if (var48 > var16 && var48 < var17 && var37 > var23 && var37 < var21) { // L: 960 - var34 = true; // L: 961 + var48 = var28 - Rasterizer3D.Rasterizer3D_clipMidX; + var37 = var29 - Rasterizer3D.Rasterizer3D_clipMidY; + if (var48 > var16 && var48 < var17 && var37 > var23 && var37 < var21) { + var34 = true; } } - if (var34) { // L: 964 - if (this.isSingleTile) { // L: 965 - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var9; // L: 968 + if (var34) { + if (this.isSingleTile) { + ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var9; } else { - var33 = true; // L: 971 + var33 = true; } } } - int var53 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 974 - var54 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 975 - var48 = 0; // L: 976 - var37 = 0; // L: 977 - if (var1 != 0) { // L: 978 - var48 = field2465[var1]; // L: 979 - var37 = field2489[var1]; // L: 980 + int var53 = Rasterizer3D.Rasterizer3D_clipMidX; + var54 = Rasterizer3D.Rasterizer3D_clipMidY; + var48 = 0; + var37 = 0; + if (var1 != 0) { + var48 = field2465[var1]; + var37 = field2489[var1]; } - for (var38 = 0; var38 < this.verticesCount; ++var38) { // L: 982 - var39 = this.verticesX[var38]; // L: 983 - var40 = this.verticesY[var38]; // L: 984 - var55 = this.verticesZ[var38]; // L: 985 - if (var1 != 0) { // L: 986 - var56 = var55 * var48 + var39 * var37 >> 16; // L: 987 - var55 = var55 * var37 - var39 * var48 >> 16; // L: 988 - var39 = var56; // L: 989 + for (var38 = 0; var38 < this.verticesCount; ++var38) { + var39 = this.verticesX[var38]; + var40 = this.verticesY[var38]; + var55 = this.verticesZ[var38]; + if (var1 != 0) { + var56 = var55 * var48 + var39 * var37 >> 16; + var55 = var55 * var37 - var39 * var48 >> 16; + var39 = var56; } - var39 += var6; // L: 991 - var40 += var7; // L: 992 - var55 += var8; // L: 993 - var56 = var55 * var4 + var5 * var39 >> 16; // L: 994 - var55 = var5 * var55 - var39 * var4 >> 16; // L: 995 - var39 = var56; // L: 996 - var56 = var3 * var40 - var55 * var2 >> 16; // L: 997 - var55 = var40 * var2 + var3 * var55 >> 16; // L: 998 - field2497[var38] = var55 - var12; // L: 1000 - if (var55 >= 50) { // L: 1001 - modelViewportXs[var38] = var39 * Rasterizer3D.Rasterizer3D_zoom / var55 + var53; // L: 1002 - modelViewportYs[var38] = var56 * Rasterizer3D.Rasterizer3D_zoom / var55 + var54; // L: 1003 + var39 += var6; + var40 += var7; + var55 += var8; + var56 = var55 * var4 + var5 * var39 >> 16; + var55 = var5 * var55 - var39 * var4 >> 16; + var39 = var56; + var56 = var3 * var40 - var55 * var2 >> 16; + var55 = var40 * var2 + var3 * var55 >> 16; + field2497[var38] = var55 - var12; + if (var55 >= 50) { + modelViewportXs[var38] = var39 * Rasterizer3D.Rasterizer3D_zoom / var55 + var53; + modelViewportYs[var38] = var56 * Rasterizer3D.Rasterizer3D_zoom / var55 + var54; } else { - modelViewportXs[var38] = -5000; // L: 1006 - var25 = true; // L: 1007 + modelViewportXs[var38] = -5000; + var25 = true; } - if (var27) { // L: 1009 - field2468[var38] = var39; // L: 1010 - field2469[var38] = var56; // L: 1011 - field2470[var38] = var55; // L: 1012 + if (var27) { + field2468[var38] = var39; + field2469[var38] = var56; + field2470[var38] = var55; } } try { - this.draw0(var25, var33, this.isSingleTile, var9); // L: 1016 - } catch (Exception var52) { // L: 1018 + this.draw0(var25, var33, this.isSingleTile, var9); + } catch (Exception var52) { } } @@ -2019,5 +2017,5 @@ public class Model extends Renderable { } } } - } // L: 1019 + } } diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java index 4a0a980f34..0278204c71 100644 --- a/runescape-client/src/main/java/ModelData.java +++ b/runescape-client/src/main/java/ModelData.java @@ -133,11 +133,11 @@ public class ModelData extends Renderable { int field2186; static { - field2187 = new int[10000]; // L: 49 - field2188 = new int[10000]; // L: 50 - field2189 = 0; // L: 51 - ModelData_sine = Rasterizer3D.Rasterizer3D_sine; // L: 52 - ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine; // L: 53 + field2187 = new int[10000]; + field2188 = new int[10000]; + field2189 = 0; + ModelData_sine = Rasterizer3D.Rasterizer3D_sine; + ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine; } ModelData() { @@ -145,7 +145,7 @@ public class ModelData extends Renderable { this.faceCount = 0; this.priority = 0; this.isBoundsCalculated = false; - } // L: 55 + } @ObfuscatedSignature( descriptor = "([Lge;I)V" @@ -155,1485 +155,1485 @@ public class ModelData extends Renderable { this.faceCount = 0; this.priority = 0; this.isBoundsCalculated = false; - boolean var3 = false; // L: 921 - boolean var4 = false; // L: 922 - boolean var5 = false; // L: 923 - boolean var6 = false; // L: 924 - boolean var7 = false; // L: 925 - boolean var8 = false; // L: 926 - boolean var9 = false; // L: 927 - this.verticesCount = 0; // L: 928 - this.faceCount = 0; // L: 929 - this.textureTriangleCount = 0; // L: 930 - this.priority = -1; // L: 931 + boolean var3 = false; + boolean var4 = false; + boolean var5 = false; + boolean var6 = false; + boolean var7 = false; + boolean var8 = false; + boolean var9 = false; + this.verticesCount = 0; + this.faceCount = 0; + this.textureTriangleCount = 0; + this.priority = -1; int var10; ModelData var11; - for (var10 = 0; var10 < var2; ++var10) { // L: 932 - var11 = var1[var10]; // L: 933 - if (var11 != null) { // L: 934 - this.verticesCount += var11.verticesCount; // L: 935 - this.faceCount += var11.faceCount; // L: 936 - this.textureTriangleCount += var11.textureTriangleCount; // L: 937 - if (var11.faceRenderPriorities != null) { // L: 938 + for (var10 = 0; var10 < var2; ++var10) { + var11 = var1[var10]; + if (var11 != null) { + this.verticesCount += var11.verticesCount; + this.faceCount += var11.faceCount; + this.textureTriangleCount += var11.textureTriangleCount; + if (var11.faceRenderPriorities != null) { var4 = true; } else { - if (this.priority == -1) { // L: 940 + if (this.priority == -1) { this.priority = var11.priority; } - if (this.priority != var11.priority) { // L: 941 + if (this.priority != var11.priority) { var4 = true; } } - var3 |= var11.faceRenderTypes != null; // L: 943 - var5 |= var11.faceAlphas != null; // L: 944 - var6 |= var11.faceSkins != null; // L: 945 - var7 |= var11.faceTextures != null; // L: 946 - var8 |= var11.textureCoords != null; // L: 947 - var9 |= var11.field2185 != null; // L: 948 + var3 |= var11.faceRenderTypes != null; + var5 |= var11.faceAlphas != null; + var6 |= var11.faceSkins != null; + var7 |= var11.faceTextures != null; + var8 |= var11.textureCoords != null; + var9 |= var11.field2185 != null; } } - this.verticesX = new int[this.verticesCount]; // L: 951 - this.verticesY = new int[this.verticesCount]; // L: 952 - this.verticesZ = new int[this.verticesCount]; // L: 953 - this.vertexSkins = new int[this.verticesCount]; // L: 954 - this.indices1 = new int[this.faceCount]; // L: 955 - this.indices2 = new int[this.faceCount]; // L: 956 - this.indices3 = new int[this.faceCount]; // L: 957 - if (var3) { // L: 958 + this.verticesX = new int[this.verticesCount]; + this.verticesY = new int[this.verticesCount]; + this.verticesZ = new int[this.verticesCount]; + this.vertexSkins = new int[this.verticesCount]; + this.indices1 = new int[this.faceCount]; + this.indices2 = new int[this.faceCount]; + this.indices3 = new int[this.faceCount]; + if (var3) { this.faceRenderTypes = new byte[this.faceCount]; } - if (var4) { // L: 959 + if (var4) { this.faceRenderPriorities = new byte[this.faceCount]; } - if (var5) { // L: 960 + if (var5) { this.faceAlphas = new byte[this.faceCount]; } - if (var6) { // L: 961 + if (var6) { this.faceSkins = new int[this.faceCount]; } - if (var7) { // L: 962 + if (var7) { this.faceTextures = new short[this.faceCount]; } - if (var8) { // L: 963 + if (var8) { this.textureCoords = new byte[this.faceCount]; } - if (var9) { // L: 964 - this.field2185 = new int[this.verticesCount][]; // L: 965 - this.field2173 = new int[this.verticesCount][]; // L: 966 + if (var9) { + this.field2185 = new int[this.verticesCount][]; + this.field2173 = new int[this.verticesCount][]; } - this.faceColors = new short[this.faceCount]; // L: 968 - if (this.textureTriangleCount > 0) { // L: 969 - this.textureRenderTypes = new byte[this.textureTriangleCount]; // L: 970 - this.texTriangleX = new short[this.textureTriangleCount]; // L: 971 - this.texTriangleY = new short[this.textureTriangleCount]; // L: 972 - this.texTriangleZ = new short[this.textureTriangleCount]; // L: 973 + this.faceColors = new short[this.faceCount]; + if (this.textureTriangleCount > 0) { + this.textureRenderTypes = new byte[this.textureTriangleCount]; + this.texTriangleX = new short[this.textureTriangleCount]; + this.texTriangleY = new short[this.textureTriangleCount]; + this.texTriangleZ = new short[this.textureTriangleCount]; } - this.verticesCount = 0; // L: 975 - this.faceCount = 0; // L: 976 - this.textureTriangleCount = 0; // L: 977 + this.verticesCount = 0; + this.faceCount = 0; + this.textureTriangleCount = 0; - for (var10 = 0; var10 < var2; ++var10) { // L: 978 - var11 = var1[var10]; // L: 979 - if (var11 != null) { // L: 980 + for (var10 = 0; var10 < var2; ++var10) { + var11 = var1[var10]; + if (var11 != null) { int var12; - for (var12 = 0; var12 < var11.faceCount; ++var12) { // L: 981 - if (var3 && var11.faceRenderTypes != null) { // L: 982 983 + for (var12 = 0; var12 < var11.faceCount; ++var12) { + if (var3 && var11.faceRenderTypes != null) { this.faceRenderTypes[this.faceCount] = var11.faceRenderTypes[var12]; } - if (var4) { // L: 985 - if (var11.faceRenderPriorities != null) { // L: 986 + if (var4) { + if (var11.faceRenderPriorities != null) { this.faceRenderPriorities[this.faceCount] = var11.faceRenderPriorities[var12]; } else { - this.faceRenderPriorities[this.faceCount] = var11.priority; // L: 987 + this.faceRenderPriorities[this.faceCount] = var11.priority; } } - if (var5 && var11.faceAlphas != null) { // L: 989 990 + if (var5 && var11.faceAlphas != null) { this.faceAlphas[this.faceCount] = var11.faceAlphas[var12]; } - if (var6 && var11.faceSkins != null) { // L: 992 993 + if (var6 && var11.faceSkins != null) { this.faceSkins[this.faceCount] = var11.faceSkins[var12]; } - if (var7) { // L: 995 - if (var11.faceTextures != null) { // L: 996 + if (var7) { + if (var11.faceTextures != null) { this.faceTextures[this.faceCount] = var11.faceTextures[var12]; } else { - this.faceTextures[this.faceCount] = -1; // L: 997 + this.faceTextures[this.faceCount] = -1; } } - if (var8) { // L: 999 - if (var11.textureCoords != null && var11.textureCoords[var12] != -1) { // L: 1000 + if (var8) { + if (var11.textureCoords != null && var11.textureCoords[var12] != -1) { this.textureCoords[this.faceCount] = (byte)(this.textureTriangleCount + var11.textureCoords[var12]); } else { - this.textureCoords[this.faceCount] = -1; // L: 1001 + this.textureCoords[this.faceCount] = -1; } } - this.faceColors[this.faceCount] = var11.faceColors[var12]; // L: 1003 - this.indices1[this.faceCount] = this.method3762(var11, var11.indices1[var12]); // L: 1004 - this.indices2[this.faceCount] = this.method3762(var11, var11.indices2[var12]); // L: 1005 - this.indices3[this.faceCount] = this.method3762(var11, var11.indices3[var12]); // L: 1006 - ++this.faceCount; // L: 1007 + this.faceColors[this.faceCount] = var11.faceColors[var12]; + this.indices1[this.faceCount] = this.method3762(var11, var11.indices1[var12]); + this.indices2[this.faceCount] = this.method3762(var11, var11.indices2[var12]); + this.indices3[this.faceCount] = this.method3762(var11, var11.indices3[var12]); + ++this.faceCount; } - 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.method3762(var11, var11.texTriangleX[var12]); // L: 1012 - this.texTriangleY[this.textureTriangleCount] = (short)this.method3762(var11, var11.texTriangleY[var12]); // L: 1013 - this.texTriangleZ[this.textureTriangleCount] = (short)this.method3762(var11, var11.texTriangleZ[var12]); // L: 1014 + for (var12 = 0; var12 < var11.textureTriangleCount; ++var12) { + byte var13 = this.textureRenderTypes[this.textureTriangleCount] = var11.textureRenderTypes[var12]; + if (var13 == 0) { + this.texTriangleX[this.textureTriangleCount] = (short)this.method3762(var11, var11.texTriangleX[var12]); + this.texTriangleY[this.textureTriangleCount] = (short)this.method3762(var11, var11.texTriangleY[var12]); + this.texTriangleZ[this.textureTriangleCount] = (short)this.method3762(var11, var11.texTriangleZ[var12]); } - ++this.textureTriangleCount; // L: 1016 + ++this.textureTriangleCount; } } } - } // L: 1020 + } ModelData(byte[] var1) { this.verticesCount = 0; this.faceCount = 0; this.priority = 0; this.isBoundsCalculated = false; - 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 + Buffer var2 = new Buffer(10); + var2.writeShort(-2); + if (var1[var1.length - 1] == -3 && var1[var1.length - 2] == -1) { this.method3742(var1); - } else if (var1[var1.length - 1] == -2 && var1[var1.length - 2] == -1) { // L: 67 + } else if (var1[var1.length - 1] == -2 && var1[var1.length - 2] == -1) { this.method3784(var1); - } else if (var1[var1.length - 1] == -1 && var1[var1.length - 2] == -1) { // L: 68 + } else if (var1[var1.length - 1] == -1 && var1[var1.length - 2] == -1) { this.method3758(var1); } else { - this.method3747(var1); // L: 69 + this.method3747(var1); } - } // L: 70 + } @ObfuscatedSignature( descriptor = "(Lge;ZZZZ)V", garbageValue = "1" ) public ModelData(ModelData var1, boolean var2, boolean var3, boolean var4, boolean var5) { - this.verticesCount = 0; // L: 12 - this.faceCount = 0; // L: 16 - this.priority = 0; // L: 26 - this.isBoundsCalculated = false; // L: 43 - this.verticesCount = var1.verticesCount; // L: 1048 - this.faceCount = var1.faceCount; // L: 1049 - this.textureTriangleCount = var1.textureTriangleCount; // L: 1050 + this.verticesCount = 0; + this.faceCount = 0; + this.priority = 0; + this.isBoundsCalculated = false; + this.verticesCount = var1.verticesCount; + this.faceCount = var1.faceCount; + this.textureTriangleCount = var1.textureTriangleCount; int var6; - if (var2) { // L: 1051 - this.verticesX = var1.verticesX; // L: 1052 - this.verticesY = var1.verticesY; // L: 1053 - this.verticesZ = var1.verticesZ; // L: 1054 + if (var2) { + this.verticesX = var1.verticesX; + this.verticesY = var1.verticesY; + this.verticesZ = var1.verticesZ; } else { - this.verticesX = new int[this.verticesCount]; // L: 1057 - this.verticesY = new int[this.verticesCount]; // L: 1058 - this.verticesZ = new int[this.verticesCount]; // L: 1059 + this.verticesX = new int[this.verticesCount]; + this.verticesY = new int[this.verticesCount]; + this.verticesZ = new int[this.verticesCount]; - for (var6 = 0; var6 < this.verticesCount; ++var6) { // L: 1060 - this.verticesX[var6] = var1.verticesX[var6]; // L: 1061 - this.verticesY[var6] = var1.verticesY[var6]; // L: 1062 - this.verticesZ[var6] = var1.verticesZ[var6]; // L: 1063 + for (var6 = 0; var6 < this.verticesCount; ++var6) { + this.verticesX[var6] = var1.verticesX[var6]; + this.verticesY[var6] = var1.verticesY[var6]; + this.verticesZ[var6] = var1.verticesZ[var6]; } } - if (var3) { // L: 1066 + if (var3) { this.faceColors = var1.faceColors; } else { - this.faceColors = new short[this.faceCount]; // L: 1068 + this.faceColors = new short[this.faceCount]; - for (var6 = 0; var6 < this.faceCount; ++var6) { // L: 1069 + for (var6 = 0; var6 < this.faceCount; ++var6) { this.faceColors[var6] = var1.faceColors[var6]; } } - if (!var4 && var1.faceTextures != null) { // L: 1071 - this.faceTextures = new short[this.faceCount]; // L: 1073 + if (!var4 && var1.faceTextures != null) { + this.faceTextures = new short[this.faceCount]; - for (var6 = 0; var6 < this.faceCount; ++var6) { // L: 1074 + for (var6 = 0; var6 < this.faceCount; ++var6) { this.faceTextures[var6] = var1.faceTextures[var6]; } } else { this.faceTextures = var1.faceTextures; } - this.faceAlphas = var1.faceAlphas; // L: 1076 - this.indices1 = var1.indices1; // L: 1086 - this.indices2 = var1.indices2; // L: 1087 - this.indices3 = var1.indices3; // L: 1088 - this.faceRenderTypes = var1.faceRenderTypes; // L: 1089 - this.faceRenderPriorities = var1.faceRenderPriorities; // L: 1090 - this.textureCoords = var1.textureCoords; // L: 1091 - this.priority = var1.priority; // L: 1092 - this.textureRenderTypes = var1.textureRenderTypes; // L: 1093 - this.texTriangleX = var1.texTriangleX; // L: 1094 - this.texTriangleY = var1.texTriangleY; // L: 1095 - this.texTriangleZ = var1.texTriangleZ; // L: 1096 - this.vertexSkins = var1.vertexSkins; // L: 1097 - this.faceSkins = var1.faceSkins; // L: 1098 - this.vertexLabels = var1.vertexLabels; // L: 1099 - this.faceLabelsAlpha = var1.faceLabelsAlpha; // L: 1100 - this.vertexNormals = var1.vertexNormals; // L: 1101 - this.faceNormals = var1.faceNormals; // L: 1102 - this.vertexVertices = var1.vertexVertices; // L: 1103 - this.field2185 = var1.field2185; // L: 1104 - this.field2173 = var1.field2173; // L: 1105 - this.ambient = var1.ambient; // L: 1106 - this.contrast = var1.contrast; // L: 1107 + this.faceAlphas = var1.faceAlphas; + this.indices1 = var1.indices1; + this.indices2 = var1.indices2; + this.indices3 = var1.indices3; + this.faceRenderTypes = var1.faceRenderTypes; + this.faceRenderPriorities = var1.faceRenderPriorities; + this.textureCoords = var1.textureCoords; + this.priority = var1.priority; + this.textureRenderTypes = var1.textureRenderTypes; + this.texTriangleX = var1.texTriangleX; + this.texTriangleY = var1.texTriangleY; + this.texTriangleZ = var1.texTriangleZ; + this.vertexSkins = var1.vertexSkins; + this.faceSkins = var1.faceSkins; + this.vertexLabels = var1.vertexLabels; + this.faceLabelsAlpha = var1.faceLabelsAlpha; + this.vertexNormals = var1.vertexNormals; + this.faceNormals = var1.faceNormals; + this.vertexVertices = var1.vertexVertices; + this.field2185 = var1.field2185; + this.field2173 = var1.field2173; + this.ambient = var1.ambient; + this.contrast = var1.contrast; } @ObfuscatedName("p") void method3742(byte[] var1) { - Buffer var2 = new Buffer(var1); // L: 73 - Buffer var3 = new Buffer(var1); // L: 74 - Buffer var4 = new Buffer(var1); // L: 75 - Buffer var5 = new Buffer(var1); // L: 76 - Buffer var6 = new Buffer(var1); // L: 77 - Buffer var7 = new Buffer(var1); // L: 78 - Buffer var8 = new Buffer(var1); // L: 79 - var2.offset = var1.length - 26; // L: 80 - int var9 = var2.readUnsignedShort(); // L: 81 - int var10 = var2.readUnsignedShort(); // L: 82 - int var11 = var2.readUnsignedByte(); // L: 83 - int var12 = var2.readUnsignedByte(); // L: 84 - int var13 = var2.readUnsignedByte(); // L: 85 - int var14 = var2.readUnsignedByte(); // L: 86 - int var15 = var2.readUnsignedByte(); // L: 87 - int var16 = var2.readUnsignedByte(); // L: 88 - int var17 = var2.readUnsignedByte(); // L: 89 - int var18 = var2.readUnsignedByte(); // L: 90 - int var19 = var2.readUnsignedShort(); // L: 91 - int var20 = var2.readUnsignedShort(); // L: 92 - int var21 = var2.readUnsignedShort(); // L: 93 - int var22 = var2.readUnsignedShort(); // L: 94 - int var23 = var2.readUnsignedShort(); // L: 95 - int var24 = var2.readUnsignedShort(); // L: 96 - int var25 = 0; // L: 97 - int var26 = 0; // L: 98 - int var27 = 0; // L: 99 + Buffer var2 = new Buffer(var1); + Buffer var3 = new Buffer(var1); + Buffer var4 = new Buffer(var1); + Buffer var5 = new Buffer(var1); + Buffer var6 = new Buffer(var1); + Buffer var7 = new Buffer(var1); + Buffer var8 = new Buffer(var1); + var2.offset = var1.length - 26; + int var9 = var2.readUnsignedShort(); + int var10 = var2.readUnsignedShort(); + int var11 = var2.readUnsignedByte(); + int var12 = var2.readUnsignedByte(); + int var13 = var2.readUnsignedByte(); + int var14 = var2.readUnsignedByte(); + int var15 = var2.readUnsignedByte(); + int var16 = var2.readUnsignedByte(); + int var17 = var2.readUnsignedByte(); + int var18 = var2.readUnsignedByte(); + int var19 = var2.readUnsignedShort(); + int var20 = var2.readUnsignedShort(); + int var21 = var2.readUnsignedShort(); + int var22 = var2.readUnsignedShort(); + int var23 = var2.readUnsignedShort(); + int var24 = var2.readUnsignedShort(); + int var25 = 0; + int var26 = 0; + int var27 = 0; int var28; - if (var11 > 0) { // L: 100 - this.textureRenderTypes = new byte[var11]; // L: 101 - var2.offset = 0; // L: 102 + if (var11 > 0) { + this.textureRenderTypes = new byte[var11]; + var2.offset = 0; - for (var28 = 0; var28 < var11; ++var28) { // L: 103 - byte var29 = this.textureRenderTypes[var28] = var2.readByte(); // L: 104 - if (var29 == 0) { // L: 105 + for (var28 = 0; var28 < var11; ++var28) { + byte var29 = this.textureRenderTypes[var28] = var2.readByte(); + if (var29 == 0) { ++var25; } - if (var29 >= 1 && var29 <= 3) { // L: 106 + if (var29 >= 1 && var29 <= 3) { ++var26; } - if (var29 == 2) { // L: 107 + if (var29 == 2) { ++var27; } } } - var28 = var11 + var9; // L: 112 - int var30 = var28; // L: 113 - if (var12 == 1) { // L: 114 + var28 = var11 + var9; + int var30 = var28; + if (var12 == 1) { var28 += var10; } - int var31 = var28; // L: 115 - var28 += var10; // L: 116 - int var32 = var28; // L: 117 - if (var13 == 255) { // L: 118 + int var31 = var28; + var28 += var10; + int var32 = var28; + if (var13 == 255) { var28 += var10; } - int var33 = var28; // L: 119 - if (var15 == 1) { // L: 120 + int var33 = var28; + if (var15 == 1) { var28 += var10; } - int var34 = var28; // L: 121 - var28 += var24; // L: 122 - int var35 = var28; // L: 123 - if (var14 == 1) { // L: 124 + int var34 = var28; + var28 += var24; + int var35 = var28; + if (var14 == 1) { var28 += var10; } - int var36 = var28; // L: 125 - var28 += var22; // L: 126 - int var37 = var28; // L: 127 - if (var16 == 1) { // L: 128 + int var36 = var28; + var28 += var22; + int var37 = var28; + if (var16 == 1) { var28 += var10 * 2; } - int var38 = var28; // L: 129 - var28 += var23; // L: 130 - int var39 = var28; // L: 131 - var28 += var10 * 2; // L: 132 - int var40 = var28; // L: 133 - var28 += var19; // L: 134 - int var41 = var28; // L: 135 - var28 += var20; // L: 136 - int var42 = var28; // L: 137 - var28 += var21; // L: 138 - int var43 = var28; // L: 139 - var28 += var25 * 6; // L: 140 - int var44 = var28; // L: 141 - var28 += var26 * 6; // L: 142 - int var45 = var28; // L: 143 - var28 += var26 * 6; // L: 144 - int var46 = var28; // L: 145 - var28 += var26 * 2; // L: 146 - int var47 = var28; // L: 147 - var28 += var26; // L: 148 - int var48 = var28; // L: 149 - var28 += var26 * 2 + var27 * 2; // L: 150 - this.verticesCount = var9; // L: 152 - this.faceCount = var10; // L: 153 - this.textureTriangleCount = var11; // L: 154 - this.verticesX = new int[var9]; // L: 155 - this.verticesY = new int[var9]; // L: 156 - this.verticesZ = new int[var9]; // L: 157 - this.indices1 = new int[var10]; // L: 158 - this.indices2 = new int[var10]; // L: 159 - this.indices3 = new int[var10]; // L: 160 - if (var17 == 1) { // L: 161 + int var38 = var28; + var28 += var23; + int var39 = var28; + var28 += var10 * 2; + int var40 = var28; + var28 += var19; + int var41 = var28; + var28 += var20; + int var42 = var28; + var28 += var21; + int var43 = var28; + var28 += var25 * 6; + int var44 = var28; + var28 += var26 * 6; + int var45 = var28; + var28 += var26 * 6; + int var46 = var28; + var28 += var26 * 2; + int var47 = var28; + var28 += var26; + int var48 = var28; + var28 += var26 * 2 + var27 * 2; + this.verticesCount = var9; + this.faceCount = var10; + this.textureTriangleCount = var11; + this.verticesX = new int[var9]; + this.verticesY = new int[var9]; + this.verticesZ = new int[var9]; + this.indices1 = new int[var10]; + this.indices2 = new int[var10]; + this.indices3 = new int[var10]; + if (var17 == 1) { this.vertexSkins = new int[var9]; } - if (var12 == 1) { // L: 162 + if (var12 == 1) { this.faceRenderTypes = new byte[var10]; } - if (var13 == 255) { // L: 163 + if (var13 == 255) { this.faceRenderPriorities = new byte[var10]; } else { - this.priority = (byte)var13; // L: 164 + this.priority = (byte)var13; } - if (var14 == 1) { // L: 165 + if (var14 == 1) { this.faceAlphas = new byte[var10]; } - if (var15 == 1) { // L: 166 + if (var15 == 1) { this.faceSkins = new int[var10]; } - if (var16 == 1) { // L: 167 + if (var16 == 1) { this.faceTextures = new short[var10]; } - if (var16 == 1 && var11 > 0) { // L: 168 + if (var16 == 1 && var11 > 0) { this.textureCoords = new byte[var10]; } - if (var18 == 1) { // L: 169 - this.field2185 = new int[var9][]; // L: 170 - this.field2173 = new int[var9][]; // L: 171 + if (var18 == 1) { + this.field2185 = new int[var9][]; + this.field2173 = new int[var9][]; } - this.faceColors = new short[var10]; // L: 173 - if (var11 > 0) { // L: 174 - this.texTriangleX = new short[var11]; // L: 175 - this.texTriangleY = new short[var11]; // L: 176 - this.texTriangleZ = new short[var11]; // L: 177 + this.faceColors = new short[var10]; + if (var11 > 0) { + this.texTriangleX = new short[var11]; + this.texTriangleY = new short[var11]; + this.texTriangleZ = new short[var11]; } - var2.offset = var11; // L: 179 - var3.offset = var40; // L: 180 - var4.offset = var41; // L: 181 - var5.offset = var42; // L: 182 - var6.offset = var34; // L: 183 - int var50 = 0; // L: 184 - int var51 = 0; // L: 185 - int var52 = 0; // L: 186 + var2.offset = var11; + var3.offset = var40; + var4.offset = var41; + var5.offset = var42; + var6.offset = var34; + int var50 = 0; + int var51 = 0; + int var52 = 0; int var53; int var54; int var55; int var56; int var57; - for (var53 = 0; var53 < var9; ++var53) { // L: 187 - var54 = var2.readUnsignedByte(); // L: 188 - var55 = 0; // L: 189 - if ((var54 & 1) != 0) { // L: 190 + for (var53 = 0; var53 < var9; ++var53) { + var54 = var2.readUnsignedByte(); + var55 = 0; + if ((var54 & 1) != 0) { var55 = var3.readShortSmart(); } - var56 = 0; // L: 191 - if ((var54 & 2) != 0) { // L: 192 + var56 = 0; + if ((var54 & 2) != 0) { var56 = var4.readShortSmart(); } - var57 = 0; // L: 193 - if ((var54 & 4) != 0) { // L: 194 + var57 = 0; + if ((var54 & 4) != 0) { var57 = var5.readShortSmart(); } - this.verticesX[var53] = var50 + var55; // L: 195 - this.verticesY[var53] = var51 + var56; // L: 196 - this.verticesZ[var53] = var52 + var57; // L: 197 - var50 = this.verticesX[var53]; // L: 198 - var51 = this.verticesY[var53]; // L: 199 - var52 = this.verticesZ[var53]; // L: 200 - if (var17 == 1) { // L: 201 + this.verticesX[var53] = var50 + var55; + this.verticesY[var53] = var51 + var56; + this.verticesZ[var53] = var52 + var57; + var50 = this.verticesX[var53]; + var51 = this.verticesY[var53]; + var52 = this.verticesZ[var53]; + if (var17 == 1) { this.vertexSkins[var53] = var6.readUnsignedByte(); } } - if (var18 == 1) { // L: 203 - for (var53 = 0; var53 < var9; ++var53) { // L: 204 - var54 = var6.readUnsignedByte(); // L: 205 - this.field2185[var53] = new int[var54]; // L: 206 - this.field2173[var53] = new int[var54]; // L: 207 + if (var18 == 1) { + for (var53 = 0; var53 < var9; ++var53) { + var54 = var6.readUnsignedByte(); + this.field2185[var53] = new int[var54]; + this.field2173[var53] = new int[var54]; - for (var55 = 0; var55 < var54; ++var55) { // L: 208 - this.field2185[var53][var55] = var6.readUnsignedByte(); // L: 209 - this.field2173[var53][var55] = var6.readUnsignedByte(); // L: 210 + for (var55 = 0; var55 < var54; ++var55) { + this.field2185[var53][var55] = var6.readUnsignedByte(); + this.field2173[var53][var55] = var6.readUnsignedByte(); } } } - var2.offset = var39; // L: 214 - var3.offset = var30; // L: 215 - var4.offset = var32; // L: 216 - var5.offset = var35; // L: 217 - var6.offset = var33; // L: 218 - var7.offset = var37; // L: 219 - var8.offset = var38; // L: 220 + var2.offset = var39; + var3.offset = var30; + var4.offset = var32; + var5.offset = var35; + var6.offset = var33; + var7.offset = var37; + var8.offset = var38; - for (var53 = 0; var53 < var10; ++var53) { // L: 221 - this.faceColors[var53] = (short)var2.readUnsignedShort(); // L: 222 - if (var12 == 1) { // L: 223 + for (var53 = 0; var53 < var10; ++var53) { + this.faceColors[var53] = (short)var2.readUnsignedShort(); + if (var12 == 1) { this.faceRenderTypes[var53] = var3.readByte(); } - if (var13 == 255) { // L: 224 + if (var13 == 255) { this.faceRenderPriorities[var53] = var4.readByte(); } - if (var14 == 1) { // L: 225 + if (var14 == 1) { this.faceAlphas[var53] = var5.readByte(); } - if (var15 == 1) { // L: 226 + if (var15 == 1) { this.faceSkins[var53] = var6.readUnsignedByte(); } - if (var16 == 1) { // L: 227 + if (var16 == 1) { this.faceTextures[var53] = (short)(var7.readUnsignedShort() - 1); } - if (this.textureCoords != null && this.faceTextures[var53] != -1) { // L: 228 + if (this.textureCoords != null && this.faceTextures[var53] != -1) { this.textureCoords[var53] = (byte)(var8.readUnsignedByte() - 1); } } - var2.offset = var36; // L: 230 - var3.offset = var31; // L: 231 - var53 = 0; // L: 232 - var54 = 0; // L: 233 - var55 = 0; // L: 234 - var56 = 0; // L: 235 + var2.offset = var36; + var3.offset = var31; + var53 = 0; + var54 = 0; + var55 = 0; + var56 = 0; int var58; - for (var57 = 0; var57 < var10; ++var57) { // L: 236 - var58 = var3.readUnsignedByte(); // L: 237 - if (var58 == 1) { // L: 238 - var53 = var2.readShortSmart() + var56; // L: 239 - var54 = var2.readShortSmart() + var53; // L: 241 - var55 = var2.readShortSmart() + var54; // L: 243 - var56 = var55; // L: 244 - this.indices1[var57] = var53; // L: 245 - this.indices2[var57] = var54; // L: 246 - this.indices3[var57] = var55; // L: 247 + for (var57 = 0; var57 < var10; ++var57) { + var58 = var3.readUnsignedByte(); + if (var58 == 1) { + var53 = var2.readShortSmart() + var56; + var54 = var2.readShortSmart() + var53; + var55 = var2.readShortSmart() + var54; + var56 = var55; + this.indices1[var57] = var53; + this.indices2[var57] = var54; + this.indices3[var57] = var55; } - if (var58 == 2) { // L: 249 - var54 = var55; // L: 250 - var55 = var2.readShortSmart() + var56; // L: 251 - var56 = var55; // L: 252 - this.indices1[var57] = var53; // L: 253 - this.indices2[var57] = var54; // L: 254 - this.indices3[var57] = var55; // L: 255 + if (var58 == 2) { + var54 = var55; + var55 = var2.readShortSmart() + var56; + var56 = var55; + this.indices1[var57] = var53; + this.indices2[var57] = var54; + this.indices3[var57] = var55; } - if (var58 == 3) { // L: 257 - var53 = var55; // L: 258 - var55 = var2.readShortSmart() + var56; // L: 259 - var56 = var55; // L: 260 - this.indices1[var57] = var53; // L: 261 - this.indices2[var57] = var54; // L: 262 - this.indices3[var57] = var55; // L: 263 + if (var58 == 3) { + var53 = var55; + var55 = var2.readShortSmart() + var56; + var56 = var55; + this.indices1[var57] = var53; + this.indices2[var57] = var54; + this.indices3[var57] = var55; } - if (var58 == 4) { // L: 265 - int var59 = var53; // L: 266 - var53 = var54; // L: 267 - var54 = var59; // L: 268 - var55 = var2.readShortSmart() + var56; // L: 269 - var56 = var55; // L: 270 - this.indices1[var57] = var53; // L: 271 - this.indices2[var57] = var59; // L: 272 - this.indices3[var57] = var55; // L: 273 + if (var58 == 4) { + int var59 = var53; + var53 = var54; + var54 = var59; + var55 = var2.readShortSmart() + var56; + var56 = var55; + this.indices1[var57] = var53; + this.indices2[var57] = var59; + this.indices3[var57] = var55; } } - var2.offset = var43; // L: 276 - var3.offset = var44; // L: 277 - var4.offset = var45; // L: 278 - var5.offset = var46; // L: 279 - var6.offset = var47; // L: 280 - var7.offset = var48; // L: 281 + var2.offset = var43; + var3.offset = var44; + var4.offset = var45; + var5.offset = var46; + var6.offset = var47; + var7.offset = var48; - for (var57 = 0; var57 < var11; ++var57) { // L: 282 - var58 = this.textureRenderTypes[var57] & 255; // L: 283 - if (var58 == 0) { // L: 284 - this.texTriangleX[var57] = (short)var2.readUnsignedShort(); // L: 285 - this.texTriangleY[var57] = (short)var2.readUnsignedShort(); // L: 286 - this.texTriangleZ[var57] = (short)var2.readUnsignedShort(); // L: 287 + for (var57 = 0; var57 < var11; ++var57) { + var58 = this.textureRenderTypes[var57] & 255; + if (var58 == 0) { + this.texTriangleX[var57] = (short)var2.readUnsignedShort(); + this.texTriangleY[var57] = (short)var2.readUnsignedShort(); + this.texTriangleZ[var57] = (short)var2.readUnsignedShort(); } } - var2.offset = var28; // L: 290 - var57 = var2.readUnsignedByte(); // L: 291 - if (var57 != 0) { // L: 292 + var2.offset = var28; + var57 = var2.readUnsignedByte(); + if (var57 != 0) { new ModelData0(); - var2.readUnsignedShort(); // L: 294 - var2.readUnsignedShort(); // L: 295 - var2.readUnsignedShort(); // L: 296 - var2.readInt(); // L: 297 + var2.readUnsignedShort(); + var2.readUnsignedShort(); + var2.readUnsignedShort(); + var2.readInt(); } - } // L: 299 + } @ObfuscatedName("m") void method3784(byte[] var1) { - boolean var2 = false; // L: 302 - boolean var3 = false; // L: 303 - Buffer var4 = new Buffer(var1); // L: 304 - Buffer var5 = new Buffer(var1); // L: 305 - Buffer var6 = new Buffer(var1); // L: 306 - Buffer var7 = new Buffer(var1); // L: 307 - Buffer var8 = new Buffer(var1); // L: 308 - var4.offset = var1.length - 23; // L: 309 - int var9 = var4.readUnsignedShort(); // L: 310 - int var10 = var4.readUnsignedShort(); // L: 311 - int var11 = var4.readUnsignedByte(); // L: 312 - int var12 = var4.readUnsignedByte(); // L: 313 - int var13 = var4.readUnsignedByte(); // L: 314 - int var14 = var4.readUnsignedByte(); // L: 315 - int var15 = var4.readUnsignedByte(); // L: 316 - int var16 = var4.readUnsignedByte(); // L: 317 - int var17 = var4.readUnsignedByte(); // L: 318 - int var18 = var4.readUnsignedShort(); // L: 319 - int var19 = var4.readUnsignedShort(); // L: 320 - int var20 = var4.readUnsignedShort(); // L: 321 - int var21 = var4.readUnsignedShort(); // L: 322 - int var22 = var4.readUnsignedShort(); // L: 323 - byte var23 = 0; // L: 324 - int var47 = var23 + var9; // L: 326 - int var25 = var47; // L: 327 - var47 += var10; // L: 328 - int var26 = var47; // L: 329 - if (var13 == 255) { // L: 330 + boolean var2 = false; + boolean var3 = false; + Buffer var4 = new Buffer(var1); + Buffer var5 = new Buffer(var1); + Buffer var6 = new Buffer(var1); + Buffer var7 = new Buffer(var1); + Buffer var8 = new Buffer(var1); + var4.offset = var1.length - 23; + int var9 = var4.readUnsignedShort(); + int var10 = var4.readUnsignedShort(); + int var11 = var4.readUnsignedByte(); + int var12 = var4.readUnsignedByte(); + int var13 = var4.readUnsignedByte(); + int var14 = var4.readUnsignedByte(); + int var15 = var4.readUnsignedByte(); + int var16 = var4.readUnsignedByte(); + int var17 = var4.readUnsignedByte(); + int var18 = var4.readUnsignedShort(); + int var19 = var4.readUnsignedShort(); + int var20 = var4.readUnsignedShort(); + int var21 = var4.readUnsignedShort(); + int var22 = var4.readUnsignedShort(); + byte var23 = 0; + int var47 = var23 + var9; + int var25 = var47; + var47 += var10; + int var26 = var47; + if (var13 == 255) { var47 += var10; } - int var27 = var47; // L: 331 - if (var15 == 1) { // L: 332 + int var27 = var47; + if (var15 == 1) { var47 += var10; } - int var28 = var47; // L: 333 - if (var12 == 1) { // L: 334 + int var28 = var47; + if (var12 == 1) { var47 += var10; } - int var29 = var47; // L: 335 - var47 += var22; // L: 336 - int var30 = var47; // L: 337 - if (var14 == 1) { // L: 338 + int var29 = var47; + var47 += var22; + int var30 = var47; + if (var14 == 1) { var47 += var10; } - int var31 = var47; // L: 339 - var47 += var21; // L: 340 - int var32 = var47; // L: 341 - var47 += var10 * 2; // L: 342 - int var33 = var47; // L: 343 - var47 += var11 * 6; // L: 344 - int var34 = var47; // L: 345 - var47 += var18; // L: 346 - int var35 = var47; // L: 347 - var47 += var19; // L: 348 - int var10000 = var47 + var20; // L: 350 - this.verticesCount = var9; // L: 351 - this.faceCount = var10; // L: 352 - this.textureTriangleCount = var11; // L: 353 - this.verticesX = new int[var9]; // L: 354 - this.verticesY = new int[var9]; // L: 355 - this.verticesZ = new int[var9]; // L: 356 - this.indices1 = new int[var10]; // L: 357 - this.indices2 = new int[var10]; // L: 358 - this.indices3 = new int[var10]; // L: 359 - if (var11 > 0) { // L: 360 - this.textureRenderTypes = new byte[var11]; // L: 361 - this.texTriangleX = new short[var11]; // L: 362 - this.texTriangleY = new short[var11]; // L: 363 - this.texTriangleZ = new short[var11]; // L: 364 + int var31 = var47; + var47 += var21; + int var32 = var47; + var47 += var10 * 2; + int var33 = var47; + var47 += var11 * 6; + int var34 = var47; + var47 += var18; + int var35 = var47; + var47 += var19; + int var10000 = var47 + var20; + this.verticesCount = var9; + this.faceCount = var10; + this.textureTriangleCount = var11; + this.verticesX = new int[var9]; + this.verticesY = new int[var9]; + this.verticesZ = new int[var9]; + this.indices1 = new int[var10]; + this.indices2 = new int[var10]; + this.indices3 = new int[var10]; + if (var11 > 0) { + this.textureRenderTypes = new byte[var11]; + this.texTriangleX = new short[var11]; + this.texTriangleY = new short[var11]; + this.texTriangleZ = new short[var11]; } - if (var16 == 1) { // L: 366 + if (var16 == 1) { this.vertexSkins = new int[var9]; } - if (var12 == 1) { // L: 367 - this.faceRenderTypes = new byte[var10]; // L: 368 - this.textureCoords = new byte[var10]; // L: 369 - this.faceTextures = new short[var10]; // L: 370 + if (var12 == 1) { + this.faceRenderTypes = new byte[var10]; + this.textureCoords = new byte[var10]; + this.faceTextures = new short[var10]; } - if (var13 == 255) { // L: 372 + if (var13 == 255) { this.faceRenderPriorities = new byte[var10]; } else { - this.priority = (byte)var13; // L: 373 + this.priority = (byte)var13; } - if (var14 == 1) { // L: 374 + if (var14 == 1) { this.faceAlphas = new byte[var10]; } - if (var15 == 1) { // L: 375 + if (var15 == 1) { this.faceSkins = new int[var10]; } - if (var17 == 1) { // L: 376 - this.field2185 = new int[var9][]; // L: 377 - this.field2173 = new int[var9][]; // L: 378 + if (var17 == 1) { + this.field2185 = new int[var9][]; + this.field2173 = new int[var9][]; } - this.faceColors = new short[var10]; // L: 380 - var4.offset = var23; // L: 381 - var5.offset = var34; // L: 382 - var6.offset = var35; // L: 383 - var7.offset = var47; // L: 384 - var8.offset = var29; // L: 385 - int var37 = 0; // L: 386 - int var38 = 0; // L: 387 - int var39 = 0; // L: 388 + this.faceColors = new short[var10]; + var4.offset = var23; + var5.offset = var34; + var6.offset = var35; + var7.offset = var47; + var8.offset = var29; + int var37 = 0; + int var38 = 0; + int var39 = 0; int var40; int var41; int var42; int var43; int var44; - for (var40 = 0; var40 < var9; ++var40) { // L: 389 - var41 = var4.readUnsignedByte(); // L: 390 - var42 = 0; // L: 391 - if ((var41 & 1) != 0) { // L: 392 + for (var40 = 0; var40 < var9; ++var40) { + var41 = var4.readUnsignedByte(); + var42 = 0; + if ((var41 & 1) != 0) { var42 = var5.readShortSmart(); } - var43 = 0; // L: 393 - if ((var41 & 2) != 0) { // L: 394 + var43 = 0; + if ((var41 & 2) != 0) { var43 = var6.readShortSmart(); } - var44 = 0; // L: 395 - if ((var41 & 4) != 0) { // L: 396 + var44 = 0; + if ((var41 & 4) != 0) { var44 = var7.readShortSmart(); } - this.verticesX[var40] = var37 + var42; // L: 397 - this.verticesY[var40] = var38 + var43; // L: 398 - this.verticesZ[var40] = var39 + var44; // L: 399 - var37 = this.verticesX[var40]; // L: 400 - var38 = this.verticesY[var40]; // L: 401 - var39 = this.verticesZ[var40]; // L: 402 - if (var16 == 1) { // L: 403 + this.verticesX[var40] = var37 + var42; + this.verticesY[var40] = var38 + var43; + this.verticesZ[var40] = var39 + var44; + var37 = this.verticesX[var40]; + var38 = this.verticesY[var40]; + var39 = this.verticesZ[var40]; + if (var16 == 1) { this.vertexSkins[var40] = var8.readUnsignedByte(); } } - if (var17 == 1) { // L: 405 - for (var40 = 0; var40 < var9; ++var40) { // L: 406 - var41 = var8.readUnsignedByte(); // L: 407 - this.field2185[var40] = new int[var41]; // L: 408 - this.field2173[var40] = new int[var41]; // L: 409 + if (var17 == 1) { + for (var40 = 0; var40 < var9; ++var40) { + var41 = var8.readUnsignedByte(); + this.field2185[var40] = new int[var41]; + this.field2173[var40] = new int[var41]; - for (var42 = 0; var42 < var41; ++var42) { // L: 410 - this.field2185[var40][var42] = var8.readUnsignedByte(); // L: 411 - this.field2173[var40][var42] = var8.readUnsignedByte(); // L: 412 + for (var42 = 0; var42 < var41; ++var42) { + this.field2185[var40][var42] = var8.readUnsignedByte(); + this.field2173[var40][var42] = var8.readUnsignedByte(); } } } - var4.offset = var32; // L: 416 - var5.offset = var28; // L: 417 - var6.offset = var26; // L: 418 - var7.offset = var30; // L: 419 - var8.offset = var27; // L: 420 + var4.offset = var32; + var5.offset = var28; + var6.offset = var26; + var7.offset = var30; + var8.offset = var27; - for (var40 = 0; var40 < var10; ++var40) { // L: 421 - this.faceColors[var40] = (short)var4.readUnsignedShort(); // L: 422 - if (var12 == 1) { // L: 423 - var41 = var5.readUnsignedByte(); // L: 424 - if ((var41 & 1) == 1) { // L: 425 - this.faceRenderTypes[var40] = 1; // L: 426 - var2 = true; // L: 427 + for (var40 = 0; var40 < var10; ++var40) { + this.faceColors[var40] = (short)var4.readUnsignedShort(); + if (var12 == 1) { + var41 = var5.readUnsignedByte(); + if ((var41 & 1) == 1) { + this.faceRenderTypes[var40] = 1; + var2 = true; } else { - this.faceRenderTypes[var40] = 0; // L: 429 + this.faceRenderTypes[var40] = 0; } - if ((var41 & 2) == 2) { // L: 430 - this.textureCoords[var40] = (byte)(var41 >> 2); // L: 431 - this.faceTextures[var40] = this.faceColors[var40]; // L: 432 - this.faceColors[var40] = 127; // L: 433 - if (this.faceTextures[var40] != -1) { // L: 434 + if ((var41 & 2) == 2) { + this.textureCoords[var40] = (byte)(var41 >> 2); + this.faceTextures[var40] = this.faceColors[var40]; + this.faceColors[var40] = 127; + if (this.faceTextures[var40] != -1) { var3 = true; } } else { - this.textureCoords[var40] = -1; // L: 437 - this.faceTextures[var40] = -1; // L: 438 + this.textureCoords[var40] = -1; + this.faceTextures[var40] = -1; } } - if (var13 == 255) { // L: 441 + if (var13 == 255) { this.faceRenderPriorities[var40] = var6.readByte(); } - if (var14 == 1) { // L: 442 + if (var14 == 1) { this.faceAlphas[var40] = var7.readByte(); } - if (var15 == 1) { // L: 443 + if (var15 == 1) { this.faceSkins[var40] = var8.readUnsignedByte(); } } - var4.offset = var31; // L: 445 - var5.offset = var25; // L: 446 - var40 = 0; // L: 447 - var41 = 0; // L: 448 - var42 = 0; // L: 449 - var43 = 0; // L: 450 + var4.offset = var31; + var5.offset = var25; + var40 = 0; + var41 = 0; + var42 = 0; + var43 = 0; int var45; int var46; - for (var44 = 0; var44 < var10; ++var44) { // L: 451 - var45 = var5.readUnsignedByte(); // L: 452 - if (var45 == 1) { // L: 453 - var40 = var4.readShortSmart() + var43; // L: 454 - var41 = var4.readShortSmart() + var40; // L: 456 - var42 = var4.readShortSmart() + var41; // L: 458 - var43 = var42; // L: 459 - this.indices1[var44] = var40; // L: 460 - this.indices2[var44] = var41; // L: 461 - this.indices3[var44] = var42; // L: 462 + for (var44 = 0; var44 < var10; ++var44) { + var45 = var5.readUnsignedByte(); + if (var45 == 1) { + var40 = var4.readShortSmart() + var43; + var41 = var4.readShortSmart() + var40; + var42 = var4.readShortSmart() + var41; + var43 = var42; + this.indices1[var44] = var40; + this.indices2[var44] = var41; + this.indices3[var44] = var42; } - if (var45 == 2) { // L: 464 - var41 = var42; // L: 465 - var42 = var4.readShortSmart() + var43; // L: 466 - var43 = var42; // L: 467 - this.indices1[var44] = var40; // L: 468 - this.indices2[var44] = var41; // L: 469 - this.indices3[var44] = var42; // L: 470 + if (var45 == 2) { + var41 = var42; + var42 = var4.readShortSmart() + var43; + var43 = var42; + this.indices1[var44] = var40; + this.indices2[var44] = var41; + this.indices3[var44] = var42; } - if (var45 == 3) { // L: 472 - var40 = var42; // L: 473 - var42 = var4.readShortSmart() + var43; // L: 474 - var43 = var42; // L: 475 - this.indices1[var44] = var40; // L: 476 - this.indices2[var44] = var41; // L: 477 - this.indices3[var44] = var42; // L: 478 + if (var45 == 3) { + var40 = var42; + var42 = var4.readShortSmart() + var43; + var43 = var42; + this.indices1[var44] = var40; + this.indices2[var44] = var41; + this.indices3[var44] = var42; } - if (var45 == 4) { // L: 480 - var46 = var40; // L: 481 - var40 = var41; // L: 482 - var41 = var46; // L: 483 - var42 = var4.readShortSmart() + var43; // L: 484 - var43 = var42; // L: 485 - this.indices1[var44] = var40; // L: 486 - this.indices2[var44] = var46; // L: 487 - this.indices3[var44] = var42; // L: 488 + if (var45 == 4) { + var46 = var40; + var40 = var41; + var41 = var46; + var42 = var4.readShortSmart() + var43; + var43 = var42; + this.indices1[var44] = var40; + this.indices2[var44] = var46; + this.indices3[var44] = var42; } } - var4.offset = var33; // L: 491 + var4.offset = var33; - for (var44 = 0; var44 < var11; ++var44) { // L: 492 - this.textureRenderTypes[var44] = 0; // L: 493 - this.texTriangleX[var44] = (short)var4.readUnsignedShort(); // L: 494 - this.texTriangleY[var44] = (short)var4.readUnsignedShort(); // L: 495 - this.texTriangleZ[var44] = (short)var4.readUnsignedShort(); // L: 496 + for (var44 = 0; var44 < var11; ++var44) { + this.textureRenderTypes[var44] = 0; + this.texTriangleX[var44] = (short)var4.readUnsignedShort(); + this.texTriangleY[var44] = (short)var4.readUnsignedShort(); + this.texTriangleZ[var44] = (short)var4.readUnsignedShort(); } - if (this.textureCoords != null) { // L: 498 - boolean var48 = false; // L: 499 + if (this.textureCoords != null) { + boolean var48 = false; - for (var45 = 0; var45 < var10; ++var45) { // L: 500 - var46 = this.textureCoords[var45] & 255; // L: 501 - if (var46 != 255) { // L: 502 - if (this.indices1[var45] == (this.texTriangleX[var46] & '\uffff') && this.indices2[var45] == (this.texTriangleY[var46] & '\uffff') && this.indices3[var45] == (this.texTriangleZ[var46] & '\uffff')) { // L: 503 + for (var45 = 0; var45 < var10; ++var45) { + var46 = this.textureCoords[var45] & 255; + if (var46 != 255) { + if (this.indices1[var45] == (this.texTriangleX[var46] & '\uffff') && this.indices2[var45] == (this.texTriangleY[var46] & '\uffff') && this.indices3[var45] == (this.texTriangleZ[var46] & '\uffff')) { this.textureCoords[var45] = -1; } else { - var48 = true; // L: 504 + var48 = true; } } } - if (!var48) { // L: 507 + if (!var48) { this.textureCoords = null; } } - if (!var3) { // L: 509 + if (!var3) { this.faceTextures = null; } - if (!var2) { // L: 510 + if (!var2) { this.faceRenderTypes = null; } - } // L: 511 + } @ObfuscatedName("t") void method3758(byte[] var1) { - Buffer var2 = new Buffer(var1); // L: 514 - Buffer var3 = new Buffer(var1); // L: 515 - Buffer var4 = new Buffer(var1); // L: 516 - Buffer var5 = new Buffer(var1); // L: 517 - Buffer var6 = new Buffer(var1); // L: 518 - Buffer var7 = new Buffer(var1); // L: 519 - Buffer var8 = new Buffer(var1); // L: 520 - var2.offset = var1.length - 23; // L: 521 - int var9 = var2.readUnsignedShort(); // L: 522 - int var10 = var2.readUnsignedShort(); // L: 523 - int var11 = var2.readUnsignedByte(); // L: 524 - int var12 = var2.readUnsignedByte(); // L: 525 - int var13 = var2.readUnsignedByte(); // L: 526 - int var14 = var2.readUnsignedByte(); // L: 527 - int var15 = var2.readUnsignedByte(); // L: 528 - int var16 = var2.readUnsignedByte(); // L: 529 - int var17 = var2.readUnsignedByte(); // L: 530 - int var18 = var2.readUnsignedShort(); // L: 531 - int var19 = var2.readUnsignedShort(); // L: 532 - int var20 = var2.readUnsignedShort(); // L: 533 - int var21 = var2.readUnsignedShort(); // L: 534 - int var22 = var2.readUnsignedShort(); // L: 535 - int var23 = 0; // L: 536 - int var24 = 0; // L: 537 - int var25 = 0; // L: 538 + Buffer var2 = new Buffer(var1); + Buffer var3 = new Buffer(var1); + Buffer var4 = new Buffer(var1); + Buffer var5 = new Buffer(var1); + Buffer var6 = new Buffer(var1); + Buffer var7 = new Buffer(var1); + Buffer var8 = new Buffer(var1); + var2.offset = var1.length - 23; + int var9 = var2.readUnsignedShort(); + int var10 = var2.readUnsignedShort(); + int var11 = var2.readUnsignedByte(); + int var12 = var2.readUnsignedByte(); + int var13 = var2.readUnsignedByte(); + int var14 = var2.readUnsignedByte(); + int var15 = var2.readUnsignedByte(); + int var16 = var2.readUnsignedByte(); + int var17 = var2.readUnsignedByte(); + int var18 = var2.readUnsignedShort(); + int var19 = var2.readUnsignedShort(); + int var20 = var2.readUnsignedShort(); + int var21 = var2.readUnsignedShort(); + int var22 = var2.readUnsignedShort(); + int var23 = 0; + int var24 = 0; + int var25 = 0; int var26; - if (var11 > 0) { // L: 539 - this.textureRenderTypes = new byte[var11]; // L: 540 - var2.offset = 0; // L: 541 + if (var11 > 0) { + this.textureRenderTypes = new byte[var11]; + var2.offset = 0; - for (var26 = 0; var26 < var11; ++var26) { // L: 542 - byte var27 = this.textureRenderTypes[var26] = var2.readByte(); // L: 543 - if (var27 == 0) { // L: 544 + for (var26 = 0; var26 < var11; ++var26) { + byte var27 = this.textureRenderTypes[var26] = var2.readByte(); + if (var27 == 0) { ++var23; } - if (var27 >= 1 && var27 <= 3) { // L: 545 + if (var27 >= 1 && var27 <= 3) { ++var24; } - if (var27 == 2) { // L: 546 + if (var27 == 2) { ++var25; } } } - var26 = var11 + var9; // L: 551 - int var28 = var26; // L: 552 - if (var12 == 1) { // L: 553 + var26 = var11 + var9; + int var28 = var26; + if (var12 == 1) { var26 += var10; } - int var29 = var26; // L: 554 - var26 += var10; // L: 555 - int var30 = var26; // L: 556 - if (var13 == 255) { // L: 557 + int var29 = var26; + var26 += var10; + int var30 = var26; + if (var13 == 255) { var26 += var10; } - int var31 = var26; // L: 558 - if (var15 == 1) { // L: 559 + int var31 = var26; + if (var15 == 1) { var26 += var10; } - int var32 = var26; // L: 560 - if (var17 == 1) { // L: 561 + int var32 = var26; + if (var17 == 1) { var26 += var9; } - int var33 = var26; // L: 562 - if (var14 == 1) { // L: 563 + int var33 = var26; + if (var14 == 1) { var26 += var10; } - int var34 = var26; // L: 564 - var26 += var21; // L: 565 - int var35 = var26; // L: 566 - if (var16 == 1) { // L: 567 + int var34 = var26; + var26 += var21; + int var35 = var26; + if (var16 == 1) { var26 += var10 * 2; } - int var36 = var26; // L: 568 - var26 += var22; // L: 569 - int var37 = var26; // L: 570 - var26 += var10 * 2; // L: 571 - int var38 = var26; // L: 572 - var26 += var18; // L: 573 - int var39 = var26; // L: 574 - var26 += var19; // L: 575 - int var40 = var26; // L: 576 - var26 += var20; // L: 577 - int var41 = var26; // L: 578 - var26 += var23 * 6; // L: 579 - int var42 = var26; // L: 580 - var26 += var24 * 6; // L: 581 - int var43 = var26; // L: 582 - var26 += var24 * 6; // L: 583 - int var44 = var26; // L: 584 - var26 += var24 * 2; // L: 585 - int var45 = var26; // L: 586 - var26 += var24; // L: 587 - int var46 = var26; // L: 588 - var26 += var24 * 2 + var25 * 2; // L: 589 - this.verticesCount = var9; // L: 591 - this.faceCount = var10; // L: 592 - this.textureTriangleCount = var11; // L: 593 - this.verticesX = new int[var9]; // L: 594 - this.verticesY = new int[var9]; // L: 595 - this.verticesZ = new int[var9]; // L: 596 - this.indices1 = new int[var10]; // L: 597 - this.indices2 = new int[var10]; // L: 598 - this.indices3 = new int[var10]; // L: 599 - if (var17 == 1) { // L: 600 + int var36 = var26; + var26 += var22; + int var37 = var26; + var26 += var10 * 2; + int var38 = var26; + var26 += var18; + int var39 = var26; + var26 += var19; + int var40 = var26; + var26 += var20; + int var41 = var26; + var26 += var23 * 6; + int var42 = var26; + var26 += var24 * 6; + int var43 = var26; + var26 += var24 * 6; + int var44 = var26; + var26 += var24 * 2; + int var45 = var26; + var26 += var24; + int var46 = var26; + var26 += var24 * 2 + var25 * 2; + this.verticesCount = var9; + this.faceCount = var10; + this.textureTriangleCount = var11; + this.verticesX = new int[var9]; + this.verticesY = new int[var9]; + this.verticesZ = new int[var9]; + this.indices1 = new int[var10]; + this.indices2 = new int[var10]; + this.indices3 = new int[var10]; + if (var17 == 1) { this.vertexSkins = new int[var9]; } - if (var12 == 1) { // L: 601 + if (var12 == 1) { this.faceRenderTypes = new byte[var10]; } - if (var13 == 255) { // L: 602 + if (var13 == 255) { this.faceRenderPriorities = new byte[var10]; } else { - this.priority = (byte)var13; // L: 603 + this.priority = (byte)var13; } - if (var14 == 1) { // L: 604 + if (var14 == 1) { this.faceAlphas = new byte[var10]; } - if (var15 == 1) { // L: 605 + if (var15 == 1) { this.faceSkins = new int[var10]; } - if (var16 == 1) { // L: 606 + if (var16 == 1) { this.faceTextures = new short[var10]; } - if (var16 == 1 && var11 > 0) { // L: 607 + if (var16 == 1 && var11 > 0) { this.textureCoords = new byte[var10]; } - this.faceColors = new short[var10]; // L: 608 - if (var11 > 0) { // L: 609 - this.texTriangleX = new short[var11]; // L: 610 - this.texTriangleY = new short[var11]; // L: 611 - this.texTriangleZ = new short[var11]; // L: 612 + this.faceColors = new short[var10]; + if (var11 > 0) { + this.texTriangleX = new short[var11]; + this.texTriangleY = new short[var11]; + this.texTriangleZ = new short[var11]; } - var2.offset = var11; // L: 614 - var3.offset = var38; // L: 615 - var4.offset = var39; // L: 616 - var5.offset = var40; // L: 617 - var6.offset = var32; // L: 618 - int var48 = 0; // L: 619 - int var49 = 0; // L: 620 - int var50 = 0; // L: 621 + var2.offset = var11; + var3.offset = var38; + var4.offset = var39; + var5.offset = var40; + var6.offset = var32; + int var48 = 0; + int var49 = 0; + int var50 = 0; int var51; int var52; int var53; int var54; int var55; - for (var51 = 0; var51 < var9; ++var51) { // L: 622 - var52 = var2.readUnsignedByte(); // L: 623 - var53 = 0; // L: 624 - if ((var52 & 1) != 0) { // L: 625 + for (var51 = 0; var51 < var9; ++var51) { + var52 = var2.readUnsignedByte(); + var53 = 0; + if ((var52 & 1) != 0) { var53 = var3.readShortSmart(); } - var54 = 0; // L: 626 - if ((var52 & 2) != 0) { // L: 627 + var54 = 0; + if ((var52 & 2) != 0) { var54 = var4.readShortSmart(); } - var55 = 0; // L: 628 - if ((var52 & 4) != 0) { // L: 629 + var55 = 0; + if ((var52 & 4) != 0) { var55 = var5.readShortSmart(); } - this.verticesX[var51] = var48 + var53; // L: 630 - this.verticesY[var51] = var49 + var54; // L: 631 - this.verticesZ[var51] = var50 + var55; // L: 632 - var48 = this.verticesX[var51]; // L: 633 - var49 = this.verticesY[var51]; // L: 634 - var50 = this.verticesZ[var51]; // L: 635 - if (var17 == 1) { // L: 636 + this.verticesX[var51] = var48 + var53; + this.verticesY[var51] = var49 + var54; + this.verticesZ[var51] = var50 + var55; + var48 = this.verticesX[var51]; + var49 = this.verticesY[var51]; + var50 = this.verticesZ[var51]; + if (var17 == 1) { this.vertexSkins[var51] = var6.readUnsignedByte(); } } - var2.offset = var37; // L: 638 - var3.offset = var28; // L: 639 - var4.offset = var30; // L: 640 - var5.offset = var33; // L: 641 - var6.offset = var31; // L: 642 - var7.offset = var35; // L: 643 - var8.offset = var36; // L: 644 + var2.offset = var37; + var3.offset = var28; + var4.offset = var30; + var5.offset = var33; + var6.offset = var31; + var7.offset = var35; + var8.offset = var36; - for (var51 = 0; var51 < var10; ++var51) { // L: 645 - this.faceColors[var51] = (short)var2.readUnsignedShort(); // L: 646 - if (var12 == 1) { // L: 647 + for (var51 = 0; var51 < var10; ++var51) { + this.faceColors[var51] = (short)var2.readUnsignedShort(); + if (var12 == 1) { this.faceRenderTypes[var51] = var3.readByte(); } - if (var13 == 255) { // L: 648 + if (var13 == 255) { this.faceRenderPriorities[var51] = var4.readByte(); } - if (var14 == 1) { // L: 649 + if (var14 == 1) { this.faceAlphas[var51] = var5.readByte(); } - if (var15 == 1) { // L: 650 + if (var15 == 1) { this.faceSkins[var51] = var6.readUnsignedByte(); } - if (var16 == 1) { // L: 651 + if (var16 == 1) { this.faceTextures[var51] = (short)(var7.readUnsignedShort() - 1); } - if (this.textureCoords != null && this.faceTextures[var51] != -1) { // L: 652 + if (this.textureCoords != null && this.faceTextures[var51] != -1) { this.textureCoords[var51] = (byte)(var8.readUnsignedByte() - 1); } } - var2.offset = var34; // L: 654 - var3.offset = var29; // L: 655 - var51 = 0; // L: 656 - var52 = 0; // L: 657 - var53 = 0; // L: 658 - var54 = 0; // L: 659 + var2.offset = var34; + var3.offset = var29; + var51 = 0; + var52 = 0; + var53 = 0; + var54 = 0; int var56; - for (var55 = 0; var55 < var10; ++var55) { // L: 660 - var56 = var3.readUnsignedByte(); // L: 661 - if (var56 == 1) { // L: 662 - var51 = var2.readShortSmart() + var54; // L: 663 - var52 = var2.readShortSmart() + var51; // L: 665 - var53 = var2.readShortSmart() + var52; // L: 667 - var54 = var53; // L: 668 - this.indices1[var55] = var51; // L: 669 - this.indices2[var55] = var52; // L: 670 - this.indices3[var55] = var53; // L: 671 + for (var55 = 0; var55 < var10; ++var55) { + var56 = var3.readUnsignedByte(); + if (var56 == 1) { + var51 = var2.readShortSmart() + var54; + var52 = var2.readShortSmart() + var51; + var53 = var2.readShortSmart() + var52; + var54 = var53; + this.indices1[var55] = var51; + this.indices2[var55] = var52; + this.indices3[var55] = var53; } - if (var56 == 2) { // L: 673 - var52 = var53; // L: 674 - var53 = var2.readShortSmart() + var54; // L: 675 - var54 = var53; // L: 676 - this.indices1[var55] = var51; // L: 677 - this.indices2[var55] = var52; // L: 678 - this.indices3[var55] = var53; // L: 679 + if (var56 == 2) { + var52 = var53; + var53 = var2.readShortSmart() + var54; + var54 = var53; + this.indices1[var55] = var51; + this.indices2[var55] = var52; + this.indices3[var55] = var53; } - if (var56 == 3) { // L: 681 - var51 = var53; // L: 682 - var53 = var2.readShortSmart() + var54; // L: 683 - var54 = var53; // L: 684 - this.indices1[var55] = var51; // L: 685 - this.indices2[var55] = var52; // L: 686 - this.indices3[var55] = var53; // L: 687 + if (var56 == 3) { + var51 = var53; + var53 = var2.readShortSmart() + var54; + var54 = var53; + this.indices1[var55] = var51; + this.indices2[var55] = var52; + this.indices3[var55] = var53; } - if (var56 == 4) { // L: 689 - int var57 = var51; // L: 690 - var51 = var52; // L: 691 - var52 = var57; // L: 692 - var53 = var2.readShortSmart() + var54; // L: 693 - var54 = var53; // L: 694 - this.indices1[var55] = var51; // L: 695 - this.indices2[var55] = var57; // L: 696 - this.indices3[var55] = var53; // L: 697 + if (var56 == 4) { + int var57 = var51; + var51 = var52; + var52 = var57; + var53 = var2.readShortSmart() + var54; + var54 = var53; + this.indices1[var55] = var51; + this.indices2[var55] = var57; + this.indices3[var55] = var53; } } - var2.offset = var41; // L: 700 - var3.offset = var42; // L: 701 - var4.offset = var43; // L: 702 - var5.offset = var44; // L: 703 - var6.offset = var45; // L: 704 - var7.offset = var46; // L: 705 + var2.offset = var41; + var3.offset = var42; + var4.offset = var43; + var5.offset = var44; + var6.offset = var45; + var7.offset = var46; - for (var55 = 0; var55 < var11; ++var55) { // L: 706 - var56 = this.textureRenderTypes[var55] & 255; // L: 707 - if (var56 == 0) { // L: 708 - this.texTriangleX[var55] = (short)var2.readUnsignedShort(); // L: 709 - this.texTriangleY[var55] = (short)var2.readUnsignedShort(); // L: 710 - this.texTriangleZ[var55] = (short)var2.readUnsignedShort(); // L: 711 + for (var55 = 0; var55 < var11; ++var55) { + var56 = this.textureRenderTypes[var55] & 255; + if (var56 == 0) { + this.texTriangleX[var55] = (short)var2.readUnsignedShort(); + this.texTriangleY[var55] = (short)var2.readUnsignedShort(); + this.texTriangleZ[var55] = (short)var2.readUnsignedShort(); } } - var2.offset = var26; // L: 714 - var55 = var2.readUnsignedByte(); // L: 715 - if (var55 != 0) { // L: 716 + var2.offset = var26; + var55 = var2.readUnsignedByte(); + if (var55 != 0) { new ModelData0(); - var2.readUnsignedShort(); // L: 718 - var2.readUnsignedShort(); // L: 719 - var2.readUnsignedShort(); // L: 720 - var2.readInt(); // L: 721 + var2.readUnsignedShort(); + var2.readUnsignedShort(); + var2.readUnsignedShort(); + var2.readInt(); } - } // L: 723 + } @ObfuscatedName("r") void method3747(byte[] var1) { - boolean var2 = false; // L: 726 - boolean var3 = false; // L: 727 - Buffer var4 = new Buffer(var1); // L: 728 - Buffer var5 = new Buffer(var1); // L: 729 - Buffer var6 = new Buffer(var1); // L: 730 - Buffer var7 = new Buffer(var1); // L: 731 - Buffer var8 = new Buffer(var1); // L: 732 - var4.offset = var1.length - 18; // L: 733 - int var9 = var4.readUnsignedShort(); // L: 734 - int var10 = var4.readUnsignedShort(); // L: 735 - int var11 = var4.readUnsignedByte(); // L: 736 - int var12 = var4.readUnsignedByte(); // L: 737 - int var13 = var4.readUnsignedByte(); // L: 738 - int var14 = var4.readUnsignedByte(); // L: 739 - int var15 = var4.readUnsignedByte(); // L: 740 - int var16 = var4.readUnsignedByte(); // L: 741 - int var17 = var4.readUnsignedShort(); // L: 742 - int var18 = var4.readUnsignedShort(); // L: 743 - int var19 = var4.readUnsignedShort(); // L: 744 - int var20 = var4.readUnsignedShort(); // L: 745 - byte var21 = 0; // L: 746 - int var45 = var21 + var9; // L: 748 - int var23 = var45; // L: 749 - var45 += var10; // L: 750 - int var24 = var45; // L: 751 - if (var13 == 255) { // L: 752 + boolean var2 = false; + boolean var3 = false; + Buffer var4 = new Buffer(var1); + Buffer var5 = new Buffer(var1); + Buffer var6 = new Buffer(var1); + Buffer var7 = new Buffer(var1); + Buffer var8 = new Buffer(var1); + var4.offset = var1.length - 18; + int var9 = var4.readUnsignedShort(); + int var10 = var4.readUnsignedShort(); + int var11 = var4.readUnsignedByte(); + int var12 = var4.readUnsignedByte(); + int var13 = var4.readUnsignedByte(); + int var14 = var4.readUnsignedByte(); + int var15 = var4.readUnsignedByte(); + int var16 = var4.readUnsignedByte(); + int var17 = var4.readUnsignedShort(); + int var18 = var4.readUnsignedShort(); + int var19 = var4.readUnsignedShort(); + int var20 = var4.readUnsignedShort(); + byte var21 = 0; + int var45 = var21 + var9; + int var23 = var45; + var45 += var10; + int var24 = var45; + if (var13 == 255) { var45 += var10; } - int var25 = var45; // L: 753 - if (var15 == 1) { // L: 754 + int var25 = var45; + if (var15 == 1) { var45 += var10; } - int var26 = var45; // L: 755 - if (var12 == 1) { // L: 756 + int var26 = var45; + if (var12 == 1) { var45 += var10; } - int var27 = var45; // L: 757 - if (var16 == 1) { // L: 758 + int var27 = var45; + if (var16 == 1) { var45 += var9; } - int var28 = var45; // L: 759 - if (var14 == 1) { // L: 760 + int var28 = var45; + if (var14 == 1) { var45 += var10; } - int var29 = var45; // L: 761 - var45 += var20; // L: 762 - int var30 = var45; // L: 763 - var45 += var10 * 2; // L: 764 - int var31 = var45; // L: 765 - var45 += var11 * 6; // L: 766 - int var32 = var45; // L: 767 - var45 += var17; // L: 768 - int var33 = var45; // L: 769 - var45 += var18; // L: 770 - int var10000 = var45 + var19; // L: 772 - this.verticesCount = var9; // L: 773 - this.faceCount = var10; // L: 774 - this.textureTriangleCount = var11; // L: 775 - this.verticesX = new int[var9]; // L: 776 - this.verticesY = new int[var9]; // L: 777 - this.verticesZ = new int[var9]; // L: 778 - this.indices1 = new int[var10]; // L: 779 - this.indices2 = new int[var10]; // L: 780 - this.indices3 = new int[var10]; // L: 781 - if (var11 > 0) { // L: 782 - this.textureRenderTypes = new byte[var11]; // L: 783 - this.texTriangleX = new short[var11]; // L: 784 - this.texTriangleY = new short[var11]; // L: 785 - this.texTriangleZ = new short[var11]; // L: 786 + int var29 = var45; + var45 += var20; + int var30 = var45; + var45 += var10 * 2; + int var31 = var45; + var45 += var11 * 6; + int var32 = var45; + var45 += var17; + int var33 = var45; + var45 += var18; + int var10000 = var45 + var19; + this.verticesCount = var9; + this.faceCount = var10; + this.textureTriangleCount = var11; + this.verticesX = new int[var9]; + this.verticesY = new int[var9]; + this.verticesZ = new int[var9]; + this.indices1 = new int[var10]; + this.indices2 = new int[var10]; + this.indices3 = new int[var10]; + if (var11 > 0) { + this.textureRenderTypes = new byte[var11]; + this.texTriangleX = new short[var11]; + this.texTriangleY = new short[var11]; + this.texTriangleZ = new short[var11]; } - if (var16 == 1) { // L: 788 + if (var16 == 1) { this.vertexSkins = new int[var9]; } - if (var12 == 1) { // L: 789 - this.faceRenderTypes = new byte[var10]; // L: 790 - this.textureCoords = new byte[var10]; // L: 791 - this.faceTextures = new short[var10]; // L: 792 + if (var12 == 1) { + this.faceRenderTypes = new byte[var10]; + this.textureCoords = new byte[var10]; + this.faceTextures = new short[var10]; } - if (var13 == 255) { // L: 794 + if (var13 == 255) { this.faceRenderPriorities = new byte[var10]; } else { - this.priority = (byte)var13; // L: 795 + this.priority = (byte)var13; } - if (var14 == 1) { // L: 796 + if (var14 == 1) { this.faceAlphas = new byte[var10]; } - if (var15 == 1) { // L: 797 + if (var15 == 1) { this.faceSkins = new int[var10]; } - this.faceColors = new short[var10]; // L: 798 - var4.offset = var21; // L: 799 - var5.offset = var32; // L: 800 - var6.offset = var33; // L: 801 - var7.offset = var45; // L: 802 - var8.offset = var27; // L: 803 - int var35 = 0; // L: 804 - int var36 = 0; // L: 805 - int var37 = 0; // L: 806 + this.faceColors = new short[var10]; + var4.offset = var21; + var5.offset = var32; + var6.offset = var33; + var7.offset = var45; + var8.offset = var27; + int var35 = 0; + int var36 = 0; + int var37 = 0; int var38; int var39; int var40; int var41; int var42; - for (var38 = 0; var38 < var9; ++var38) { // L: 807 - var39 = var4.readUnsignedByte(); // L: 808 - var40 = 0; // L: 809 - if ((var39 & 1) != 0) { // L: 810 + for (var38 = 0; var38 < var9; ++var38) { + var39 = var4.readUnsignedByte(); + var40 = 0; + if ((var39 & 1) != 0) { var40 = var5.readShortSmart(); } - var41 = 0; // L: 811 - if ((var39 & 2) != 0) { // L: 812 + var41 = 0; + if ((var39 & 2) != 0) { var41 = var6.readShortSmart(); } - var42 = 0; // L: 813 - if ((var39 & 4) != 0) { // L: 814 + var42 = 0; + if ((var39 & 4) != 0) { var42 = var7.readShortSmart(); } - this.verticesX[var38] = var35 + var40; // L: 815 - this.verticesY[var38] = var36 + var41; // L: 816 - this.verticesZ[var38] = var37 + var42; // L: 817 - var35 = this.verticesX[var38]; // L: 818 - var36 = this.verticesY[var38]; // L: 819 - var37 = this.verticesZ[var38]; // L: 820 - if (var16 == 1) { // L: 821 + this.verticesX[var38] = var35 + var40; + this.verticesY[var38] = var36 + var41; + this.verticesZ[var38] = var37 + var42; + var35 = this.verticesX[var38]; + var36 = this.verticesY[var38]; + var37 = this.verticesZ[var38]; + if (var16 == 1) { this.vertexSkins[var38] = var8.readUnsignedByte(); } } - var4.offset = var30; // L: 823 - var5.offset = var26; // L: 824 - var6.offset = var24; // L: 825 - var7.offset = var28; // L: 826 - var8.offset = var25; // L: 827 + var4.offset = var30; + var5.offset = var26; + var6.offset = var24; + var7.offset = var28; + var8.offset = var25; - for (var38 = 0; var38 < var10; ++var38) { // L: 828 - this.faceColors[var38] = (short)var4.readUnsignedShort(); // L: 829 - if (var12 == 1) { // L: 830 - var39 = var5.readUnsignedByte(); // L: 831 - if ((var39 & 1) == 1) { // L: 832 - this.faceRenderTypes[var38] = 1; // L: 833 - var2 = true; // L: 834 + for (var38 = 0; var38 < var10; ++var38) { + this.faceColors[var38] = (short)var4.readUnsignedShort(); + if (var12 == 1) { + var39 = var5.readUnsignedByte(); + if ((var39 & 1) == 1) { + this.faceRenderTypes[var38] = 1; + var2 = true; } else { - this.faceRenderTypes[var38] = 0; // L: 836 + this.faceRenderTypes[var38] = 0; } - if ((var39 & 2) == 2) { // L: 837 - this.textureCoords[var38] = (byte)(var39 >> 2); // L: 838 - this.faceTextures[var38] = this.faceColors[var38]; // L: 839 - this.faceColors[var38] = 127; // L: 840 - if (this.faceTextures[var38] != -1) { // L: 841 + if ((var39 & 2) == 2) { + this.textureCoords[var38] = (byte)(var39 >> 2); + this.faceTextures[var38] = this.faceColors[var38]; + this.faceColors[var38] = 127; + if (this.faceTextures[var38] != -1) { var3 = true; } } else { - this.textureCoords[var38] = -1; // L: 844 - this.faceTextures[var38] = -1; // L: 845 + this.textureCoords[var38] = -1; + this.faceTextures[var38] = -1; } } - if (var13 == 255) { // L: 848 + if (var13 == 255) { this.faceRenderPriorities[var38] = var6.readByte(); } - if (var14 == 1) { // L: 849 + if (var14 == 1) { this.faceAlphas[var38] = var7.readByte(); } - if (var15 == 1) { // L: 850 + if (var15 == 1) { this.faceSkins[var38] = var8.readUnsignedByte(); } } - var4.offset = var29; // L: 852 - var5.offset = var23; // L: 853 - var38 = 0; // L: 854 - var39 = 0; // L: 855 - var40 = 0; // L: 856 - var41 = 0; // L: 857 + var4.offset = var29; + var5.offset = var23; + var38 = 0; + var39 = 0; + var40 = 0; + var41 = 0; int var43; int var44; - for (var42 = 0; var42 < var10; ++var42) { // L: 858 - var43 = var5.readUnsignedByte(); // L: 859 - if (var43 == 1) { // L: 860 - var38 = var4.readShortSmart() + var41; // L: 861 - var39 = var4.readShortSmart() + var38; // L: 863 - var40 = var4.readShortSmart() + var39; // L: 865 - var41 = var40; // L: 866 - this.indices1[var42] = var38; // L: 867 - this.indices2[var42] = var39; // L: 868 - this.indices3[var42] = var40; // L: 869 + for (var42 = 0; var42 < var10; ++var42) { + var43 = var5.readUnsignedByte(); + if (var43 == 1) { + var38 = var4.readShortSmart() + var41; + var39 = var4.readShortSmart() + var38; + var40 = var4.readShortSmart() + var39; + var41 = var40; + this.indices1[var42] = var38; + this.indices2[var42] = var39; + this.indices3[var42] = var40; } - if (var43 == 2) { // L: 871 - var39 = var40; // L: 872 - var40 = var4.readShortSmart() + var41; // L: 873 - var41 = var40; // L: 874 - this.indices1[var42] = var38; // L: 875 - this.indices2[var42] = var39; // L: 876 - this.indices3[var42] = var40; // L: 877 + if (var43 == 2) { + var39 = var40; + var40 = var4.readShortSmart() + var41; + var41 = var40; + this.indices1[var42] = var38; + this.indices2[var42] = var39; + this.indices3[var42] = var40; } - if (var43 == 3) { // L: 879 - var38 = var40; // L: 880 - var40 = var4.readShortSmart() + var41; // L: 881 - var41 = var40; // L: 882 - this.indices1[var42] = var38; // L: 883 - this.indices2[var42] = var39; // L: 884 - this.indices3[var42] = var40; // L: 885 + if (var43 == 3) { + var38 = var40; + var40 = var4.readShortSmart() + var41; + var41 = var40; + this.indices1[var42] = var38; + this.indices2[var42] = var39; + this.indices3[var42] = var40; } - if (var43 == 4) { // L: 887 - var44 = var38; // L: 888 - var38 = var39; // L: 889 - var39 = var44; // L: 890 - var40 = var4.readShortSmart() + var41; // L: 891 - var41 = var40; // L: 892 - this.indices1[var42] = var38; // L: 893 - this.indices2[var42] = var44; // L: 894 - this.indices3[var42] = var40; // L: 895 + if (var43 == 4) { + var44 = var38; + var38 = var39; + var39 = var44; + var40 = var4.readShortSmart() + var41; + var41 = var40; + this.indices1[var42] = var38; + this.indices2[var42] = var44; + this.indices3[var42] = var40; } } - var4.offset = var31; // L: 898 + var4.offset = var31; - for (var42 = 0; var42 < var11; ++var42) { // L: 899 - this.textureRenderTypes[var42] = 0; // L: 900 - this.texTriangleX[var42] = (short)var4.readUnsignedShort(); // L: 901 - this.texTriangleY[var42] = (short)var4.readUnsignedShort(); // L: 902 - this.texTriangleZ[var42] = (short)var4.readUnsignedShort(); // L: 903 + for (var42 = 0; var42 < var11; ++var42) { + this.textureRenderTypes[var42] = 0; + this.texTriangleX[var42] = (short)var4.readUnsignedShort(); + this.texTriangleY[var42] = (short)var4.readUnsignedShort(); + this.texTriangleZ[var42] = (short)var4.readUnsignedShort(); } - if (this.textureCoords != null) { // L: 905 - boolean var46 = false; // L: 906 + if (this.textureCoords != null) { + boolean var46 = false; - for (var43 = 0; var43 < var10; ++var43) { // L: 907 - var44 = this.textureCoords[var43] & 255; // L: 908 - if (var44 != 255) { // L: 909 - if (this.indices1[var43] == (this.texTriangleX[var44] & '\uffff') && this.indices2[var43] == (this.texTriangleY[var44] & '\uffff') && this.indices3[var43] == (this.texTriangleZ[var44] & '\uffff')) { // L: 910 + for (var43 = 0; var43 < var10; ++var43) { + var44 = this.textureCoords[var43] & 255; + if (var44 != 255) { + if (this.indices1[var43] == (this.texTriangleX[var44] & '\uffff') && this.indices2[var43] == (this.texTriangleY[var44] & '\uffff') && this.indices3[var43] == (this.texTriangleZ[var44] & '\uffff')) { this.textureCoords[var43] = -1; } else { - var46 = true; // L: 911 + var46 = true; } } } - if (!var46) { // L: 914 + if (!var46) { this.textureCoords = null; } } - if (!var3) { // L: 916 + if (!var3) { this.faceTextures = null; } - if (!var2) { // L: 917 + if (!var2) { this.faceRenderTypes = null; } - } // L: 918 + } @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(Lge;I)I" ) final int method3762(ModelData var1, int var2) { - int var3 = -1; // L: 1023 - int var4 = var1.verticesX[var2]; // L: 1024 - int var5 = var1.verticesY[var2]; // L: 1025 - int var6 = var1.verticesZ[var2]; // L: 1026 + int var3 = -1; + int var4 = var1.verticesX[var2]; + int var5 = var1.verticesY[var2]; + int var6 = var1.verticesZ[var2]; - for (int var7 = 0; var7 < this.verticesCount; ++var7) { // L: 1027 - if (var4 == this.verticesX[var7] && var5 == this.verticesY[var7] && var6 == this.verticesZ[var7]) { // L: 1028 - var3 = var7; // L: 1029 + for (int var7 = 0; var7 < this.verticesCount; ++var7) { + if (var4 == this.verticesX[var7] && var5 == this.verticesY[var7] && var6 == this.verticesZ[var7]) { + var3 = var7; break; } } - if (var3 == -1) { // L: 1033 - this.verticesX[this.verticesCount] = var4; // L: 1034 - this.verticesY[this.verticesCount] = var5; // L: 1035 - this.verticesZ[this.verticesCount] = var6; // L: 1036 + if (var3 == -1) { + this.verticesX[this.verticesCount] = var4; + this.verticesY[this.verticesCount] = var5; + this.verticesZ[this.verticesCount] = var6; if (var1.vertexSkins != null) { - this.vertexSkins[this.verticesCount] = var1.vertexSkins[var2]; // L: 1037 + this.vertexSkins[this.verticesCount] = var1.vertexSkins[var2]; } - if (var1.field2185 != null) { // L: 1038 - this.field2185[this.verticesCount] = var1.field2185[var2]; // L: 1039 - this.field2173[this.verticesCount] = var1.field2173[var2]; // L: 1040 + if (var1.field2185 != null) { + this.field2185[this.verticesCount] = var1.field2185[var2]; + this.field2173[this.verticesCount] = var1.field2173[var2]; } - var3 = this.verticesCount++; // L: 1042 + var3 = this.verticesCount++; } - return var3; // L: 1044 + return var3; } @ObfuscatedName("v") @@ -1641,43 +1641,43 @@ public class ModelData extends Renderable { descriptor = "()Lge;" ) public ModelData method3751() { - ModelData var1 = new ModelData(); // L: 1112 - if (this.faceRenderTypes != null) { // L: 1113 - var1.faceRenderTypes = new byte[this.faceCount]; // L: 1114 + ModelData var1 = new ModelData(); + if (this.faceRenderTypes != null) { + var1.faceRenderTypes = new byte[this.faceCount]; - for (int var2 = 0; var2 < this.faceCount; ++var2) { // L: 1115 + for (int var2 = 0; var2 < this.faceCount; ++var2) { var1.faceRenderTypes[var2] = this.faceRenderTypes[var2]; } } - var1.verticesCount = this.verticesCount; // L: 1117 - var1.faceCount = this.faceCount; // L: 1118 - var1.textureTriangleCount = this.textureTriangleCount; // L: 1119 - var1.verticesX = this.verticesX; // L: 1120 - var1.verticesY = this.verticesY; // L: 1121 - var1.verticesZ = this.verticesZ; // L: 1122 - var1.indices1 = this.indices1; // L: 1123 - var1.indices2 = this.indices2; // L: 1124 - var1.indices3 = this.indices3; // L: 1125 - var1.faceRenderPriorities = this.faceRenderPriorities; // L: 1126 - var1.faceAlphas = this.faceAlphas; // L: 1127 - var1.textureCoords = this.textureCoords; // L: 1128 - var1.faceColors = this.faceColors; // L: 1129 - var1.faceTextures = this.faceTextures; // L: 1130 - var1.priority = this.priority; // L: 1131 - var1.textureRenderTypes = this.textureRenderTypes; // L: 1132 - var1.texTriangleX = this.texTriangleX; // L: 1133 - var1.texTriangleY = this.texTriangleY; // L: 1134 - var1.texTriangleZ = this.texTriangleZ; // L: 1135 - var1.vertexSkins = this.vertexSkins; // L: 1136 - var1.faceSkins = this.faceSkins; // L: 1137 - var1.vertexLabels = this.vertexLabels; // L: 1138 - var1.faceLabelsAlpha = this.faceLabelsAlpha; // L: 1139 - var1.vertexNormals = this.vertexNormals; // L: 1140 - var1.faceNormals = this.faceNormals; // L: 1141 - var1.ambient = this.ambient; // L: 1142 - var1.contrast = this.contrast; // L: 1143 - return var1; // L: 1144 + var1.verticesCount = this.verticesCount; + var1.faceCount = this.faceCount; + var1.textureTriangleCount = this.textureTriangleCount; + var1.verticesX = this.verticesX; + var1.verticesY = this.verticesY; + var1.verticesZ = this.verticesZ; + var1.indices1 = this.indices1; + var1.indices2 = this.indices2; + var1.indices3 = this.indices3; + var1.faceRenderPriorities = this.faceRenderPriorities; + var1.faceAlphas = this.faceAlphas; + var1.textureCoords = this.textureCoords; + var1.faceColors = this.faceColors; + var1.faceTextures = this.faceTextures; + var1.priority = this.priority; + var1.textureRenderTypes = this.textureRenderTypes; + var1.texTriangleX = this.texTriangleX; + var1.texTriangleY = this.texTriangleY; + var1.texTriangleZ = this.texTriangleZ; + var1.vertexSkins = this.vertexSkins; + var1.faceSkins = this.faceSkins; + var1.vertexLabels = this.vertexLabels; + var1.faceLabelsAlpha = this.faceLabelsAlpha; + var1.vertexNormals = this.vertexNormals; + var1.faceNormals = this.faceNormals; + var1.ambient = this.ambient; + var1.contrast = this.contrast; + return var1; } @ObfuscatedName("d") @@ -1685,46 +1685,46 @@ public class ModelData extends Renderable { descriptor = "([[IIIIZI)Lge;" ) public ModelData method3752(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { - this.calculateBounds(); // L: 1148 - int var7 = var2 + this.field2176; // L: 1149 - int var8 = var2 + this.field2152; // L: 1150 - int var9 = var4 + this.field2186; // L: 1151 - int var10 = var4 + this.field2168; // 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 - var9 >>= 7; // L: 1156 - var10 = var10 + 127 >> 7; // L: 1157 - if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) { // L: 1158 + this.calculateBounds(); + int var7 = var2 + this.field2176; + int var8 = var2 + this.field2152; + int var9 = var4 + this.field2186; + int var10 = var4 + this.field2168; + if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { + var7 >>= 7; + var8 = var8 + 127 >> 7; + var9 >>= 7; + var10 = var10 + 127 >> 7; + if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) { return this; } else { - ModelData var11 = new ModelData(); // L: 1161 - var11.verticesCount = this.verticesCount; // L: 1162 - var11.faceCount = this.faceCount; // L: 1163 - var11.textureTriangleCount = this.textureTriangleCount; // L: 1164 - var11.verticesX = this.verticesX; // L: 1165 - var11.verticesZ = this.verticesZ; // L: 1166 - var11.indices1 = this.indices1; // L: 1167 - var11.indices2 = this.indices2; // L: 1168 - var11.indices3 = this.indices3; // L: 1169 - var11.faceRenderTypes = this.faceRenderTypes; // L: 1170 - var11.faceRenderPriorities = this.faceRenderPriorities; // L: 1171 - var11.faceAlphas = this.faceAlphas; // L: 1172 - var11.textureCoords = this.textureCoords; // L: 1173 - var11.faceColors = this.faceColors; // L: 1174 - var11.faceTextures = this.faceTextures; // L: 1175 - var11.priority = this.priority; // L: 1176 - var11.textureRenderTypes = this.textureRenderTypes; // L: 1177 - var11.texTriangleX = this.texTriangleX; // L: 1178 - var11.texTriangleY = this.texTriangleY; // L: 1179 - var11.texTriangleZ = this.texTriangleZ; // L: 1180 - var11.vertexSkins = this.vertexSkins; // L: 1181 - var11.faceSkins = this.faceSkins; // L: 1182 - var11.vertexLabels = this.vertexLabels; // L: 1183 - var11.faceLabelsAlpha = this.faceLabelsAlpha; // L: 1184 - var11.ambient = this.ambient; // L: 1185 - var11.contrast = this.contrast; // L: 1186 - var11.verticesY = new int[var11.verticesCount]; // L: 1187 + ModelData var11 = new ModelData(); + var11.verticesCount = this.verticesCount; + var11.faceCount = this.faceCount; + var11.textureTriangleCount = this.textureTriangleCount; + var11.verticesX = this.verticesX; + var11.verticesZ = this.verticesZ; + var11.indices1 = this.indices1; + var11.indices2 = this.indices2; + var11.indices3 = this.indices3; + var11.faceRenderTypes = this.faceRenderTypes; + var11.faceRenderPriorities = this.faceRenderPriorities; + var11.faceAlphas = this.faceAlphas; + var11.textureCoords = this.textureCoords; + var11.faceColors = this.faceColors; + var11.faceTextures = this.faceTextures; + var11.priority = this.priority; + var11.textureRenderTypes = this.textureRenderTypes; + var11.texTriangleX = this.texTriangleX; + var11.texTriangleY = this.texTriangleY; + var11.texTriangleZ = this.texTriangleZ; + var11.vertexSkins = this.vertexSkins; + var11.faceSkins = this.faceSkins; + var11.vertexLabels = this.vertexLabels; + var11.faceLabelsAlpha = this.faceLabelsAlpha; + var11.ambient = this.ambient; + var11.contrast = this.contrast; + var11.verticesY = new int[var11.verticesCount]; int var12; int var13; int var14; @@ -1735,39 +1735,39 @@ public class ModelData extends Renderable { int var19; int var20; int var21; - if (var6 == 0) { // L: 1192 - for (var12 = 0; var12 < var11.verticesCount; ++var12) { // L: 1193 - var13 = var2 + this.verticesX[var12]; // L: 1194 - var14 = var4 + this.verticesZ[var12]; // L: 1195 - var15 = var13 & 127; // L: 1196 - var16 = var14 & 127; // L: 1197 - var17 = var13 >> 7; // L: 1198 - var18 = var14 >> 7; // L: 1199 - var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7; // L: 1200 - var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7; // L: 1201 - var21 = var19 * (128 - var16) + var20 * var16 >> 7; // L: 1202 - var11.verticesY[var12] = var21 + this.verticesY[var12] - var3; // L: 1203 + if (var6 == 0) { + for (var12 = 0; var12 < var11.verticesCount; ++var12) { + var13 = var2 + this.verticesX[var12]; + var14 = var4 + this.verticesZ[var12]; + var15 = var13 & 127; + var16 = var14 & 127; + var17 = var13 >> 7; + var18 = var14 >> 7; + var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7; + var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7; + var21 = var19 * (128 - var16) + var20 * var16 >> 7; + var11.verticesY[var12] = var21 + this.verticesY[var12] - var3; } } else { - for (var12 = 0; var12 < var11.verticesCount; ++var12) { // L: 1207 - var13 = (-this.verticesY[var12] << 16) / super.height; // L: 1208 - if (var13 < var6) { // L: 1209 - var14 = var2 + this.verticesX[var12]; // L: 1210 - var15 = var4 + this.verticesZ[var12]; // L: 1211 - var16 = var14 & 127; // L: 1212 - var17 = var15 & 127; // L: 1213 - var18 = var14 >> 7; // L: 1214 - var19 = var15 >> 7; // L: 1215 - var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7; // L: 1216 - var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7; // L: 1217 - int var22 = var20 * (128 - var17) + var21 * var17 >> 7; // L: 1218 - var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12]; // L: 1219 + for (var12 = 0; var12 < var11.verticesCount; ++var12) { + var13 = (-this.verticesY[var12] << 16) / super.height; + if (var13 < var6) { + var14 = var2 + this.verticesX[var12]; + var15 = var4 + this.verticesZ[var12]; + var16 = var14 & 127; + var17 = var15 & 127; + var18 = var14 >> 7; + var19 = var15 >> 7; + var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7; + var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7; + int var22 = var20 * (128 - var17) + var21 * var17 >> 7; + var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12]; } } } - var11.invalidate(); // L: 1223 - return var11; // L: 1224 + var11.invalidate(); + return var11; } } else { return this; @@ -1781,301 +1781,301 @@ public class ModelData extends Renderable { int var10002; int var3; int var4; - if (this.vertexSkins != null) { // L: 1228 - var1 = new int[256]; // L: 1229 - var2 = 0; // L: 1230 + if (this.vertexSkins != null) { + var1 = new int[256]; + var2 = 0; - for (var3 = 0; var3 < this.verticesCount; ++var3) { // L: 1231 - var4 = this.vertexSkins[var3]; // L: 1232 - var10002 = var1[var4]++; // L: 1233 - if (var4 > var2) { // L: 1234 + for (var3 = 0; var3 < this.verticesCount; ++var3) { + var4 = this.vertexSkins[var3]; + var10002 = var1[var4]++; + if (var4 > var2) { var2 = var4; } } - this.vertexLabels = new int[var2 + 1][]; // L: 1236 + this.vertexLabels = new int[var2 + 1][]; - for (var3 = 0; var3 <= var2; ++var3) { // L: 1237 - this.vertexLabels[var3] = new int[var1[var3]]; // L: 1238 - var1[var3] = 0; // L: 1239 + for (var3 = 0; var3 <= var2; ++var3) { + this.vertexLabels[var3] = new int[var1[var3]]; + var1[var3] = 0; } - for (var3 = 0; var3 < this.verticesCount; this.vertexLabels[var4][var1[var4]++] = var3++) { // L: 1241 1243 - var4 = this.vertexSkins[var3]; // L: 1242 + for (var3 = 0; var3 < this.verticesCount; this.vertexLabels[var4][var1[var4]++] = var3++) { + var4 = this.vertexSkins[var3]; } - this.vertexSkins = null; // L: 1245 + this.vertexSkins = null; } - if (this.faceSkins != null) { // L: 1247 - var1 = new int[256]; // L: 1248 - var2 = 0; // L: 1249 + if (this.faceSkins != null) { + var1 = new int[256]; + var2 = 0; - for (var3 = 0; var3 < this.faceCount; ++var3) { // L: 1250 - var4 = this.faceSkins[var3]; // L: 1251 - var10002 = var1[var4]++; // L: 1252 - if (var4 > var2) { // L: 1253 + for (var3 = 0; var3 < this.faceCount; ++var3) { + var4 = this.faceSkins[var3]; + var10002 = var1[var4]++; + if (var4 > var2) { var2 = var4; } } - this.faceLabelsAlpha = new int[var2 + 1][]; // L: 1255 + this.faceLabelsAlpha = new int[var2 + 1][]; - for (var3 = 0; var3 <= var2; ++var3) { // L: 1256 - this.faceLabelsAlpha[var3] = new int[var1[var3]]; // L: 1257 - var1[var3] = 0; // L: 1258 + for (var3 = 0; var3 <= var2; ++var3) { + this.faceLabelsAlpha[var3] = new int[var1[var3]]; + var1[var3] = 0; } - for (var3 = 0; var3 < this.faceCount; this.faceLabelsAlpha[var4][var1[var4]++] = var3++) { // L: 1260 1262 - var4 = this.faceSkins[var3]; // L: 1261 + for (var3 = 0; var3 < this.faceCount; this.faceLabelsAlpha[var4][var1[var4]++] = var3++) { + var4 = this.faceSkins[var3]; } - this.faceSkins = null; // L: 1264 + this.faceSkins = null; } - } // L: 1266 + } @ObfuscatedName("g") public void method3754() { - 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 - this.verticesZ[var1] = -var2; // L: 1272 + for (int var1 = 0; var1 < this.verticesCount; ++var1) { + int var2 = this.verticesX[var1]; + this.verticesX[var1] = this.verticesZ[var1]; + this.verticesZ[var1] = -var2; } - this.invalidate(); // L: 1274 - } // L: 1275 + this.invalidate(); + } @ObfuscatedName("e") public void method3755() { - 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 + for (int var1 = 0; var1 < this.verticesCount; ++var1) { + this.verticesX[var1] = -this.verticesX[var1]; + this.verticesZ[var1] = -this.verticesZ[var1]; } - this.invalidate(); // L: 1282 - } // L: 1283 + this.invalidate(); + } @ObfuscatedName("a") public void method3756() { - 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 - this.verticesX[var1] = -var2; // L: 1289 + for (int var1 = 0; var1 < this.verticesCount; ++var1) { + int var2 = this.verticesZ[var1]; + this.verticesZ[var1] = this.verticesX[var1]; + this.verticesX[var1] = -var2; } - this.invalidate(); // L: 1291 - } // L: 1292 + this.invalidate(); + } @ObfuscatedName("u") public void method3757(int var1) { - int var2 = ModelData_sine[var1]; // L: 1295 - int var3 = ModelData_cosine[var1]; // L: 1296 + int var2 = ModelData_sine[var1]; + int var3 = ModelData_cosine[var1]; - for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 1297 - int var5 = var2 * this.verticesZ[var4] + var3 * this.verticesX[var4] >> 16; // L: 1298 - this.verticesZ[var4] = var3 * this.verticesZ[var4] - var2 * this.verticesX[var4] >> 16; // L: 1299 - this.verticesX[var4] = var5; // L: 1300 + for (int var4 = 0; var4 < this.verticesCount; ++var4) { + int var5 = var2 * this.verticesZ[var4] + var3 * this.verticesX[var4] >> 16; + this.verticesZ[var4] = var3 * this.verticesZ[var4] - var2 * this.verticesX[var4] >> 16; + this.verticesX[var4] = var5; } - this.invalidate(); // L: 1302 - } // L: 1303 + this.invalidate(); + } @ObfuscatedName("k") @Export("changeOffset") public void changeOffset(int var1, int var2, int var3) { - for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 1306 - int[] var10000 = this.verticesX; // L: 1307 + for (int var4 = 0; var4 < this.verticesCount; ++var4) { + int[] var10000 = this.verticesX; var10000[var4] += var1; - var10000 = this.verticesY; // L: 1308 + var10000 = this.verticesY; var10000[var4] += var2; - var10000 = this.verticesZ; // L: 1309 + var10000 = this.verticesZ; var10000[var4] += var3; } - this.invalidate(); // L: 1311 - } // L: 1312 + this.invalidate(); + } @ObfuscatedName("f") @Export("recolor") public void recolor(short var1, short var2) { - for (int var3 = 0; var3 < this.faceCount; ++var3) { // L: 1315 - if (this.faceColors[var3] == var1) { // L: 1316 + for (int var3 = 0; var3 < this.faceCount; ++var3) { + if (this.faceColors[var3] == var1) { this.faceColors[var3] = var2; } } - } // L: 1318 + } @ObfuscatedName("l") @Export("retexture") public void retexture(short var1, short var2) { - if (this.faceTextures != null) { // L: 1321 - for (int var3 = 0; var3 < this.faceCount; ++var3) { // L: 1322 + if (this.faceTextures != null) { + for (int var3 = 0; var3 < this.faceCount; ++var3) { if (this.faceTextures[var3] == var1) { - this.faceTextures[var3] = var2; // L: 1323 + this.faceTextures[var3] = var2; } } } - } // L: 1325 + } @ObfuscatedName("q") public void method3761() { int var1; - for (var1 = 0; var1 < this.verticesCount; ++var1) { // L: 1328 + for (var1 = 0; var1 < this.verticesCount; ++var1) { this.verticesZ[var1] = -this.verticesZ[var1]; } - for (var1 = 0; var1 < this.faceCount; ++var1) { // L: 1329 - int var2 = this.indices1[var1]; // L: 1330 - this.indices1[var1] = this.indices3[var1]; // L: 1331 - this.indices3[var1] = var2; // L: 1332 + for (var1 = 0; var1 < this.faceCount; ++var1) { + int var2 = this.indices1[var1]; + this.indices1[var1] = this.indices3[var1]; + this.indices3[var1] = var2; } - this.invalidate(); // L: 1334 - } // L: 1335 + this.invalidate(); + } @ObfuscatedName("x") @Export("resize") public void resize(int var1, int var2, int var3) { - for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 1338 - this.verticesX[var4] = this.verticesX[var4] * var1 / 128; // L: 1339 - this.verticesY[var4] = var2 * this.verticesY[var4] / 128; // L: 1340 - this.verticesZ[var4] = var3 * this.verticesZ[var4] / 128; // L: 1341 + for (int var4 = 0; var4 < this.verticesCount; ++var4) { + this.verticesX[var4] = this.verticesX[var4] * var1 / 128; + this.verticesY[var4] = var2 * this.verticesY[var4] / 128; + this.verticesZ[var4] = var3 * this.verticesZ[var4] / 128; } - this.invalidate(); // L: 1343 - } // L: 1344 + this.invalidate(); + } @ObfuscatedName("z") @Export("calculateVertexNormals") public void calculateVertexNormals() { - if (this.vertexNormals == null) { // L: 1347 - this.vertexNormals = new VertexNormal[this.verticesCount]; // L: 1348 + if (this.vertexNormals == null) { + this.vertexNormals = new VertexNormal[this.verticesCount]; int var1; - for (var1 = 0; var1 < this.verticesCount; ++var1) { // L: 1349 + for (var1 = 0; var1 < this.verticesCount; ++var1) { this.vertexNormals[var1] = new VertexNormal(); } - for (var1 = 0; var1 < this.faceCount; ++var1) { // L: 1350 - int var2 = this.indices1[var1]; // L: 1351 - int var3 = this.indices2[var1]; // L: 1352 - int var4 = this.indices3[var1]; // L: 1353 - int var5 = this.verticesX[var3] - this.verticesX[var2]; // L: 1354 - int var6 = this.verticesY[var3] - this.verticesY[var2]; // L: 1355 - int var7 = this.verticesZ[var3] - this.verticesZ[var2]; // L: 1356 - int var8 = this.verticesX[var4] - this.verticesX[var2]; // L: 1357 - int var9 = this.verticesY[var4] - this.verticesY[var2]; // L: 1358 - int var10 = this.verticesZ[var4] - this.verticesZ[var2]; // L: 1359 - int var11 = var6 * var10 - var9 * var7; // L: 1360 - int var12 = var7 * var8 - var10 * var5; // L: 1361 + for (var1 = 0; var1 < this.faceCount; ++var1) { + int var2 = this.indices1[var1]; + int var3 = this.indices2[var1]; + int var4 = this.indices3[var1]; + int var5 = this.verticesX[var3] - this.verticesX[var2]; + int var6 = this.verticesY[var3] - this.verticesY[var2]; + int var7 = this.verticesZ[var3] - this.verticesZ[var2]; + int var8 = this.verticesX[var4] - this.verticesX[var2]; + int var9 = this.verticesY[var4] - this.verticesY[var2]; + int var10 = this.verticesZ[var4] - this.verticesZ[var2]; + int var11 = var6 * var10 - var9 * var7; + int var12 = var7 * var8 - var10 * var5; int var13; - for (var13 = var5 * var9 - var8 * var6; var11 > 8192 || var12 > 8192 || var13 > 8192 || var11 < -8192 || var12 < -8192 || var13 < -8192; var13 >>= 1) { // L: 1362 1363 1366 - var11 >>= 1; // L: 1364 - var12 >>= 1; // L: 1365 + for (var13 = var5 * var9 - var8 * var6; var11 > 8192 || var12 > 8192 || var13 > 8192 || var11 < -8192 || var12 < -8192 || var13 < -8192; var13 >>= 1) { + var11 >>= 1; + var12 >>= 1; } - int var14 = (int)Math.sqrt((double)(var11 * var11 + var12 * var12 + var13 * var13)); // L: 1368 - if (var14 <= 0) { // L: 1369 + int var14 = (int)Math.sqrt((double)(var11 * var11 + var12 * var12 + var13 * var13)); + if (var14 <= 0) { var14 = 1; } - var11 = var11 * 256 / var14; // L: 1370 - var12 = var12 * 256 / var14; // L: 1371 - var13 = var13 * 256 / var14; // L: 1372 + var11 = var11 * 256 / var14; + var12 = var12 * 256 / var14; + var13 = var13 * 256 / var14; byte var15; - if (this.faceRenderTypes == null) { // L: 1374 + if (this.faceRenderTypes == null) { var15 = 0; } else { - var15 = this.faceRenderTypes[var1]; // L: 1375 + var15 = this.faceRenderTypes[var1]; } - if (var15 == 0) { // L: 1376 - VertexNormal var16 = this.vertexNormals[var2]; // L: 1378 - var16.x += var11; // L: 1379 - var16.y += var12; // L: 1380 - var16.z += var13; // L: 1381 - ++var16.magnitude; // L: 1382 - var16 = this.vertexNormals[var3]; // L: 1383 - var16.x += var11; // L: 1384 - var16.y += var12; // L: 1385 - var16.z += var13; // L: 1386 - ++var16.magnitude; // L: 1387 - var16 = this.vertexNormals[var4]; // L: 1388 - var16.x += var11; // L: 1389 - var16.y += var12; // L: 1390 - var16.z += var13; // L: 1391 - ++var16.magnitude; // L: 1392 - } else if (var15 == 1) { // L: 1394 - if (this.faceNormals == null) { // L: 1395 + if (var15 == 0) { + VertexNormal var16 = this.vertexNormals[var2]; + var16.x += var11; + var16.y += var12; + var16.z += var13; + ++var16.magnitude; + var16 = this.vertexNormals[var3]; + var16.x += var11; + var16.y += var12; + var16.z += var13; + ++var16.magnitude; + var16 = this.vertexNormals[var4]; + var16.x += var11; + var16.y += var12; + var16.z += var13; + ++var16.magnitude; + } else if (var15 == 1) { + if (this.faceNormals == null) { this.faceNormals = new FaceNormal[this.faceCount]; } - FaceNormal var17 = this.faceNormals[var1] = new FaceNormal(); // L: 1396 - var17.x = var11; // L: 1397 - var17.y = var12; // L: 1398 - var17.z = var13; // L: 1399 + FaceNormal var17 = this.faceNormals[var1] = new FaceNormal(); + var17.x = var11; + var17.y = var12; + var17.z = var13; } } } - } // L: 1402 + } @ObfuscatedName("i") @Export("invalidate") void invalidate() { - this.vertexNormals = null; // L: 1405 - this.vertexVertices = null; // L: 1406 - this.faceNormals = null; // L: 1407 - this.isBoundsCalculated = false; // L: 1408 - } // L: 1409 + this.vertexNormals = null; + this.vertexVertices = null; + this.faceNormals = null; + this.isBoundsCalculated = false; + } @ObfuscatedName("y") @Export("calculateBounds") void calculateBounds() { - if (!this.isBoundsCalculated) { // L: 1412 - super.height = 0; // L: 1413 - this.field2182 = 0; // L: 1414 - this.field2176 = 999999; // L: 1415 - this.field2152 = -999999; // L: 1416 - this.field2168 = -99999; // L: 1417 - this.field2186 = 99999; // L: 1418 + if (!this.isBoundsCalculated) { + super.height = 0; + this.field2182 = 0; + this.field2176 = 999999; + this.field2152 = -999999; + this.field2168 = -99999; + this.field2186 = 99999; - 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.field2176) { // L: 1423 + for (int var1 = 0; var1 < this.verticesCount; ++var1) { + int var2 = this.verticesX[var1]; + int var3 = this.verticesY[var1]; + int var4 = this.verticesZ[var1]; + if (var2 < this.field2176) { this.field2176 = var2; } - if (var2 > this.field2152) { // L: 1424 + if (var2 > this.field2152) { this.field2152 = var2; } - if (var4 < this.field2186) { // L: 1425 + if (var4 < this.field2186) { this.field2186 = var4; } - if (var4 > this.field2168) { // L: 1426 + if (var4 > this.field2168) { this.field2168 = var4; } - if (-var3 > super.height) { // L: 1427 + if (-var3 > super.height) { super.height = -var3; } - if (var3 > this.field2182) { // L: 1428 + if (var3 > this.field2182) { this.field2182 = var3; } } - this.isBoundsCalculated = true; // L: 1430 + this.isBoundsCalculated = true; } - } // L: 1431 + } @ObfuscatedName("ao") @ObfuscatedSignature( @@ -2083,187 +2083,187 @@ public class ModelData extends Renderable { ) @Export("toModel") public final Model toModel(int var1, int var2, int var3, int var4, int var5) { - this.calculateVertexNormals(); // L: 1490 - int var6 = (int)Math.sqrt((double)(var5 * var5 + var3 * var3 + var4 * var4)); // L: 1491 - int var7 = var6 * var2 >> 8; // L: 1492 - Model var8 = new Model(); // L: 1493 - var8.faceColors1 = new int[this.faceCount]; // L: 1494 - var8.faceColors2 = new int[this.faceCount]; // L: 1495 - var8.faceColors3 = new int[this.faceCount]; // L: 1496 - if (this.textureTriangleCount > 0 && this.textureCoords != null) { // L: 1497 - int[] var9 = new int[this.textureTriangleCount]; // L: 1498 + this.calculateVertexNormals(); + int var6 = (int)Math.sqrt((double)(var5 * var5 + var3 * var3 + var4 * var4)); + int var7 = var6 * var2 >> 8; + Model var8 = new Model(); + var8.faceColors1 = new int[this.faceCount]; + var8.faceColors2 = new int[this.faceCount]; + var8.faceColors3 = new int[this.faceCount]; + if (this.textureTriangleCount > 0 && this.textureCoords != null) { + int[] var9 = new int[this.textureTriangleCount]; int var10; - for (var10 = 0; var10 < this.faceCount; ++var10) { // L: 1499 - if (this.textureCoords[var10] != -1) { // L: 1500 + for (var10 = 0; var10 < this.faceCount; ++var10) { + if (this.textureCoords[var10] != -1) { ++var9[this.textureCoords[var10] & 255]; } } - var8.field2442 = 0; // L: 1502 + var8.field2442 = 0; - for (var10 = 0; var10 < this.textureTriangleCount; ++var10) { // L: 1503 - if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) { // L: 1504 + for (var10 = 0; var10 < this.textureTriangleCount; ++var10) { + if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) { ++var8.field2442; } } - var8.field2443 = new int[var8.field2442]; // L: 1506 - var8.field2471 = new int[var8.field2442]; // L: 1507 - var8.field2445 = new int[var8.field2442]; // L: 1508 - var10 = 0; // L: 1509 + var8.field2443 = new int[var8.field2442]; + var8.field2471 = new int[var8.field2442]; + var8.field2445 = new int[var8.field2442]; + var10 = 0; int var11; - for (var11 = 0; var11 < this.textureTriangleCount; ++var11) { // L: 1510 - if (var9[var11] > 0 && this.textureRenderTypes[var11] == 0) { // L: 1511 - var8.field2443[var10] = this.texTriangleX[var11] & '\uffff'; // L: 1512 - var8.field2471[var10] = this.texTriangleY[var11] & '\uffff'; // L: 1513 - var8.field2445[var10] = this.texTriangleZ[var11] & '\uffff'; // L: 1514 - var9[var11] = var10++; // L: 1515 + for (var11 = 0; var11 < this.textureTriangleCount; ++var11) { + if (var9[var11] > 0 && this.textureRenderTypes[var11] == 0) { + var8.field2443[var10] = this.texTriangleX[var11] & '\uffff'; + var8.field2471[var10] = this.texTriangleY[var11] & '\uffff'; + var8.field2445[var10] = this.texTriangleZ[var11] & '\uffff'; + var9[var11] = var10++; } else { - var9[var11] = -1; // L: 1517 + var9[var11] = -1; } } - var8.field2439 = new byte[this.faceCount]; // L: 1519 + var8.field2439 = new byte[this.faceCount]; - for (var11 = 0; var11 < this.faceCount; ++var11) { // L: 1520 - if (this.textureCoords[var11] != -1) { // L: 1521 + for (var11 = 0; var11 < this.faceCount; ++var11) { + if (this.textureCoords[var11] != -1) { var8.field2439[var11] = (byte)var9[this.textureCoords[var11] & 255]; } else { - var8.field2439[var11] = -1; // L: 1522 + var8.field2439[var11] = -1; } } } - for (int var16 = 0; var16 < this.faceCount; ++var16) { // L: 1525 + for (int var16 = 0; var16 < this.faceCount; ++var16) { byte var17; - if (this.faceRenderTypes == null) { // L: 1527 + if (this.faceRenderTypes == null) { var17 = 0; } else { - var17 = this.faceRenderTypes[var16]; // L: 1528 + var17 = this.faceRenderTypes[var16]; } byte var18; - if (this.faceAlphas == null) { // L: 1530 + if (this.faceAlphas == null) { var18 = 0; } else { - var18 = this.faceAlphas[var16]; // L: 1531 + var18 = this.faceAlphas[var16]; } short var12; - if (this.faceTextures == null) { // L: 1533 + if (this.faceTextures == null) { var12 = -1; } else { - var12 = this.faceTextures[var16]; // L: 1534 + var12 = this.faceTextures[var16]; } - if (var18 == -2) { // L: 1535 + if (var18 == -2) { var17 = 3; } - if (var18 == -1) { // L: 1536 + if (var18 == -1) { var17 = 2; } VertexNormal var13; int var14; FaceNormal var19; - if (var12 == -1) { // L: 1537 - if (var17 != 0) { // L: 1538 - 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] = method3767(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 - var8.faceColors3[var16] = -1; // L: 1563 + if (var12 == -1) { + if (var17 != 0) { + if (var17 == 1) { + var19 = this.faceNormals[var16]; + var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; + var8.faceColors1[var16] = method3767(this.faceColors[var16] & '\uffff', var14); + var8.faceColors3[var16] = -1; + } else if (var17 == 3) { + var8.faceColors1[var16] = 128; + var8.faceColors3[var16] = -1; } else { - var8.faceColors3[var16] = -2; // L: 1566 + var8.faceColors3[var16] = -2; } } else { - int var15 = this.faceColors[var16] & '\uffff'; // L: 1541 - if (this.vertexVertices != null && this.vertexVertices[this.indices1[var16]] != null) { // L: 1542 + int var15 = this.faceColors[var16] & '\uffff'; + if (this.vertexVertices != null && this.vertexVertices[this.indices1[var16]] != null) { var13 = this.vertexVertices[this.indices1[var16]]; } else { - var13 = this.vertexNormals[this.indices1[var16]]; // L: 1543 + var13 = this.vertexNormals[this.indices1[var16]]; } - var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1544 - var8.faceColors1[var16] = method3767(var15, var14); // L: 1545 - if (this.vertexVertices != null && this.vertexVertices[this.indices2[var16]] != null) { // L: 1546 + var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; + var8.faceColors1[var16] = method3767(var15, var14); + if (this.vertexVertices != null && this.vertexVertices[this.indices2[var16]] != null) { var13 = this.vertexVertices[this.indices2[var16]]; } else { - var13 = this.vertexNormals[this.indices2[var16]]; // L: 1547 + var13 = this.vertexNormals[this.indices2[var16]]; } - var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1548 - var8.faceColors2[var16] = method3767(var15, var14); // L: 1549 - if (this.vertexVertices != null && this.vertexVertices[this.indices3[var16]] != null) { // L: 1550 + var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; + var8.faceColors2[var16] = method3767(var15, var14); + if (this.vertexVertices != null && this.vertexVertices[this.indices3[var16]] != null) { var13 = this.vertexVertices[this.indices3[var16]]; } else { - var13 = this.vertexNormals[this.indices3[var16]]; // L: 1551 + var13 = this.vertexNormals[this.indices3[var16]]; } - var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1552 - var8.faceColors3[var16] = method3767(var15, var14); // L: 1553 + var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; + var8.faceColors3[var16] = method3767(var15, var14); } - } 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] = method3768(var14); // L: 1589 - var8.faceColors3[var16] = -1; // L: 1590 + } else if (var17 != 0) { + if (var17 == 1) { + var19 = this.faceNormals[var16]; + var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; + var8.faceColors1[var16] = method3768(var14); + var8.faceColors3[var16] = -1; } else { - var8.faceColors3[var16] = -2; // L: 1593 + var8.faceColors3[var16] = -2; } } else { - if (this.vertexVertices != null && this.vertexVertices[this.indices1[var16]] != null) { // L: 1573 + if (this.vertexVertices != null && this.vertexVertices[this.indices1[var16]] != null) { var13 = this.vertexVertices[this.indices1[var16]]; } else { - var13 = this.vertexNormals[this.indices1[var16]]; // L: 1574 + var13 = this.vertexNormals[this.indices1[var16]]; } - var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1575 - var8.faceColors1[var16] = method3768(var14); // L: 1576 - if (this.vertexVertices != null && this.vertexVertices[this.indices2[var16]] != null) { // L: 1577 + var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; + var8.faceColors1[var16] = method3768(var14); + if (this.vertexVertices != null && this.vertexVertices[this.indices2[var16]] != null) { var13 = this.vertexVertices[this.indices2[var16]]; } else { - var13 = this.vertexNormals[this.indices2[var16]]; // L: 1578 + var13 = this.vertexNormals[this.indices2[var16]]; } - var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1579 - var8.faceColors2[var16] = method3768(var14); // L: 1580 + var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; + var8.faceColors2[var16] = method3768(var14); if (this.vertexVertices != null && this.vertexVertices[this.indices3[var16]] != null) { - var13 = this.vertexVertices[this.indices3[var16]]; // L: 1581 + var13 = this.vertexVertices[this.indices3[var16]]; } else { - var13 = this.vertexNormals[this.indices3[var16]]; // L: 1582 + var13 = this.vertexNormals[this.indices3[var16]]; } - var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1583 - var8.faceColors3[var16] = method3768(var14); // L: 1584 + var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; + var8.faceColors3[var16] = method3768(var14); } } - this.method3753(); // L: 1597 - var8.verticesCount = this.verticesCount; // L: 1598 - var8.verticesX = this.verticesX; // L: 1599 - var8.verticesY = this.verticesY; // L: 1600 - var8.verticesZ = this.verticesZ; // L: 1601 - var8.indicesCount = this.faceCount; // L: 1602 - var8.indices1 = this.indices1; // L: 1603 - var8.indices2 = this.indices2; // L: 1604 - var8.indices3 = this.indices3; // L: 1605 - var8.faceRenderPriorities = this.faceRenderPriorities; // L: 1606 - var8.faceAlphas = this.faceAlphas; // L: 1607 - var8.field2444 = this.priority; // L: 1608 - var8.vertexLabels = this.vertexLabels; // L: 1609 - var8.faceLabelsAlpha = this.faceLabelsAlpha; // L: 1610 - var8.faceTextures = this.faceTextures; // L: 1611 - var8.field2448 = this.field2185; // L: 1612 - var8.field2449 = this.field2173; // L: 1613 - return var8; // L: 1614 + this.method3753(); + var8.verticesCount = this.verticesCount; + var8.verticesX = this.verticesX; + var8.verticesY = this.verticesY; + var8.verticesZ = this.verticesZ; + var8.indicesCount = this.faceCount; + var8.indices1 = this.indices1; + var8.indices2 = this.indices2; + var8.indices3 = this.indices3; + var8.faceRenderPriorities = this.faceRenderPriorities; + var8.faceAlphas = this.faceAlphas; + var8.field2444 = this.priority; + var8.vertexLabels = this.vertexLabels; + var8.faceLabelsAlpha = this.faceLabelsAlpha; + var8.faceTextures = this.faceTextures; + var8.field2448 = this.field2185; + var8.field2449 = this.field2173; + return var8; } @ObfuscatedName("c") @@ -2272,8 +2272,8 @@ public class ModelData extends Renderable { ) @Export("ModelData_get") public static ModelData ModelData_get(AbstractArchive var0, int var1, int var2) { - byte[] var3 = var0.takeFile(var1, var2); // L: 58 - return var3 == null ? null : new ModelData(var3); // L: 59 + byte[] var3 = var0.takeFile(var1, var2); + return var3 == null ? null : new ModelData(var3); } @ObfuscatedName("ah") @@ -2281,57 +2281,57 @@ public class ModelData extends Renderable { descriptor = "(Lge;Lge;IIIZ)V" ) static void method3812(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 - ++field2189; // L: 1438 - int var6 = 0; // L: 1439 - int[] var7 = var1.verticesX; // L: 1440 - int var8 = var1.verticesCount; // L: 1441 + var0.calculateBounds(); + var0.calculateVertexNormals(); + var1.calculateBounds(); + var1.calculateVertexNormals(); + ++field2189; + int var6 = 0; + int[] var7 = var1.verticesX; + int var8 = var1.verticesCount; int var9; - for (var9 = 0; var9 < var0.verticesCount; ++var9) { // L: 1442 - VertexNormal var10 = var0.vertexNormals[var9]; // L: 1443 - if (var10.magnitude != 0) { // L: 1444 - int var11 = var0.verticesY[var9] - var3; // L: 1445 - if (var11 <= var1.field2182) { // L: 1446 - int var12 = var0.verticesX[var9] - var2; // L: 1447 - if (var12 >= var1.field2176 && var12 <= var1.field2152) { // L: 1448 - int var13 = var0.verticesZ[var9] - var4; // L: 1449 - if (var13 >= var1.field2186 && var13 <= var1.field2168) { // 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 - if (var0.vertexVertices == null) { // L: 1454 + for (var9 = 0; var9 < var0.verticesCount; ++var9) { + VertexNormal var10 = var0.vertexNormals[var9]; + if (var10.magnitude != 0) { + int var11 = var0.verticesY[var9] - var3; + if (var11 <= var1.field2182) { + int var12 = var0.verticesX[var9] - var2; + if (var12 >= var1.field2176 && var12 <= var1.field2152) { + int var13 = var0.verticesZ[var9] - var4; + if (var13 >= var1.field2186 && var13 <= var1.field2168) { + for (int var14 = 0; var14 < var8; ++var14) { + VertexNormal var15 = var1.vertexNormals[var14]; + if (var12 == var7[var14] && var13 == var1.verticesZ[var14] && var11 == var1.verticesY[var14] && var15.magnitude != 0) { + if (var0.vertexVertices == null) { var0.vertexVertices = new VertexNormal[var0.verticesCount]; } - if (var1.vertexVertices == null) { // L: 1455 + if (var1.vertexVertices == null) { var1.vertexVertices = new VertexNormal[var8]; } - VertexNormal var16 = var0.vertexVertices[var9]; // L: 1456 - if (var16 == null) { // L: 1457 + VertexNormal var16 = var0.vertexVertices[var9]; + if (var16 == null) { var16 = var0.vertexVertices[var9] = new VertexNormal(var10); } - VertexNormal var17 = var1.vertexVertices[var14]; // L: 1458 + VertexNormal var17 = var1.vertexVertices[var14]; if (var17 == null) { - var17 = var1.vertexVertices[var14] = new VertexNormal(var15); // L: 1459 + var17 = var1.vertexVertices[var14] = new VertexNormal(var15); } - var16.x += var15.x; // L: 1460 - var16.y += var15.y; // L: 1461 - var16.z += var15.z; // L: 1462 - var16.magnitude += var15.magnitude; // L: 1463 - var17.x += var10.x; // L: 1464 - var17.y += var10.y; // L: 1465 - var17.z += var10.z; // L: 1466 - var17.magnitude += var10.magnitude; // L: 1467 - ++var6; // L: 1468 - field2187[var9] = field2189; // L: 1469 - field2188[var14] = field2189; // L: 1470 + var16.x += var15.x; + var16.y += var15.y; + var16.z += var15.z; + var16.magnitude += var15.magnitude; + var17.x += var10.x; + var17.y += var10.y; + var17.z += var10.z; + var17.magnitude += var10.magnitude; + ++var6; + field2187[var9] = field2189; + field2188[var14] = field2189; } } } @@ -2340,50 +2340,50 @@ public class ModelData extends Renderable { } } - if (var6 >= 3 && var5) { // L: 1474 - for (var9 = 0; var9 < var0.faceCount; ++var9) { // L: 1475 - if (field2187[var0.indices1[var9]] == field2189 && field2187[var0.indices2[var9]] == field2189 && field2187[var0.indices3[var9]] == field2189) { // L: 1476 - if (var0.faceRenderTypes == null) { // L: 1477 + if (var6 >= 3 && var5) { + for (var9 = 0; var9 < var0.faceCount; ++var9) { + if (field2187[var0.indices1[var9]] == field2189 && field2187[var0.indices2[var9]] == field2189 && field2187[var0.indices3[var9]] == field2189) { + if (var0.faceRenderTypes == null) { var0.faceRenderTypes = new byte[var0.faceCount]; } - var0.faceRenderTypes[var9] = 2; // L: 1478 + var0.faceRenderTypes[var9] = 2; } } - for (var9 = 0; var9 < var1.faceCount; ++var9) { // L: 1481 - if (field2189 == field2188[var1.indices1[var9]] && field2189 == field2188[var1.indices2[var9]] && field2189 == field2188[var1.indices3[var9]]) { // L: 1482 - if (var1.faceRenderTypes == null) { // L: 1483 + for (var9 = 0; var9 < var1.faceCount; ++var9) { + if (field2189 == field2188[var1.indices1[var9]] && field2189 == field2188[var1.indices2[var9]] && field2189 == field2188[var1.indices3[var9]]) { + if (var1.faceRenderTypes == null) { var1.faceRenderTypes = new byte[var1.faceCount]; } - var1.faceRenderTypes[var9] = 2; // L: 1484 + var1.faceRenderTypes[var9] = 2; } } } - } // L: 1487 + } @ObfuscatedName("ab") static final int method3767(int var0, int var1) { - var1 = (var0 & 127) * var1 >> 7; // L: 1618 - if (var1 < 2) { // L: 1619 + var1 = (var0 & 127) * var1 >> 7; + if (var1 < 2) { var1 = 2; - } else if (var1 > 126) { // L: 1620 + } else if (var1 > 126) { var1 = 126; } - return (var0 & 65408) + var1; // L: 1621 + return (var0 & 65408) + var1; } @ObfuscatedName("an") static final int method3768(int var0) { - if (var0 < 2) { // L: 1625 + if (var0 < 2) { var0 = 2; } else if (var0 > 126) { - var0 = 126; // L: 1626 + var0 = 126; } - return var0; // L: 1627 + return var0; } } diff --git a/runescape-client/src/main/java/ModelData0.java b/runescape-client/src/main/java/ModelData0.java index 38cb0e1ff1..8a3cdd3d63 100644 --- a/runescape-client/src/main/java/ModelData0.java +++ b/runescape-client/src/main/java/ModelData0.java @@ -6,7 +6,7 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("ModelData0") public class ModelData0 { ModelData0() { - } // L: 4 + } @ObfuscatedName("hu") @ObfuscatedSignature( @@ -14,114 +14,114 @@ public class ModelData0 { garbageValue = "190005998" ) static final void method4320(int var0, int var1, boolean var2) { - if (!var2 || var0 != Messages.field1277 || class4.field9 != var1) { // L: 6236 - Messages.field1277 = var0; // L: 6239 - class4.field9 = var1; // L: 6240 - VertexNormal.updateGameState(25); // L: 6241 - ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait.", true); // L: 6242 - int var3 = class131.baseX; // L: 6243 - int var4 = TileItem.baseY; // L: 6244 - class131.baseX = (var0 - 6) * 8; // L: 6245 - TileItem.baseY = (var1 - 6) * 8; // L: 6246 - int var5 = class131.baseX - var3; // L: 6247 - int var6 = TileItem.baseY - var4; // L: 6248 - var3 = class131.baseX; // L: 6249 - var4 = TileItem.baseY; // L: 6250 + if (!var2 || var0 != Messages.field1277 || class4.field9 != var1) { + Messages.field1277 = var0; + class4.field9 = var1; + VertexNormal.updateGameState(25); + ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait.", true); + int var3 = class131.baseX; + int var4 = TileItem.baseY; + class131.baseX = (var0 - 6) * 8; + TileItem.baseY = (var1 - 6) * 8; + int var5 = class131.baseX - var3; + int var6 = TileItem.baseY - var4; + var3 = class131.baseX; + var4 = TileItem.baseY; int var7; int var9; int[] var10000; - for (var7 = 0; var7 < 32768; ++var7) { // L: 6251 - NPC var19 = Client.npcs[var7]; // L: 6252 - if (var19 != null) { // L: 6253 - for (var9 = 0; var9 < 10; ++var9) { // L: 6254 - var10000 = var19.pathX; // L: 6255 + for (var7 = 0; var7 < 32768; ++var7) { + NPC var19 = Client.npcs[var7]; + if (var19 != null) { + for (var9 = 0; var9 < 10; ++var9) { + var10000 = var19.pathX; var10000[var9] -= var5; - var10000 = var19.pathY; // L: 6256 + var10000 = var19.pathY; var10000[var9] -= var6; } - var19.x -= var5 * 128; // L: 6258 - var19.y -= var6 * 128; // L: 6259 + var19.x -= var5 * 128; + var19.y -= var6 * 128; } } - for (var7 = 0; var7 < 2048; ++var7) { // L: 6262 - Player var22 = Client.players[var7]; // L: 6263 - if (var22 != null) { // L: 6264 - for (var9 = 0; var9 < 10; ++var9) { // L: 6265 - var10000 = var22.pathX; // L: 6266 + for (var7 = 0; var7 < 2048; ++var7) { + Player var22 = Client.players[var7]; + if (var22 != null) { + for (var9 = 0; var9 < 10; ++var9) { + var10000 = var22.pathX; var10000[var9] -= var5; - var10000 = var22.pathY; // L: 6267 + var10000 = var22.pathY; var10000[var9] -= var6; } - var22.x -= var5 * 128; // L: 6269 - var22.y -= var6 * 128; // L: 6270 + var22.x -= var5 * 128; + var22.y -= var6 * 128; } } - byte var20 = 0; // L: 6273 - byte var8 = 104; // L: 6274 - byte var21 = 1; // L: 6275 - if (var5 < 0) { // L: 6276 - var20 = 103; // L: 6277 - var8 = -1; // L: 6278 - var21 = -1; // L: 6279 + byte var20 = 0; + byte var8 = 104; + byte var21 = 1; + if (var5 < 0) { + var20 = 103; + var8 = -1; + var21 = -1; } - byte var10 = 0; // L: 6281 - byte var11 = 104; // L: 6282 - byte var12 = 1; // L: 6283 - if (var6 < 0) { // L: 6284 - var10 = 103; // L: 6285 - var11 = -1; // L: 6286 - var12 = -1; // L: 6287 + byte var10 = 0; + byte var11 = 104; + byte var12 = 1; + if (var6 < 0) { + var10 = 103; + var11 = -1; + var12 = -1; } int var14; - for (int var13 = var20; var13 != var8; var13 += var21) { // L: 6289 - for (var14 = var10; var14 != var11; var14 += var12) { // L: 6290 - int var15 = var13 + var5; // L: 6291 - int var16 = var14 + var6; // L: 6292 + for (int var13 = var20; var13 != var8; var13 += var21) { + for (var14 = var10; var14 != var11; var14 += var12) { + int var15 = var13 + var5; + int var16 = var14 + var6; - for (int var17 = 0; var17 < 4; ++var17) { // L: 6293 + for (int var17 = 0; var17 < 4; ++var17) { if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { - Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; // L: 6294 + Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; } else { - Client.groundItems[var17][var13][var14] = null; // L: 6295 + Client.groundItems[var17][var13][var14] = null; } } } } - for (PendingSpawn var18 = (PendingSpawn)Client.pendingSpawns.last(); var18 != null; var18 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 6299 6300 6304 - var18.x -= var5; // L: 6301 - var18.y -= var6; // L: 6302 - if (var18.x < 0 || var18.y < 0 || var18.x >= 104 || var18.y >= 104) { // L: 6303 + for (PendingSpawn var18 = (PendingSpawn)Client.pendingSpawns.last(); var18 != null; var18 = (PendingSpawn)Client.pendingSpawns.previous()) { + var18.x -= var5; + var18.y -= var6; + if (var18.x < 0 || var18.y < 0 || var18.x >= 104 || var18.y >= 104) { var18.remove(); } } - if (Client.destinationX != 0) { // L: 6306 - Client.destinationX -= var5; // L: 6307 - Client.destinationY -= var6; // L: 6308 + if (Client.destinationX != 0) { + Client.destinationX -= var5; + Client.destinationY -= var6; } - Client.soundEffectCount = 0; // L: 6310 - Client.isCameraLocked = false; // L: 6311 - UserComparator7.cameraX -= var5 << 7; // L: 6312 - UserComparator10.cameraZ -= var6 << 7; // L: 6313 - class7.oculusOrbFocalPointX -= var5 << 7; // L: 6314 - Actor.oculusOrbFocalPointY -= var6 << 7; // L: 6315 - Client.field570 = -1; // L: 6316 - Client.graphicsObjects.clear(); // L: 6317 - Client.projectiles.clear(); // L: 6318 + Client.soundEffectCount = 0; + Client.isCameraLocked = false; + UserComparator7.cameraX -= var5 << 7; + UserComparator10.cameraZ -= var6 << 7; + class7.oculusOrbFocalPointX -= var5 << 7; + Actor.oculusOrbFocalPointY -= var6 << 7; + Client.field570 = -1; + Client.graphicsObjects.clear(); + Client.projectiles.clear(); - for (var14 = 0; var14 < 4; ++var14) { // L: 6319 + for (var14 = 0; var14 < 4; ++var14) { Client.collisionMaps[var14].clear(); } } - } // L: 6237 6320 + } } diff --git a/runescape-client/src/main/java/MouseHandler.java b/runescape-client/src/main/java/MouseHandler.java index eb309a5b3b..79397cb4c9 100644 --- a/runescape-client/src/main/java/MouseHandler.java +++ b/runescape-client/src/main/java/MouseHandler.java @@ -127,28 +127,28 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi static int field231; static { - MouseHandler_instance = new MouseHandler(); // L: 15 - MouseHandler_idleCycles = 0; // L: 16 - MouseHandler_currentButtonVolatile = 0; // L: 17 - MouseHandler_xVolatile = -1; // L: 18 - MouseHandler_yVolatile = -1; // L: 19 - MouseHandler_lastMovedVolatile = -1L; // L: 20 - MouseHandler_currentButton = 0; // L: 21 - MouseHandler_x = 0; // L: 22 - MouseHandler_y = 0; // L: 23 - MouseHandler_millis = 0L; // L: 24 - MouseHandler_lastButtonVolatile = 0; // L: 25 - MouseHandler_lastPressedXVolatile = 0; // L: 26 - MouseHandler_lastPressedYVolatile = 0; // L: 27 - MouseHandler_lastPressedTimeMillisVolatile = 0L; // L: 28 - MouseHandler_lastButton = 0; // L: 29 - MouseHandler_lastPressedX = 0; // L: 30 - MouseHandler_lastPressedY = 0; // L: 31 - MouseHandler_lastPressedTimeMillis = 0L; // L: 32 + MouseHandler_instance = new MouseHandler(); + MouseHandler_idleCycles = 0; + MouseHandler_currentButtonVolatile = 0; + MouseHandler_xVolatile = -1; + MouseHandler_yVolatile = -1; + MouseHandler_lastMovedVolatile = -1L; + MouseHandler_currentButton = 0; + MouseHandler_x = 0; + MouseHandler_y = 0; + MouseHandler_millis = 0L; + MouseHandler_lastButtonVolatile = 0; + MouseHandler_lastPressedXVolatile = 0; + MouseHandler_lastPressedYVolatile = 0; + MouseHandler_lastPressedTimeMillisVolatile = 0L; + MouseHandler_lastButton = 0; + MouseHandler_lastPressedX = 0; + MouseHandler_lastPressedY = 0; + MouseHandler_lastPressedTimeMillis = 0L; } MouseHandler() { - } // L: 34 + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -157,88 +157,88 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi ) @Export("getButton") final int getButton(MouseEvent var1) { - int var2 = var1.getButton(); // L: 76 - if (!var1.isAltDown() && var2 != 2) { // L: 77 - return !var1.isMetaDown() && var2 != 3 ? 1 : 2; // L: 78 79 + int var2 = var1.getButton(); + if (!var1.isAltDown() && var2 != 2) { + return !var1.isMetaDown() && var2 != 3 ? 1 : 2; } else { return 4; } } public final synchronized void mouseMoved(MouseEvent var1) { - if (MouseHandler_instance != null) { // L: 124 - MouseHandler_idleCycles = 0; // L: 125 - MouseHandler_xVolatile = var1.getX(); // L: 126 - MouseHandler_yVolatile = var1.getY(); // L: 127 - MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 128 + if (MouseHandler_instance != null) { + MouseHandler_idleCycles = 0; + MouseHandler_xVolatile = var1.getX(); + MouseHandler_yVolatile = var1.getY(); + MouseHandler_lastMovedVolatile = var1.getWhen(); } - } // L: 130 + } public final synchronized void mousePressed(MouseEvent var1) { - if (MouseHandler_instance != null) { // L: 83 - MouseHandler_idleCycles = 0; // L: 84 - MouseHandler_lastPressedXVolatile = var1.getX(); // L: 85 - MouseHandler_lastPressedYVolatile = var1.getY(); // L: 86 - MouseHandler_lastPressedTimeMillisVolatile = Ignored.method6459(); // L: 87 - MouseHandler_lastButtonVolatile = this.getButton(var1); // L: 88 - if (MouseHandler_lastButtonVolatile != 0) { // L: 89 + if (MouseHandler_instance != null) { + MouseHandler_idleCycles = 0; + MouseHandler_lastPressedXVolatile = var1.getX(); + MouseHandler_lastPressedYVolatile = var1.getY(); + MouseHandler_lastPressedTimeMillisVolatile = Ignored.method6459(); + MouseHandler_lastButtonVolatile = this.getButton(var1); + if (MouseHandler_lastButtonVolatile != 0) { MouseHandler_currentButtonVolatile = MouseHandler_lastButtonVolatile; } } - if (var1.isPopupTrigger()) { // L: 91 + if (var1.isPopupTrigger()) { var1.consume(); } - } // L: 92 + } public final synchronized void mouseReleased(MouseEvent var1) { - if (MouseHandler_instance != null) { // L: 95 - MouseHandler_idleCycles = 0; // L: 96 - MouseHandler_currentButtonVolatile = 0; // L: 97 - } - - if (var1.isPopupTrigger()) { // L: 99 - var1.consume(); - } - - } // L: 100 - - public final void mouseClicked(MouseEvent var1) { - if (var1.isPopupTrigger()) { // L: 103 - var1.consume(); - } - - } // L: 104 - - public final synchronized void mouseEntered(MouseEvent var1) { - this.mouseMoved(var1); // L: 107 - } // L: 108 - - public final synchronized void mouseDragged(MouseEvent var1) { - this.mouseMoved(var1); // L: 120 - } // L: 121 - - public final synchronized void focusLost(FocusEvent var1) { - if (MouseHandler_instance != null) { // L: 135 + if (MouseHandler_instance != null) { + MouseHandler_idleCycles = 0; MouseHandler_currentButtonVolatile = 0; } - } // L: 136 - - public final synchronized void mouseExited(MouseEvent var1) { - if (MouseHandler_instance != null) { // L: 111 - MouseHandler_idleCycles = 0; // L: 112 - MouseHandler_xVolatile = -1; // L: 113 - MouseHandler_yVolatile = -1; // L: 114 - MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 115 + if (var1.isPopupTrigger()) { + var1.consume(); } - } // L: 117 + } + + public final void mouseClicked(MouseEvent var1) { + if (var1.isPopupTrigger()) { + var1.consume(); + } + + } + + public final synchronized void mouseEntered(MouseEvent var1) { + this.mouseMoved(var1); + } + + public final synchronized void mouseDragged(MouseEvent var1) { + this.mouseMoved(var1); + } + + public final synchronized void focusLost(FocusEvent var1) { + if (MouseHandler_instance != null) { + MouseHandler_currentButtonVolatile = 0; + } + + } + + public final synchronized void mouseExited(MouseEvent var1) { + if (MouseHandler_instance != null) { + MouseHandler_idleCycles = 0; + MouseHandler_xVolatile = -1; + MouseHandler_yVolatile = -1; + MouseHandler_lastMovedVolatile = var1.getWhen(); + } + + } public final void focusGained(FocusEvent var1) { - } // L: 132 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -246,7 +246,7 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi garbageValue = "-1905138755" ) static VerticalAlignment[] method651() { - return new VerticalAlignment[]{VerticalAlignment.field1869, VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field1870}; // L: 14 + return new VerticalAlignment[]{VerticalAlignment.field1869, VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field1870}; } @ObfuscatedName("j") @@ -255,7 +255,7 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi garbageValue = "7" ) public static boolean method649(int var0) { - return (var0 >> 29 & 1) != 0; // L: 33 + return (var0 >> 29 & 1) != 0; } @ObfuscatedName("gk") @@ -265,28 +265,28 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi ) @Export("addNpcsToScene") static final void addNpcsToScene(boolean var0) { - for (int var1 = 0; var1 < Client.npcCount; ++var1) { // L: 5476 - NPC var2 = Client.npcs[Client.npcIndices[var1]]; // L: 5477 - if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { // L: 5478 - int var3 = var2.x >> 7; // L: 5479 - int var4 = var2.y >> 7; // L: 5480 - if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { // L: 5481 - if (var2.field1120 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { // L: 5482 - if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { // L: 5483 + for (int var1 = 0; var1 < Client.npcCount; ++var1) { + NPC var2 = Client.npcs[Client.npcIndices[var1]]; + if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { + int var3 = var2.x >> 7; + int var4 = var2.y >> 7; + if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { + if (var2.field1120 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { + if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { continue; } - Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; // L: 5484 + Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; } - long var5 = SecureRandomFuture.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); // L: 5486 - var2.playerCycle = Client.cycle; // L: 5487 - class7.scene.drawEntity(class20.Client_plane, var2.x, var2.y, FaceNormal.getTileHeight(var2.field1120 * 64 - 64 + var2.x, var2.field1120 * 64 - 64 + var2.y, class20.Client_plane), var2.field1120 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); // L: 5488 + long var5 = SecureRandomFuture.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); + var2.playerCycle = Client.cycle; + class7.scene.drawEntity(class20.Client_plane, var2.x, var2.y, FaceNormal.getTileHeight(var2.field1120 * 64 - 64 + var2.x, var2.field1120 * 64 - 64 + var2.y, class20.Client_plane), var2.field1120 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); } } } - } // L: 5492 + } @ObfuscatedName("hq") @ObfuscatedSignature( @@ -295,51 +295,51 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi ) @Export("updateItemPile") static final void updateItemPile(int var0, int var1) { - NodeDeque var2 = Client.groundItems[class20.Client_plane][var0][var1]; // L: 8234 - if (var2 == null) { // L: 8235 - class7.scene.removeGroundItemPile(class20.Client_plane, var0, var1); // L: 8236 + NodeDeque var2 = Client.groundItems[class20.Client_plane][var0][var1]; + if (var2 == null) { + class7.scene.removeGroundItemPile(class20.Client_plane, var0, var1); } else { - long var3 = -99999999L; // L: 8239 - TileItem var5 = null; // L: 8240 + long var3 = -99999999L; + TileItem var5 = null; TileItem var6; - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 8241 8242 8250 - ItemComposition var7 = UserComparator6.ItemDefinition_get(var6.id); // L: 8243 - long var11 = (long)var7.price; // L: 8244 - if (var7.isStackable == 1) { // L: 8245 + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { + ItemComposition var7 = UserComparator6.ItemDefinition_get(var6.id); + long var11 = (long)var7.price; + if (var7.isStackable == 1) { var11 *= (long)(var6.quantity + 1); } - if (var11 > var3) { // L: 8246 - var3 = var11; // L: 8247 - var5 = var6; // L: 8248 + if (var11 > var3) { + var3 = var11; + var5 = var6; } } - if (var5 == null) { // L: 8252 - class7.scene.removeGroundItemPile(class20.Client_plane, var0, var1); // L: 8253 + if (var5 == null) { + class7.scene.removeGroundItemPile(class20.Client_plane, var0, var1); } else { - var2.addLast(var5); // L: 8256 - TileItem var13 = null; // L: 8257 - TileItem var8 = null; // L: 8258 + var2.addLast(var5); + TileItem var13 = null; + TileItem var8 = null; - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 8259 8260 8265 - if (var6.id != var5.id) { // L: 8261 - if (var13 == null) { // L: 8262 + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { + if (var6.id != var5.id) { + if (var13 == null) { var13 = var6; } - if (var13.id != var6.id && var8 == null) { // L: 8263 + if (var13.id != var6.id && var8 == null) { var8 = var6; } } } - long var9 = SecureRandomFuture.calculateTag(var0, var1, 3, false, 0); // L: 8267 - class7.scene.newGroundItemPile(class20.Client_plane, var0, var1, FaceNormal.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, class20.Client_plane), var5, var9, var13, var8); // L: 8268 + long var9 = SecureRandomFuture.calculateTag(var0, var1, 3, false, 0); + class7.scene.newGroundItemPile(class20.Client_plane, var0, var1, FaceNormal.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, class20.Client_plane), var5, var9, var13, var8); } } - } // L: 8237 8254 8269 + } @ObfuscatedName("ia") @ObfuscatedSignature( @@ -347,51 +347,51 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi garbageValue = "1" ) static void method646(int var0, int var1) { - int var2 = class136.fontBold12.stringWidth("Choose Option"); // L: 8974 + int var2 = class136.fontBold12.stringWidth("Choose Option"); int var3; - for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { // L: 8975 - Font var7 = class136.fontBold12; // L: 8976 + for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { + Font var7 = class136.fontBold12; String var8; - if (var3 < 0) { // L: 8979 - var8 = ""; // L: 8980 - } else if (Client.menuTargets[var3].length() > 0) { // L: 8983 + if (var3 < 0) { + var8 = ""; + } else if (Client.menuTargets[var3].length() > 0) { var8 = Client.menuActions[var3] + " " + Client.menuTargets[var3]; } else { - var8 = Client.menuActions[var3]; // L: 8984 + var8 = Client.menuActions[var3]; } - int var6 = var7.stringWidth(var8); // L: 8986 - if (var6 > var2) { // L: 8987 + int var6 = var7.stringWidth(var8); + if (var6 > var2) { var2 = var6; } } - var2 += 8; // L: 8989 - var3 = Client.menuOptionsCount * 15 + 22; // L: 8990 - int var4 = var0 - var2 / 2; // L: 8991 - if (var2 + var4 > class186.canvasWidth) { // L: 8992 + var2 += 8; + var3 = Client.menuOptionsCount * 15 + 22; + int var4 = var0 - var2 / 2; + if (var2 + var4 > class186.canvasWidth) { var4 = class186.canvasWidth - var2; } - if (var4 < 0) { // L: 8993 + if (var4 < 0) { var4 = 0; } - int var5 = var1; // L: 8994 - if (var3 + var1 > BoundaryObject.canvasHeight) { // L: 8995 + int var5 = var1; + if (var3 + var1 > BoundaryObject.canvasHeight) { var5 = BoundaryObject.canvasHeight - var3; } - if (var5 < 0) { // L: 8996 + if (var5 < 0) { var5 = 0; } - ModeWhere.menuX = var4; // L: 8997 - BufferedSink.menuY = var5; // L: 8998 - GameObject.menuWidth = var2; // L: 8999 - UserComparator3.menuHeight = Client.menuOptionsCount * 15 + 22; // L: 9000 - } // L: 9001 + ModeWhere.menuX = var4; + BufferedSink.menuY = var5; + GameObject.menuWidth = var2; + UserComparator3.menuHeight = Client.menuOptionsCount * 15 + 22; + } @ObfuscatedName("jz") @ObfuscatedSignature( @@ -400,33 +400,33 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi ) @Export("alignWidgetPosition") static void alignWidgetPosition(Widget var0, int var1, int var2) { - if (var0.xAlignment == 0) { // L: 10975 + if (var0.xAlignment == 0) { var0.x = var0.rawX; - } else if (var0.xAlignment == 1) { // L: 10976 + } else if (var0.xAlignment == 1) { var0.x = var0.rawX + (var1 - var0.width) / 2; - } else if (var0.xAlignment == 2) { // L: 10977 + } else if (var0.xAlignment == 2) { var0.x = var1 - var0.width - var0.rawX; - } else if (var0.xAlignment == 3) { // L: 10978 + } else if (var0.xAlignment == 3) { var0.x = var0.rawX * var1 >> 14; - } else if (var0.xAlignment == 4) { // L: 10979 + } else if (var0.xAlignment == 4) { var0.x = (var1 - var0.width) / 2 + (var0.rawX * var1 >> 14); } else { - var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); // L: 10980 + var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); } - if (var0.yAlignment == 0) { // L: 10981 + if (var0.yAlignment == 0) { var0.y = var0.rawY; - } else if (var0.yAlignment == 1) { // L: 10982 + } else if (var0.yAlignment == 1) { var0.y = (var2 - var0.height) / 2 + var0.rawY; - } else if (var0.yAlignment == 2) { // L: 10983 + } else if (var0.yAlignment == 2) { var0.y = var2 - var0.height - var0.rawY; } else if (var0.yAlignment == 3) { - var0.y = var2 * var0.rawY >> 14; // L: 10984 - } else if (var0.yAlignment == 4) { // L: 10985 + var0.y = var2 * var0.rawY >> 14; + } else if (var0.yAlignment == 4) { var0.y = (var2 - var0.height) / 2 + (var2 * var0.rawY >> 14); } else { - var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); // L: 10986 + var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); } - } // L: 10987 + } } diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java index 6399d58f62..8985fbf9fd 100644 --- a/runescape-client/src/main/java/MouseRecorder.java +++ b/runescape-client/src/main/java/MouseRecorder.java @@ -46,19 +46,19 @@ public class MouseRecorder implements Runnable { long[] millis; MouseRecorder() { - this.isRunning = true; // L: 7 - this.lock = new Object(); // L: 8 - this.index = 0; // L: 9 - this.xs = new int[500]; // L: 10 - this.ys = new int[500]; // L: 11 - this.millis = new long[500]; // L: 12 - } // L: 14 + this.isRunning = true; + this.lock = new Object(); + this.index = 0; + this.xs = new int[500]; + this.ys = new int[500]; + this.millis = new long[500]; + } public void run() { - for (; this.isRunning; Bounds.method6608(50L)) { // L: 18 - synchronized(this.lock) { // L: 19 + for (; this.isRunning; Bounds.method6608(50L)) { + synchronized(this.lock) { if (this.index < 500) { - this.xs[this.index] = MouseHandler.MouseHandler_x; // L: 21 + this.xs[this.index] = MouseHandler.MouseHandler_x; this.ys[this.index] = MouseHandler.MouseHandler_y; this.millis[this.index] = MouseHandler.MouseHandler_millis; ++this.index; @@ -74,15 +74,15 @@ public class MouseRecorder implements Runnable { garbageValue = "-5" ) public static final SpritePixels method2161(byte[] var0) { - BufferedImage var1 = null; // L: 20 + BufferedImage var1 = null; 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 + var1 = ImageIO.read(new ByteArrayInputStream(var0)); + int var2 = var1.getWidth(); + int var3 = var1.getHeight(); + int[] var4 = new int[var2 * var3]; + PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2); + var5.grabPixels(); return new SpritePixels(var4, var2, var3); } catch (IOException var7) { } catch (InterruptedException var8) { @@ -97,26 +97,26 @@ public class MouseRecorder implements Runnable { garbageValue = "-41" ) static int method2160(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 28 - if (var2 == null) { // L: 29 + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var2 == null) { return 0; - } else if (var1 == -1) { // L: 30 + } else if (var1 == -1) { return 0; } else { - int var3 = 0; // L: 31 + int var3 = 0; - for (int var4 = 0; var4 < var2.quantities.length; ++var4) { // L: 32 + for (int var4 = 0; var4 < var2.quantities.length; ++var4) { if (var2.ids[var4] == var1) { - var3 += var2.quantities[var4]; // L: 33 + var3 += var2.quantities[var4]; } } - return var3; // L: 35 + return var3; } } @ObfuscatedName("s") public static int method2159(long var0) { - return (int)(var0 >>> 0 & 127L); // L: 68 + return (int)(var0 >>> 0 & 127L); } } diff --git a/runescape-client/src/main/java/MouseWheelHandler.java b/runescape-client/src/main/java/MouseWheelHandler.java index a7fa8d523b..93dc7b96de 100644 --- a/runescape-client/src/main/java/MouseWheelHandler.java +++ b/runescape-client/src/main/java/MouseWheelHandler.java @@ -18,8 +18,8 @@ public final class MouseWheelHandler implements class154, MouseWheelListener { int rotation; MouseWheelHandler() { - this.rotation = 0; // L: 8 - } // L: 10 + this.rotation = 0; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -28,8 +28,8 @@ public final class MouseWheelHandler implements class154, MouseWheelListener { ) @Export("addTo") void addTo(Component var1) { - var1.addMouseWheelListener(this); // L: 13 - } // L: 14 + var1.addMouseWheelListener(this); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -38,8 +38,8 @@ public final class MouseWheelHandler implements class154, MouseWheelListener { ) @Export("removeFrom") void removeFrom(Component var1) { - var1.removeMouseWheelListener(this); // L: 17 - } // L: 18 + var1.removeMouseWheelListener(this); + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -48,12 +48,12 @@ public final class MouseWheelHandler implements class154, MouseWheelListener { ) @Export("useRotation") public synchronized int useRotation() { - int var1 = this.rotation; // L: 26 - this.rotation = 0; // L: 27 - return var1; // L: 28 + int var1 = this.rotation; + this.rotation = 0; + return var1; } public synchronized void mouseWheelMoved(MouseWheelEvent var1) { - this.rotation += var1.getWheelRotation(); // L: 22 - } // L: 23 + this.rotation += var1.getWheelRotation(); + } } diff --git a/runescape-client/src/main/java/MusicPatch.java b/runescape-client/src/main/java/MusicPatch.java index 965ad5a1a4..5e31ce8bee 100644 --- a/runescape-client/src/main/java/MusicPatch.java +++ b/runescape-client/src/main/java/MusicPatch.java @@ -35,296 +35,296 @@ public class MusicPatch extends Node { int[] field3118; MusicPatch(byte[] var1) { - this.rawSounds = new RawSound[128]; // L: 21 - this.field3113 = new short[128]; // L: 22 - this.field3111 = new byte[128]; // L: 23 - this.field3115 = new byte[128]; // L: 24 - this.field3117 = new MusicPatchNode2[128]; // L: 25 - this.field3119 = new byte[128]; // L: 26 - this.field3118 = new int[128]; // L: 27 - Buffer var2 = new Buffer(var1); // L: 28 + this.rawSounds = new RawSound[128]; + this.field3113 = new short[128]; + this.field3111 = new byte[128]; + this.field3115 = new byte[128]; + this.field3117 = new MusicPatchNode2[128]; + this.field3119 = new byte[128]; + this.field3118 = new int[128]; + Buffer var2 = new Buffer(var1); int var3; - for (var3 = 0; var2.array[var3 + var2.offset] != 0; ++var3) { // L: 29 30 + for (var3 = 0; var2.array[var3 + var2.offset] != 0; ++var3) { } - byte[] var4 = new byte[var3]; // L: 31 + byte[] var4 = new byte[var3]; int var5; - for (var5 = 0; var5 < var3; ++var5) { // L: 32 + for (var5 = 0; var5 < var3; ++var5) { var4[var5] = var2.readByte(); } - ++var2.offset; // L: 33 - ++var3; // L: 34 - var5 = var2.offset; // L: 35 - var2.offset += var3; // L: 36 + ++var2.offset; + ++var3; + var5 = var2.offset; + var2.offset += var3; int var6; - for (var6 = 0; var2.array[var6 + var2.offset] != 0; ++var6) { // L: 37 38 + for (var6 = 0; var2.array[var6 + var2.offset] != 0; ++var6) { } - byte[] var7 = new byte[var6]; // L: 39 + byte[] var7 = new byte[var6]; int var8; - for (var8 = 0; var8 < var6; ++var8) { // L: 40 + for (var8 = 0; var8 < var6; ++var8) { var7[var8] = var2.readByte(); } - ++var2.offset; // L: 41 - ++var6; // L: 42 - var8 = var2.offset; // L: 43 - var2.offset += var6; // L: 44 + ++var2.offset; + ++var6; + var8 = var2.offset; + var2.offset += var6; int var9; - for (var9 = 0; var2.array[var9 + var2.offset] != 0; ++var9) { // L: 45 46 + for (var9 = 0; var2.array[var9 + var2.offset] != 0; ++var9) { } - byte[] var10 = new byte[var9]; // L: 47 + byte[] var10 = new byte[var9]; - for (int var11 = 0; var11 < var9; ++var11) { // L: 48 + for (int var11 = 0; var11 < var9; ++var11) { var10[var11] = var2.readByte(); } - ++var2.offset; // L: 49 - ++var9; // L: 50 - byte[] var36 = new byte[var9]; // L: 51 + ++var2.offset; + ++var9; + byte[] var36 = new byte[var9]; int var12; int var14; - if (var9 > 1) { // L: 53 - var36[1] = 1; // L: 54 - int var13 = 1; // L: 55 - var12 = 2; // L: 56 + if (var9 > 1) { + var36[1] = 1; + int var13 = 1; + var12 = 2; - for (var14 = 2; var14 < var9; ++var14) { // L: 57 - int var41 = var2.readUnsignedByte(); // L: 58 - if (var41 == 0) { // L: 59 + for (var14 = 2; var14 < var9; ++var14) { + int var41 = var2.readUnsignedByte(); + if (var41 == 0) { var13 = var12++; } else { - if (var41 <= var13) { // L: 61 + if (var41 <= var13) { --var41; } - var13 = var41; // L: 62 + var13 = var41; } - var36[var14] = (byte)var13; // L: 64 + var36[var14] = (byte)var13; } } else { - var12 = var9; // L: 67 + var12 = var9; } - MusicPatchNode2[] var37 = new MusicPatchNode2[var12]; // L: 68 + MusicPatchNode2[] var37 = new MusicPatchNode2[var12]; MusicPatchNode2 var15; - for (var14 = 0; var14 < var37.length; ++var14) { // L: 69 - var15 = var37[var14] = new MusicPatchNode2(); // L: 70 - int var40 = var2.readUnsignedByte(); // L: 71 - if (var40 > 0) { // L: 72 + for (var14 = 0; var14 < var37.length; ++var14) { + var15 = var37[var14] = new MusicPatchNode2(); + int var40 = var2.readUnsignedByte(); + if (var40 > 0) { var15.field3056 = new byte[var40 * 2]; } - var40 = var2.readUnsignedByte(); // L: 73 - if (var40 > 0) { // L: 74 - var15.field3054 = new byte[var40 * 2 + 2]; // L: 75 - var15.field3054[1] = 64; // L: 76 + var40 = var2.readUnsignedByte(); + if (var40 > 0) { + var15.field3054 = new byte[var40 * 2 + 2]; + var15.field3054[1] = 64; } } - var14 = var2.readUnsignedByte(); // L: 79 - byte[] var42 = var14 > 0 ? new byte[var14 * 2] : null; // L: 80 - var14 = var2.readUnsignedByte(); // L: 81 - byte[] var16 = var14 > 0 ? new byte[var14 * 2] : null; // L: 82 + var14 = var2.readUnsignedByte(); + byte[] var42 = var14 > 0 ? new byte[var14 * 2] : null; + var14 = var2.readUnsignedByte(); + byte[] var16 = var14 > 0 ? new byte[var14 * 2] : null; int var17; - for (var17 = 0; var2.array[var17 + var2.offset] != 0; ++var17) { // L: 83 84 + for (var17 = 0; var2.array[var17 + var2.offset] != 0; ++var17) { } - byte[] var18 = new byte[var17]; // L: 85 + byte[] var18 = new byte[var17]; int var19; - for (var19 = 0; var19 < var17; ++var19) { // L: 86 + for (var19 = 0; var19 < var17; ++var19) { var18[var19] = var2.readByte(); } - ++var2.offset; // L: 87 - ++var17; // L: 88 - var19 = 0; // L: 89 + ++var2.offset; + ++var17; + var19 = 0; int var20; - for (var20 = 0; var20 < 128; ++var20) { // L: 90 - var19 += var2.readUnsignedByte(); // L: 91 - this.field3113[var20] = (short)var19; // L: 92 + for (var20 = 0; var20 < 128; ++var20) { + var19 += var2.readUnsignedByte(); + this.field3113[var20] = (short)var19; } - var19 = 0; // L: 94 + var19 = 0; short[] var48; - for (var20 = 0; var20 < 128; ++var20) { // L: 95 - var19 += var2.readUnsignedByte(); // L: 96 - var48 = this.field3113; // L: 97 + for (var20 = 0; var20 < 128; ++var20) { + var19 += var2.readUnsignedByte(); + var48 = this.field3113; var48[var20] = (short)(var48[var20] + (var19 << 8)); } - var20 = 0; // L: 99 - int var21 = 0; // L: 100 - int var22 = 0; // L: 101 + var20 = 0; + int var21 = 0; + int var22 = 0; int var23; - for (var23 = 0; var23 < 128; ++var23) { // L: 102 - if (var20 == 0) { // L: 103 - if (var21 < var18.length) { // L: 104 + for (var23 = 0; var23 < 128; ++var23) { + if (var20 == 0) { + if (var21 < var18.length) { var20 = var18[var21++]; } else { - var20 = -1; // L: 105 + var20 = -1; } - var22 = var2.readVarInt(); // L: 106 + var22 = var2.readVarInt(); } - var48 = this.field3113; // L: 108 + var48 = this.field3113; var48[var23] = (short)(var48[var23] + ((var22 - 1 & 2) << 14)); - this.field3118[var23] = var22; // L: 109 - --var20; // L: 110 + this.field3118[var23] = var22; + --var20; } - var20 = 0; // L: 112 - var21 = 0; // L: 113 - var23 = 0; // L: 114 + var20 = 0; + var21 = 0; + var23 = 0; int var24; - for (var24 = 0; var24 < 128; ++var24) { // L: 115 - if (this.field3118[var24] != 0) { // L: 116 - if (var20 == 0) { // L: 117 - if (var21 < var4.length) { // L: 118 + for (var24 = 0; var24 < 128; ++var24) { + if (this.field3118[var24] != 0) { + if (var20 == 0) { + if (var21 < var4.length) { var20 = var4[var21++]; } else { - var20 = -1; // L: 119 + var20 = -1; } - var23 = var2.array[var5++] - 1; // L: 120 + var23 = var2.array[var5++] - 1; } - this.field3119[var24] = (byte)var23; // L: 122 - --var20; // L: 123 + this.field3119[var24] = (byte)var23; + --var20; } } - var20 = 0; // L: 125 - var21 = 0; // L: 126 - var24 = 0; // L: 127 + var20 = 0; + var21 = 0; + var24 = 0; - for (int var25 = 0; var25 < 128; ++var25) { // L: 128 - if (this.field3118[var25] != 0) { // L: 129 - if (var20 == 0) { // L: 130 - if (var21 < var7.length) { // L: 131 + for (int var25 = 0; var25 < 128; ++var25) { + if (this.field3118[var25] != 0) { + if (var20 == 0) { + if (var21 < var7.length) { var20 = var7[var21++]; } else { - var20 = -1; // L: 132 + var20 = -1; } - var24 = var2.array[var8++] + 16 << 2; // L: 133 + var24 = var2.array[var8++] + 16 << 2; } - this.field3115[var25] = (byte)var24; // L: 135 - --var20; // L: 136 + this.field3115[var25] = (byte)var24; + --var20; } } - var20 = 0; // L: 138 - var21 = 0; // L: 139 - MusicPatchNode2 var38 = null; // L: 140 + var20 = 0; + var21 = 0; + MusicPatchNode2 var38 = null; int var26; - for (var26 = 0; var26 < 128; ++var26) { // L: 141 - if (this.field3118[var26] != 0) { // L: 142 - if (var20 == 0) { // L: 143 - var38 = var37[var36[var21]]; // L: 144 - if (var21 < var10.length) { // L: 145 + for (var26 = 0; var26 < 128; ++var26) { + if (this.field3118[var26] != 0) { + if (var20 == 0) { + var38 = var37[var36[var21]]; + if (var21 < var10.length) { var20 = var10[var21++]; } else { - var20 = -1; // L: 146 + var20 = -1; } } - this.field3117[var26] = var38; // L: 148 - --var20; // L: 149 + this.field3117[var26] = var38; + --var20; } } - var20 = 0; // L: 151 - var21 = 0; // L: 152 - var26 = 0; // L: 153 + var20 = 0; + var21 = 0; + var26 = 0; int var27; - for (var27 = 0; var27 < 128; ++var27) { // L: 154 - if (var20 == 0) { // L: 155 - if (var21 < var18.length) { // L: 156 + for (var27 = 0; var27 < 128; ++var27) { + if (var20 == 0) { + if (var21 < var18.length) { var20 = var18[var21++]; } else { - var20 = -1; // L: 157 + var20 = -1; } - if (this.field3118[var27] > 0) { // L: 158 + if (this.field3118[var27] > 0) { var26 = var2.readUnsignedByte() + 1; } } - this.field3111[var27] = (byte)var26; // L: 160 - --var20; // L: 161 + this.field3111[var27] = (byte)var26; + --var20; } - this.field3114 = var2.readUnsignedByte() + 1; // L: 163 + this.field3114 = var2.readUnsignedByte() + 1; int var29; MusicPatchNode2 var39; - for (var27 = 0; var27 < var12; ++var27) { // L: 164 - var39 = var37[var27]; // L: 165 - if (var39.field3056 != null) { // L: 166 - for (var29 = 1; var29 < var39.field3056.length; var29 += 2) { // L: 167 + for (var27 = 0; var27 < var12; ++var27) { + var39 = var37[var27]; + if (var39.field3056 != null) { + for (var29 = 1; var29 < var39.field3056.length; var29 += 2) { var39.field3056[var29] = var2.readByte(); } } - if (var39.field3054 != null) { // L: 169 - for (var29 = 3; var29 < var39.field3054.length - 2; var29 += 2) { // L: 170 + if (var39.field3054 != null) { + for (var29 = 3; var29 < var39.field3054.length - 2; var29 += 2) { var39.field3054[var29] = var2.readByte(); } } } - if (var42 != null) { // L: 173 - for (var27 = 1; var27 < var42.length; var27 += 2) { // L: 174 + if (var42 != null) { + for (var27 = 1; var27 < var42.length; var27 += 2) { var42[var27] = var2.readByte(); } } - if (var16 != null) { // L: 176 - for (var27 = 1; var27 < var16.length; var27 += 2) { // L: 177 + if (var16 != null) { + for (var27 = 1; var27 < var16.length; var27 += 2) { var16[var27] = var2.readByte(); } } - for (var27 = 0; var27 < var12; ++var27) { // L: 179 - var39 = var37[var27]; // L: 180 - if (var39.field3054 != null) { // L: 181 - var19 = 0; // L: 182 + for (var27 = 0; var27 < var12; ++var27) { + var39 = var37[var27]; + if (var39.field3054 != null) { + var19 = 0; - for (var29 = 2; var29 < var39.field3054.length; var29 += 2) { // L: 183 - var19 = var19 + 1 + var2.readUnsignedByte(); // L: 184 - var39.field3054[var29] = (byte)var19; // L: 185 + for (var29 = 2; var29 < var39.field3054.length; var29 += 2) { + var19 = var19 + 1 + var2.readUnsignedByte(); + var39.field3054[var29] = (byte)var19; } } } - for (var27 = 0; var27 < var12; ++var27) { // L: 189 - var39 = var37[var27]; // L: 190 - if (var39.field3056 != null) { // L: 191 - var19 = 0; // L: 192 + for (var27 = 0; var27 < var12; ++var27) { + var39 = var37[var27]; + if (var39.field3056 != null) { + var19 = 0; - for (var29 = 2; var29 < var39.field3056.length; var29 += 2) { // L: 193 - var19 = var19 + 1 + var2.readUnsignedByte(); // L: 194 - var39.field3056[var29] = (byte)var19; // L: 195 + for (var29 = 2; var29 < var39.field3056.length; var29 += 2) { + var19 = var19 + 1 + var2.readUnsignedByte(); + var39.field3056[var29] = (byte)var19; } } } @@ -335,148 +335,148 @@ public class MusicPatch extends Node { int var34; int var45; byte var47; - if (var42 != null) { // L: 199 - var19 = var2.readUnsignedByte(); // L: 200 - var42[0] = (byte)var19; // L: 201 + if (var42 != null) { + var19 = var2.readUnsignedByte(); + var42[0] = (byte)var19; - for (var27 = 2; var27 < var42.length; var27 += 2) { // L: 202 - var19 = var19 + 1 + var2.readUnsignedByte(); // L: 203 - var42[var27] = (byte)var19; // L: 204 + for (var27 = 2; var27 < var42.length; var27 += 2) { + var19 = var19 + 1 + var2.readUnsignedByte(); + var42[var27] = (byte)var19; } - var47 = var42[0]; // L: 206 - byte var28 = var42[1]; // L: 207 + var47 = var42[0]; + byte var28 = var42[1]; - for (var29 = 0; var29 < var47; ++var29) { // L: 208 + for (var29 = 0; var29 < var47; ++var29) { this.field3111[var29] = (byte)(var28 * this.field3111[var29] + 32 >> 6); } - for (var29 = 2; var29 < var42.length; var29 += 2) { // L: 209 210 221 - var30 = var42[var29]; // L: 211 - byte var31 = var42[var29 + 1]; // L: 212 - var32 = var28 * (var30 - var47) + (var30 - var47) / 2; // L: 213 + for (var29 = 2; var29 < var42.length; var29 += 2) { + var30 = var42[var29]; + byte var31 = var42[var29 + 1]; + var32 = var28 * (var30 - var47) + (var30 - var47) / 2; - for (var33 = var47; var33 < var30; ++var33) { // L: 214 - var34 = FaceNormal.method4142(var32, var30 - var47); // L: 215 - this.field3111[var33] = (byte)(var34 * this.field3111[var33] + 32 >> 6); // L: 216 - var32 += var31 - var28; // L: 217 + for (var33 = var47; var33 < var30; ++var33) { + var34 = FaceNormal.method4142(var32, var30 - var47); + this.field3111[var33] = (byte)(var34 * this.field3111[var33] + 32 >> 6); + var32 += var31 - var28; } - var47 = var30; // L: 219 - var28 = var31; // L: 220 + var47 = var30; + var28 = var31; } - for (var45 = var47; var45 < 128; ++var45) { // L: 223 + for (var45 = var47; var45 < 128; ++var45) { this.field3111[var45] = (byte)(var28 * this.field3111[var45] + 32 >> 6); } - var15 = null; // L: 224 + var15 = null; } - if (var16 != null) { // L: 226 - var19 = var2.readUnsignedByte(); // L: 227 - var16[0] = (byte)var19; // L: 228 + if (var16 != null) { + var19 = var2.readUnsignedByte(); + var16[0] = (byte)var19; - for (var27 = 2; var27 < var16.length; var27 += 2) { // L: 229 - var19 = var19 + 1 + var2.readUnsignedByte(); // L: 230 - var16[var27] = (byte)var19; // L: 231 + for (var27 = 2; var27 < var16.length; var27 += 2) { + var19 = var19 + 1 + var2.readUnsignedByte(); + var16[var27] = (byte)var19; } - var47 = var16[0]; // L: 233 - int var44 = var16[1] << 1; // L: 234 + var47 = var16[0]; + int var44 = var16[1] << 1; - for (var29 = 0; var29 < var47; ++var29) { // L: 235 - var45 = var44 + (this.field3115[var29] & 255); // L: 236 - if (var45 < 0) { // L: 237 + for (var29 = 0; var29 < var47; ++var29) { + var45 = var44 + (this.field3115[var29] & 255); + if (var45 < 0) { var45 = 0; } - if (var45 > 128) { // L: 238 + if (var45 > 128) { var45 = 128; } - this.field3115[var29] = (byte)var45; // L: 239 + this.field3115[var29] = (byte)var45; } int var46; - for (var29 = 2; var29 < var16.length; var29 += 2) { // L: 241 242 256 - var30 = var16[var29]; // L: 243 - var46 = var16[var29 + 1] << 1; // L: 244 - var32 = var44 * (var30 - var47) + (var30 - var47) / 2; // L: 245 + for (var29 = 2; var29 < var16.length; var29 += 2) { + var30 = var16[var29]; + var46 = var16[var29 + 1] << 1; + var32 = var44 * (var30 - var47) + (var30 - var47) / 2; - for (var33 = var47; var33 < var30; ++var33) { // L: 246 - var34 = FaceNormal.method4142(var32, var30 - var47); // L: 247 - int var35 = var34 + (this.field3115[var33] & 255); // L: 248 - if (var35 < 0) { // L: 249 + for (var33 = var47; var33 < var30; ++var33) { + var34 = FaceNormal.method4142(var32, var30 - var47); + int var35 = var34 + (this.field3115[var33] & 255); + if (var35 < 0) { var35 = 0; } - if (var35 > 128) { // L: 250 + if (var35 > 128) { var35 = 128; } - this.field3115[var33] = (byte)var35; // L: 251 - var32 += var46 - var44; // L: 252 + this.field3115[var33] = (byte)var35; + var32 += var46 - var44; } - var47 = var30; // L: 254 - var44 = var46; // L: 255 + var47 = var30; + var44 = var46; } - for (var45 = var47; var45 < 128; ++var45) { // L: 258 - var46 = var44 + (this.field3115[var45] & 255); // L: 259 - if (var46 < 0) { // L: 260 + for (var45 = var47; var45 < 128; ++var45) { + var46 = var44 + (this.field3115[var45] & 255); + if (var46 < 0) { var46 = 0; } - if (var46 > 128) { // L: 261 + if (var46 > 128) { var46 = 128; } - this.field3115[var45] = (byte)var46; // L: 262 + this.field3115[var45] = (byte)var46; } - Object var43 = null; // L: 264 + Object var43 = null; } - for (var27 = 0; var27 < var12; ++var27) { // L: 266 + for (var27 = 0; var27 < var12; ++var27) { var37[var27].field3052 = var2.readUnsignedByte(); } - for (var27 = 0; var27 < var12; ++var27) { // L: 267 - var39 = var37[var27]; // L: 268 - if (var39.field3056 != null) { // L: 269 + for (var27 = 0; var27 < var12; ++var27) { + var39 = var37[var27]; + if (var39.field3056 != null) { var39.field3055 = var2.readUnsignedByte(); } - if (var39.field3054 != null) { // L: 270 + if (var39.field3054 != null) { var39.field3053 = var2.readUnsignedByte(); } - if (var39.field3052 > 0) { // L: 271 + if (var39.field3052 > 0) { var39.field3057 = var2.readUnsignedByte(); } } - for (var27 = 0; var27 < var12; ++var27) { // L: 273 + for (var27 = 0; var27 < var12; ++var27) { var37[var27].field3059 = var2.readUnsignedByte(); } - for (var27 = 0; var27 < var12; ++var27) { // L: 274 - var39 = var37[var27]; // L: 275 - if (var39.field3059 > 0) { // L: 276 + for (var27 = 0; var27 < var12; ++var27) { + var39 = var37[var27]; + if (var39.field3059 > 0) { var39.field3058 = var2.readUnsignedByte(); } } - for (var27 = 0; var27 < var12; ++var27) { // L: 278 - var39 = var37[var27]; // L: 279 - if (var39.field3058 > 0) { // L: 280 + for (var27 = 0; var27 < var12; ++var27) { + var39 = var37[var27]; + if (var39.field3058 > 0) { var39.field3060 = var2.readUnsignedByte(); } } - } // L: 282 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -484,36 +484,36 @@ public class MusicPatch extends Node { garbageValue = "-1424242195" ) boolean method5253(SoundCache var1, byte[] var2, int[] var3) { - boolean var4 = true; // L: 285 - int var5 = 0; // L: 286 - RawSound var6 = null; // L: 287 + boolean var4 = true; + int var5 = 0; + RawSound var6 = null; - for (int var7 = 0; var7 < 128; ++var7) { // L: 288 - if (var2 == null || var2[var7] != 0) { // L: 289 - int var8 = this.field3118[var7]; // L: 290 - if (var8 != 0) { // L: 291 - if (var5 != var8) { // L: 292 - var5 = var8--; // L: 293 294 - if ((var8 & 1) == 0) { // L: 295 + for (int var7 = 0; var7 < 128; ++var7) { + if (var2 == null || var2[var7] != 0) { + int var8 = this.field3118[var7]; + if (var8 != 0) { + if (var5 != var8) { + var5 = var8--; + if ((var8 & 1) == 0) { var6 = var1.getSoundEffect(var8 >> 2, var3); } else { - var6 = var1.getMusicSample(var8 >> 2, var3); // L: 296 + var6 = var1.getMusicSample(var8 >> 2, var3); } - if (var6 == null) { // L: 297 + if (var6 == null) { var4 = false; } } - if (var6 != null) { // L: 299 - this.rawSounds[var7] = var6; // L: 300 - this.field3118[var7] = 0; // L: 301 + if (var6 != null) { + this.rawSounds[var7] = var6; + this.field3118[var7] = 0; } } } } - return var4; // L: 305 + return var4; } @ObfuscatedName("b") @@ -523,6 +523,6 @@ public class MusicPatch extends Node { ) @Export("clear") void clear() { - this.field3118 = null; // L: 309 - } // L: 310 + this.field3118 = null; + } } diff --git a/runescape-client/src/main/java/MusicPatchNode.java b/runescape-client/src/main/java/MusicPatchNode.java index 400f44abf6..d7d692b47b 100644 --- a/runescape-client/src/main/java/MusicPatchNode.java +++ b/runescape-client/src/main/java/MusicPatchNode.java @@ -132,7 +132,7 @@ public class MusicPatchNode extends Node { void method5292() { this.patch = null; this.rawSound = null; - this.field3131 = null; // L: 36 + this.field3131 = null; this.stream = null; } @@ -142,56 +142,56 @@ public class MusicPatchNode extends Node { garbageValue = "-1684371840" ) public static String method5294(byte[] var0, int var1, int var2) { - char[] var3 = new char[var2]; // L: 30 - int var4 = 0; // L: 31 - int var5 = var1; // L: 32 + char[] var3 = new char[var2]; + int var4 = 0; + int var5 = var1; int var8; - for (int var6 = var2 + var1; var5 < var6; var3[var4++] = (char)var8) { // L: 33 34 65 - int var7 = var0[var5++] & 255; // L: 35 - if (var7 < 128) { // L: 37 - if (var7 == 0) { // L: 38 + for (int var6 = var2 + var1; var5 < var6; var3[var4++] = (char)var8) { + int var7 = var0[var5++] & 255; + if (var7 < 128) { + if (var7 == 0) { var8 = 65533; } else { - var8 = var7; // L: 39 + var8 = var7; } - } else if (var7 < 192) { // L: 41 + } else if (var7 < 192) { var8 = 65533; - } else if (var7 < 224) { // L: 42 - if (var5 < var6 && (var0[var5] & 192) == 128) { // L: 43 - var8 = (var7 & 31) << 6 | var0[var5++] & 63; // L: 44 - if (var8 < 128) { // L: 45 + } else if (var7 < 224) { + if (var5 < var6 && (var0[var5] & 192) == 128) { + var8 = (var7 & 31) << 6 | var0[var5++] & 63; + if (var8 < 128) { var8 = 65533; } } else { - var8 = 65533; // L: 47 + var8 = 65533; } - } else if (var7 < 240) { // L: 49 - if (var5 + 1 < var6 && (var0[var5] & 192) == 128 && (var0[var5 + 1] & 192) == 128) { // L: 50 - var8 = (var7 & 15) << 12 | (var0[var5++] & 63) << 6 | var0[var5++] & 63; // L: 51 - if (var8 < 2048) { // L: 52 + } else if (var7 < 240) { + if (var5 + 1 < var6 && (var0[var5] & 192) == 128 && (var0[var5 + 1] & 192) == 128) { + var8 = (var7 & 15) << 12 | (var0[var5++] & 63) << 6 | var0[var5++] & 63; + if (var8 < 2048) { var8 = 65533; } } else { - var8 = 65533; // L: 54 + var8 = 65533; } - } else if (var7 < 248) { // L: 56 - if (var5 + 2 < var6 && (var0[var5] & 192) == 128 && (var0[var5 + 1] & 192) == 128 && (var0[var5 + 2] & 192) == 128) { // L: 57 - var8 = (var7 & 7) << 18 | (var0[var5++] & 63) << 12 | (var0[var5++] & 63) << 6 | var0[var5++] & 63; // L: 58 - if (var8 >= 65536 && var8 <= 1114111) { // L: 59 - var8 = 65533; // L: 60 + } else if (var7 < 248) { + if (var5 + 2 < var6 && (var0[var5] & 192) == 128 && (var0[var5 + 1] & 192) == 128 && (var0[var5 + 2] & 192) == 128) { + var8 = (var7 & 7) << 18 | (var0[var5++] & 63) << 12 | (var0[var5++] & 63) << 6 | var0[var5++] & 63; + if (var8 >= 65536 && var8 <= 1114111) { + var8 = 65533; } else { var8 = 65533; } } else { - var8 = 65533; // L: 62 + var8 = 65533; } } else { - var8 = 65533; // L: 64 + var8 = 65533; } } - return new String(var3, 0, var4); // L: 67 + return new String(var3, 0, var4); } @ObfuscatedName("m") @@ -200,59 +200,59 @@ public class MusicPatchNode extends Node { garbageValue = "-8" ) public static int method5293(CharSequence var0, int var1, boolean var2) { - if (var1 >= 2 && var1 <= 36) { // L: 81 - boolean var3 = false; // L: 82 - boolean var4 = false; // L: 83 - int var5 = 0; // L: 84 - int var6 = var0.length(); // L: 85 + if (var1 >= 2 && var1 <= 36) { + boolean var3 = false; + boolean var4 = false; + int var5 = 0; + int var6 = var0.length(); - for (int var7 = 0; var7 < var6; ++var7) { // L: 86 - char var8 = var0.charAt(var7); // L: 87 - if (var7 == 0) { // L: 88 - if (var8 == '-') { // L: 89 - var3 = true; // L: 90 + for (int var7 = 0; var7 < var6; ++var7) { + char var8 = var0.charAt(var7); + if (var7 == 0) { + if (var8 == '-') { + var3 = true; continue; } - if (var8 == '+') { // L: 93 + if (var8 == '+') { continue; } } int var10; - if (var8 >= '0' && var8 <= '9') { // L: 95 + if (var8 >= '0' && var8 <= '9') { var10 = var8 - '0'; - } else if (var8 >= 'A' && var8 <= 'Z') { // L: 96 + } else if (var8 >= 'A' && var8 <= 'Z') { var10 = var8 - '7'; } else { - if (var8 < 'a' || var8 > 'z') { // L: 97 - throw new NumberFormatException(); // L: 98 + if (var8 < 'a' || var8 > 'z') { + throw new NumberFormatException(); } var10 = var8 - 'W'; } - if (var10 >= var1) { // L: 99 + if (var10 >= var1) { throw new NumberFormatException(); } - if (var3) { // L: 100 + if (var3) { var10 = -var10; } - int var9 = var5 * var1 + var10; // L: 101 - if (var9 / var1 != var5) { // L: 102 + int var9 = var5 * var1 + var10; + if (var9 / var1 != var5) { throw new NumberFormatException(); } - var5 = var9; // L: 103 - var4 = true; // L: 104 + var5 = var9; + var4 = true; } - if (!var4) { // L: 106 + if (!var4) { throw new NumberFormatException(); } else { - return var5; // L: 107 + return var5; } } else { throw new IllegalArgumentException("" + var1); diff --git a/runescape-client/src/main/java/MusicPatchNode2.java b/runescape-client/src/main/java/MusicPatchNode2.java index 13b7287a69..bf00157016 100644 --- a/runescape-client/src/main/java/MusicPatchNode2.java +++ b/runescape-client/src/main/java/MusicPatchNode2.java @@ -49,7 +49,7 @@ public class MusicPatchNode2 { int field3060; MusicPatchNode2() { - } // L: 14 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -57,13 +57,13 @@ public class MusicPatchNode2 { garbageValue = "-1" ) public static void method5048(File var0) { - class125.FileSystem_cacheDir = var0; // L: 16 - if (!class125.FileSystem_cacheDir.exists()) { // L: 17 + class125.FileSystem_cacheDir = var0; + if (!class125.FileSystem_cacheDir.exists()) { throw new RuntimeException(""); } else { - FileSystem.FileSystem_hasPermissions = true; // L: 18 + FileSystem.FileSystem_hasPermissions = true; } - } // L: 19 + } @ObfuscatedName("g") @ObfuscatedSignature( @@ -72,23 +72,23 @@ public class MusicPatchNode2 { ) @Export("hslToRgb") static final int hslToRgb(int var0, int var1, int var2) { - if (var2 > 179) { // L: 516 + if (var2 > 179) { var1 /= 2; } - if (var2 > 192) { // L: 517 + if (var2 > 192) { var1 /= 2; } - if (var2 > 217) { // L: 518 + if (var2 > 217) { var1 /= 2; } - if (var2 > 243) { // L: 519 + if (var2 > 243) { var1 /= 2; } - int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 520 - return var3; // L: 521 + int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; + return var3; } } diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java index 24444b9d38..4339affe42 100644 --- a/runescape-client/src/main/java/MusicPatchPcmStream.java +++ b/runescape-client/src/main/java/MusicPatchPcmStream.java @@ -31,10 +31,10 @@ public class MusicPatchPcmStream extends PcmStream { descriptor = "(Ljp;)V" ) MusicPatchPcmStream(MidiPcmStream var1) { - this.queue = new NodeDeque(); // L: 11 - this.mixer = new PcmStreamMixer(); // L: 12 - this.superStream = var1; // L: 15 - } // L: 16 + this.queue = new NodeDeque(); + this.mixer = new PcmStreamMixer(); + this.superStream = var1; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -42,49 +42,49 @@ public class MusicPatchPcmStream extends PcmStream { garbageValue = "-1616122568" ) void method5262(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { - if ((this.superStream.field3081[var1.field3149] & 4) != 0 && var1.field3142 < 0) { // L: 73 - int var6 = this.superStream.field3086[var1.field3149] / class339.field4058; // L: 74 + if ((this.superStream.field3081[var1.field3149] & 4) != 0 && var1.field3142 < 0) { + int var6 = this.superStream.field3086[var1.field3149] / class339.field4058; while (true) { - int var7 = (var6 + 1048575 - var1.field3135) / var6; // L: 76 - if (var7 > var4) { // L: 77 - var1.field3135 += var4 * var6; // L: 99 + int var7 = (var6 + 1048575 - var1.field3135) / var6; + if (var7 > var4) { + var1.field3135 += var4 * var6; break; } - var1.stream.fill(var2, var3, var7); // L: 78 - var3 += var7; // L: 79 - var4 -= var7; // L: 80 - var1.field3135 += var7 * var6 - 1048576; // L: 81 - int var8 = class339.field4058 / 100; // L: 82 - int var9 = 262144 / var6; // L: 83 - if (var9 < var8) { // L: 84 + var1.stream.fill(var2, var3, var7); + var3 += var7; + var4 -= var7; + var1.field3135 += var7 * var6 - 1048576; + int var8 = class339.field4058 / 100; + int var9 = 262144 / var6; + if (var9 < var8) { var8 = var9; } - RawPcmStream var10 = var1.stream; // L: 85 - if (this.superStream.field3084[var1.field3149] == 0) { // L: 86 - var1.stream = RawPcmStream.method943(var1.rawSound, var10.method855(), var10.method862(), var10.method847()); // L: 87 + RawPcmStream var10 = var1.stream; + if (this.superStream.field3084[var1.field3149] == 0) { + var1.stream = RawPcmStream.method943(var1.rawSound, var10.method855(), var10.method862(), var10.method847()); } else { - var1.stream = RawPcmStream.method943(var1.rawSound, var10.method855(), 0, var10.method847()); // L: 90 - this.superStream.method5083(var1, var1.patch.field3113[var1.field3133] < 0); // L: 91 - var1.stream.method851(var8, var10.method862()); // L: 92 + var1.stream = RawPcmStream.method943(var1.rawSound, var10.method855(), 0, var10.method847()); + this.superStream.method5083(var1, var1.patch.field3113[var1.field3133] < 0); + var1.stream.method851(var8, var10.method862()); } - if (var1.patch.field3113[var1.field3133] < 0) { // L: 94 + if (var1.patch.field3113[var1.field3133] < 0) { var1.stream.setNumLoops(-1); } - var10.method954(var8); // L: 95 - var10.fill(var2, var3, var5 - var3); // L: 96 - if (var10.method857()) { // L: 97 + var10.method954(var8); + var10.fill(var2, var3, var5 - var3); + if (var10.method857()) { this.mixer.addSubStream(var10); } } } - var1.stream.fill(var2, var3, var4); // L: 101 - } // L: 102 + var1.stream.fill(var2, var3, var4); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -92,28 +92,28 @@ public class MusicPatchPcmStream extends PcmStream { garbageValue = "2103540030" ) void method5263(MusicPatchNode var1, int var2) { - if ((this.superStream.field3081[var1.field3149] & 4) != 0 && var1.field3142 < 0) { // L: 105 - int var3 = this.superStream.field3086[var1.field3149] / class339.field4058; // L: 106 - int var4 = (var3 + 1048575 - var1.field3135) / var3; // L: 107 - var1.field3135 = var3 * var2 + var1.field3135 & 1048575; // L: 108 - if (var4 <= var2) { // L: 109 - if (this.superStream.field3084[var1.field3149] == 0) { // L: 110 - var1.stream = RawPcmStream.method943(var1.rawSound, var1.stream.method855(), var1.stream.method862(), var1.stream.method847()); // L: 111 + if ((this.superStream.field3081[var1.field3149] & 4) != 0 && var1.field3142 < 0) { + int var3 = this.superStream.field3086[var1.field3149] / class339.field4058; + int var4 = (var3 + 1048575 - var1.field3135) / var3; + var1.field3135 = var3 * var2 + var1.field3135 & 1048575; + if (var4 <= var2) { + if (this.superStream.field3084[var1.field3149] == 0) { + var1.stream = RawPcmStream.method943(var1.rawSound, var1.stream.method855(), var1.stream.method862(), var1.stream.method847()); } else { - var1.stream = RawPcmStream.method943(var1.rawSound, var1.stream.method855(), 0, var1.stream.method847()); // L: 114 - this.superStream.method5083(var1, var1.patch.field3113[var1.field3133] < 0); // L: 115 + var1.stream = RawPcmStream.method943(var1.rawSound, var1.stream.method855(), 0, var1.stream.method847()); + this.superStream.method5083(var1, var1.patch.field3113[var1.field3133] < 0); } - if (var1.patch.field3113[var1.field3133] < 0) { // L: 117 + if (var1.patch.field3113[var1.field3133] < 0) { var1.stream.setNumLoops(-1); } - var2 = var1.field3135 / var3; // L: 118 + var2 = var1.field3135 / var3; } } - var1.stream.skip(var2); // L: 121 - } // L: 122 + var1.stream.skip(var2); + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -121,11 +121,11 @@ public class MusicPatchPcmStream extends PcmStream { ) @Export("firstSubStream") protected PcmStream firstSubStream() { - MusicPatchNode var1 = (MusicPatchNode)this.queue.last(); // L: 19 + MusicPatchNode var1 = (MusicPatchNode)this.queue.last(); if (var1 == null) { - return null; // L: 20 + return null; } else { - return (PcmStream)(var1.stream != null ? var1.stream : this.nextSubStream()); // L: 21 22 + return (PcmStream)(var1.stream != null ? var1.stream : this.nextSubStream()); } } @@ -137,26 +137,26 @@ public class MusicPatchPcmStream extends PcmStream { protected PcmStream nextSubStream() { MusicPatchNode var1; do { - var1 = (MusicPatchNode)this.queue.previous(); // L: 27 + var1 = (MusicPatchNode)this.queue.previous(); if (var1 == null) { - return null; // L: 28 + return null; } - } while(var1.stream == null); // L: 29 + } while(var1.stream == null); return var1.stream; } @ObfuscatedName("w") protected int vmethod5260() { - return 0; // L: 34 + return 0; } @ObfuscatedName("n") @Export("fill") protected void fill(int[] var1, int var2, int var3) { - this.mixer.fill(var1, var2, var3); // L: 40 + this.mixer.fill(var1, var2, var3); - for (MusicPatchNode var6 = (MusicPatchNode)this.queue.last(); var6 != null; var6 = (MusicPatchNode)this.queue.previous()) { // L: 41 + for (MusicPatchNode var6 = (MusicPatchNode)this.queue.last(); var6 != null; var6 = (MusicPatchNode)this.queue.previous()) { if (!this.superStream.method5105(var6)) { int var4 = var2; int var5 = var3; @@ -180,26 +180,26 @@ public class MusicPatchPcmStream extends PcmStream { @ObfuscatedName("o") @Export("skip") protected void skip(int var1) { - this.mixer.skip(var1); // L: 58 + this.mixer.skip(var1); - for (MusicPatchNode var3 = (MusicPatchNode)this.queue.last(); var3 != null; var3 = (MusicPatchNode)this.queue.previous()) { // L: 59 - if (!this.superStream.method5105(var3)) { // L: 60 - int var2 = var1; // L: 61 + for (MusicPatchNode var3 = (MusicPatchNode)this.queue.last(); var3 != null; var3 = (MusicPatchNode)this.queue.previous()) { + if (!this.superStream.method5105(var3)) { + int var2 = var1; do { - if (var2 <= var3.field3134) { // L: 62 - this.method5263(var3, var2); // L: 67 - var3.field3134 -= var2; // L: 68 + if (var2 <= var3.field3134) { + this.method5263(var3, var2); + var3.field3134 -= var2; break; } - this.method5263(var3, var3.field3134); // L: 63 - var2 -= var3.field3134; // L: 64 - } while(!this.superStream.method5106(var3, (int[])null, 0, var2)); // L: 65 + this.method5263(var3, var3.field3134); + var2 -= var3.field3134; + } while(!this.superStream.method5106(var3, (int[])null, 0, var2)); } } - } // L: 70 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -208,20 +208,20 @@ public class MusicPatchPcmStream extends PcmStream { ) public static void method5272(File var0, File var1) { try { - AccessFile var2 = new AccessFile(Huffman.JagexCache_locationFile, "rw", 10000L); // L: 42 - Buffer var3 = new Buffer(500); // L: 43 - var3.writeByte(3); // L: 44 - var3.writeByte(var1 != null ? 1 : 0); // L: 45 - var3.writeCESU8(var0.getPath()); // L: 46 + AccessFile var2 = new AccessFile(Huffman.JagexCache_locationFile, "rw", 10000L); + Buffer var3 = new Buffer(500); + var3.writeByte(3); + var3.writeByte(var1 != null ? 1 : 0); + var3.writeCESU8(var0.getPath()); if (var1 != null) { - var3.writeCESU8(""); // L: 47 + var3.writeCESU8(""); } - var2.write(var3.array, 0, var3.offset); // L: 48 - var2.close(); // L: 49 - } catch (IOException var4) { // L: 51 - var4.printStackTrace(); // L: 52 + var2.write(var3.array, 0, var3.offset); + var2.close(); + } catch (IOException var4) { + var4.printStackTrace(); } - } // L: 54 + } } diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java index 2392fe0e6e..31acedd831 100644 --- a/runescape-client/src/main/java/MusicTrack.java +++ b/runescape-client/src/main/java/MusicTrack.java @@ -20,113 +20,113 @@ public class MusicTrack extends Node { descriptor = "(Lpi;)V" ) MusicTrack(Buffer var1) { - var1.offset = var1.array.length - 3; // L: 22 - int var2 = var1.readUnsignedByte(); // L: 23 - int var3 = var1.readUnsignedShort(); // L: 24 - int var4 = var2 * 10 + 14; // L: 25 - var1.offset = 0; // L: 26 - int var5 = 0; // L: 27 - int var6 = 0; // L: 28 - int var7 = 0; // L: 29 - int var8 = 0; // L: 30 - int var9 = 0; // L: 31 - int var10 = 0; // L: 32 - int var11 = 0; // L: 33 - int var12 = 0; // L: 34 + var1.offset = var1.array.length - 3; + int var2 = var1.readUnsignedByte(); + int var3 = var1.readUnsignedShort(); + int var4 = var2 * 10 + 14; + var1.offset = 0; + int var5 = 0; + int var6 = 0; + int var7 = 0; + int var8 = 0; + int var9 = 0; + int var10 = 0; + int var11 = 0; + int var12 = 0; int var13; int var14; int var15; - for (var13 = 0; var13 < var2; ++var13) { // L: 35 - var14 = -1; // L: 36 + for (var13 = 0; var13 < var2; ++var13) { + var14 = -1; while (true) { - var15 = var1.readUnsignedByte(); // L: 38 - if (var15 != var14) { // L: 39 + var15 = var1.readUnsignedByte(); + if (var15 != var14) { ++var4; } - var14 = var15 & 15; // L: 40 - if (var15 == 7) { // L: 41 + var14 = var15 & 15; + if (var15 == 7) { break; } - if (var15 == 23) { // L: 42 - ++var5; // L: 43 - } else if (var14 == 0) { // L: 46 - ++var7; // L: 47 - } else if (var14 == 1) { // L: 50 - ++var8; // L: 51 - } else if (var14 == 2) { // L: 54 - ++var6; // L: 55 - } else if (var14 == 3) { // L: 58 - ++var9; // L: 59 - } else if (var14 == 4) { // L: 62 - ++var10; // L: 63 - } else if (var14 == 5) { // L: 66 - ++var11; // L: 67 + if (var15 == 23) { + ++var5; + } else if (var14 == 0) { + ++var7; + } else if (var14 == 1) { + ++var8; + } else if (var14 == 2) { + ++var6; + } else if (var14 == 3) { + ++var9; + } else if (var14 == 4) { + ++var10; + } else if (var14 == 5) { + ++var11; } else { - if (var14 != 6) { // L: 70 - throw new RuntimeException(); // L: 74 + if (var14 != 6) { + throw new RuntimeException(); } - ++var12; // L: 71 + ++var12; } } } - var4 += var5 * 5; // L: 77 - var4 += (var7 + var8 + var6 + var9 + var11) * 2; // L: 78 - var4 = var4 + var10 + var12; // L: 79 - var13 = var1.offset; // L: 80 - var14 = var2 + var5 + var6 + var7 + var8 + var9 + var10 + var11 + var12; // L: 81 + var4 += var5 * 5; + var4 += (var7 + var8 + var6 + var9 + var11) * 2; + var4 = var4 + var10 + var12; + var13 = var1.offset; + var14 = var2 + var5 + var6 + var7 + var8 + var9 + var10 + var11 + var12; - for (var15 = 0; var15 < var14; ++var15) { // L: 82 + for (var15 = 0; var15 < var14; ++var15) { var1.readVarInt(); } - var4 += var1.offset - var13; // L: 83 - var15 = var1.offset; // L: 84 - int var16 = 0; // L: 85 - int var17 = 0; // L: 86 - int var18 = 0; // L: 87 - int var19 = 0; // L: 88 - int var20 = 0; // L: 89 - int var21 = 0; // L: 90 - int var22 = 0; // L: 91 - int var23 = 0; // L: 92 - int var24 = 0; // L: 93 - int var25 = 0; // L: 94 - int var26 = 0; // L: 95 - int var27 = 0; // L: 96 - int var28 = 0; // L: 97 + var4 += var1.offset - var13; + var15 = var1.offset; + int var16 = 0; + int var17 = 0; + int var18 = 0; + int var19 = 0; + int var20 = 0; + int var21 = 0; + int var22 = 0; + int var23 = 0; + int var24 = 0; + int var25 = 0; + int var26 = 0; + int var27 = 0; + int var28 = 0; int var29; - for (var29 = 0; var29 < var6; ++var29) { // L: 98 - var28 = var28 + var1.readUnsignedByte() & 127; // L: 99 - if (var28 != 0 && var28 != 32) { // L: 100 - if (var28 == 1) { // L: 101 + for (var29 = 0; var29 < var6; ++var29) { + var28 = var28 + var1.readUnsignedByte() & 127; + if (var28 != 0 && var28 != 32) { + if (var28 == 1) { ++var16; - } else if (var28 == 33) { // L: 102 + } else if (var28 == 33) { ++var17; - } else if (var28 == 7) { // L: 103 + } else if (var28 == 7) { ++var18; - } else if (var28 == 39) { // L: 104 + } else if (var28 == 39) { ++var19; - } else if (var28 == 10) { // L: 105 + } else if (var28 == 10) { ++var20; - } else if (var28 == 42) { // L: 106 + } else if (var28 == 42) { ++var21; - } else if (var28 == 99) { // L: 107 + } else if (var28 == 99) { ++var22; - } else if (var28 == 98) { // L: 108 + } else if (var28 == 98) { ++var23; - } else if (var28 == 101) { // L: 109 + } else if (var28 == 101) { ++var24; - } else if (var28 == 100) { // L: 110 + } else if (var28 == 100) { ++var25; - } else if (var28 != 64 && var28 != 65 && var28 != 120 && var28 != 121 && var28 != 123) { // L: 111 - ++var27; // L: 112 + } else if (var28 != 64 && var28 != 65 && var28 != 120 && var28 != 121 && var28 != 123) { + ++var27; } else { ++var26; } @@ -135,153 +135,153 @@ public class MusicTrack extends Node { } } - var29 = 0; // L: 114 - int var30 = var1.offset; // L: 115 - var1.offset += var26; // L: 116 - int var31 = var1.offset; // L: 117 - var1.offset += var11; // L: 118 - int var32 = var1.offset; // L: 119 - var1.offset += var10; // L: 120 - int var33 = var1.offset; // L: 121 - var1.offset += var9; // L: 122 - int var34 = var1.offset; // L: 123 - var1.offset += var16; // L: 124 - int var35 = var1.offset; // L: 125 - var1.offset += var18; // L: 126 - int var36 = var1.offset; // L: 127 - var1.offset += var20; // L: 128 - int var37 = var1.offset; // L: 129 - var1.offset += var7 + var8 + var11; // L: 130 - int var38 = var1.offset; // L: 131 - var1.offset += var7; // L: 132 - int var39 = var1.offset; // L: 133 - var1.offset += var27; // L: 134 - int var40 = var1.offset; // L: 135 - var1.offset += var8; // L: 136 - int var41 = var1.offset; // L: 137 - var1.offset += var17; // L: 138 - int var42 = var1.offset; // L: 139 - var1.offset += var19; // L: 140 - int var43 = var1.offset; // L: 141 - var1.offset += var21; // L: 142 - int var44 = var1.offset; // L: 143 - var1.offset += var12; // L: 144 - int var45 = var1.offset; // L: 145 - var1.offset += var9; // L: 146 - int var46 = var1.offset; // L: 147 - var1.offset += var22; // L: 148 - int var47 = var1.offset; // L: 149 - var1.offset += var23; // L: 150 - int var48 = var1.offset; // L: 151 - var1.offset += var24; // L: 152 - int var49 = var1.offset; // L: 153 - var1.offset += var25; // L: 154 - int var50 = var1.offset; // L: 155 - var1.offset += var5 * 3; // L: 156 - this.midi = new byte[var4]; // L: 157 - Buffer var51 = new Buffer(this.midi); // L: 158 - var51.writeInt(1297377380); // L: 159 - var51.writeInt(6); // L: 160 - var51.writeShort(var2 > 1 ? 1 : 0); // L: 161 - var51.writeShort(var2); // L: 162 - var51.writeShort(var3); // L: 163 - var1.offset = var13; // L: 164 - int var52 = 0; // L: 165 - int var53 = 0; // L: 166 - int var54 = 0; // L: 167 - int var55 = 0; // L: 168 - int var56 = 0; // L: 169 - int var57 = 0; // L: 170 - int var58 = 0; // L: 171 - int[] var59 = new int[128]; // L: 172 - var28 = 0; // L: 173 + var29 = 0; + int var30 = var1.offset; + var1.offset += var26; + int var31 = var1.offset; + var1.offset += var11; + int var32 = var1.offset; + var1.offset += var10; + int var33 = var1.offset; + var1.offset += var9; + int var34 = var1.offset; + var1.offset += var16; + int var35 = var1.offset; + var1.offset += var18; + int var36 = var1.offset; + var1.offset += var20; + int var37 = var1.offset; + var1.offset += var7 + var8 + var11; + int var38 = var1.offset; + var1.offset += var7; + int var39 = var1.offset; + var1.offset += var27; + int var40 = var1.offset; + var1.offset += var8; + int var41 = var1.offset; + var1.offset += var17; + int var42 = var1.offset; + var1.offset += var19; + int var43 = var1.offset; + var1.offset += var21; + int var44 = var1.offset; + var1.offset += var12; + int var45 = var1.offset; + var1.offset += var9; + int var46 = var1.offset; + var1.offset += var22; + int var47 = var1.offset; + var1.offset += var23; + int var48 = var1.offset; + var1.offset += var24; + int var49 = var1.offset; + var1.offset += var25; + int var50 = var1.offset; + var1.offset += var5 * 3; + this.midi = new byte[var4]; + Buffer var51 = new Buffer(this.midi); + var51.writeInt(1297377380); + var51.writeInt(6); + var51.writeShort(var2 > 1 ? 1 : 0); + var51.writeShort(var2); + var51.writeShort(var3); + var1.offset = var13; + int var52 = 0; + int var53 = 0; + int var54 = 0; + int var55 = 0; + int var56 = 0; + int var57 = 0; + int var58 = 0; + int[] var59 = new int[128]; + var28 = 0; label244: - for (int var60 = 0; var60 < var2; ++var60) { // L: 174 - var51.writeInt(1297379947); // L: 175 - var51.offset += 4; // L: 176 - int var61 = var51.offset; // L: 177 - int var62 = -1; // L: 178 + for (int var60 = 0; var60 < var2; ++var60) { + var51.writeInt(1297379947); + var51.offset += 4; + int var61 = var51.offset; + int var62 = -1; while (true) { while (true) { - int var63 = var1.readVarInt(); // L: 180 - var51.writeVarInt(var63); // L: 181 - int var64 = var1.array[var29++] & 255; // L: 182 - boolean var65 = var64 != var62; // L: 183 - var62 = var64 & 15; // L: 184 - if (var64 == 7) { // L: 185 - if (var65) { // L: 186 + int var63 = var1.readVarInt(); + var51.writeVarInt(var63); + int var64 = var1.array[var29++] & 255; + boolean var65 = var64 != var62; + var62 = var64 & 15; + if (var64 == 7) { + if (var65) { var51.writeByte(255); } - var51.writeByte(47); // L: 187 - var51.writeByte(0); // L: 188 - var51.writeLengthInt(var51.offset - var61); // L: 269 + var51.writeByte(47); + var51.writeByte(0); + var51.writeLengthInt(var51.offset - var61); continue label244; } - if (var64 == 23) { // L: 191 - if (var65) { // L: 192 + if (var64 == 23) { + if (var65) { var51.writeByte(255); } - var51.writeByte(81); // L: 193 - var51.writeByte(3); // L: 194 - var51.writeByte(var1.array[var50++]); // L: 195 - var51.writeByte(var1.array[var50++]); // L: 196 - var51.writeByte(var1.array[var50++]); // L: 197 + var51.writeByte(81); + var51.writeByte(3); + var51.writeByte(var1.array[var50++]); + var51.writeByte(var1.array[var50++]); + var51.writeByte(var1.array[var50++]); } else { - var52 ^= var64 >> 4; // L: 200 - if (var62 == 0) { // L: 201 - if (var65) { // L: 202 + var52 ^= var64 >> 4; + if (var62 == 0) { + if (var65) { var51.writeByte(var52 + 144); } - var53 += var1.array[var37++]; // L: 203 - var54 += var1.array[var38++]; // L: 204 - var51.writeByte(var53 & 127); // L: 205 - var51.writeByte(var54 & 127); // L: 206 - } else if (var62 == 1) { // L: 209 - if (var65) { // L: 210 + var53 += var1.array[var37++]; + var54 += var1.array[var38++]; + var51.writeByte(var53 & 127); + var51.writeByte(var54 & 127); + } else if (var62 == 1) { + if (var65) { var51.writeByte(var52 + 128); } - var53 += var1.array[var37++]; // L: 211 - var55 += var1.array[var40++]; // L: 212 - var51.writeByte(var53 & 127); // L: 213 - var51.writeByte(var55 & 127); // L: 214 - } else if (var62 == 2) { // L: 217 - if (var65) { // L: 218 + var53 += var1.array[var37++]; + var55 += var1.array[var40++]; + var51.writeByte(var53 & 127); + var51.writeByte(var55 & 127); + } else if (var62 == 2) { + if (var65) { var51.writeByte(var52 + 176); } - var28 = var28 + var1.array[var15++] & 127; // L: 219 - var51.writeByte(var28); // L: 220 + var28 = var28 + var1.array[var15++] & 127; + var51.writeByte(var28); byte var66; - if (var28 != 0 && var28 != 32) { // L: 222 - if (var28 == 1) { // L: 223 + if (var28 != 0 && var28 != 32) { + if (var28 == 1) { var66 = var1.array[var34++]; - } else if (var28 == 33) { // L: 224 + } else if (var28 == 33) { var66 = var1.array[var41++]; - } else if (var28 == 7) { // L: 225 + } else if (var28 == 7) { var66 = var1.array[var35++]; - } else if (var28 == 39) { // L: 226 + } else if (var28 == 39) { var66 = var1.array[var42++]; - } else if (var28 == 10) { // L: 227 + } else if (var28 == 10) { var66 = var1.array[var36++]; - } else if (var28 == 42) { // L: 228 + } else if (var28 == 42) { var66 = var1.array[var43++]; - } else if (var28 == 99) { // L: 229 + } else if (var28 == 99) { var66 = var1.array[var46++]; - } else if (var28 == 98) { // L: 230 + } else if (var28 == 98) { var66 = var1.array[var47++]; - } else if (var28 == 101) { // L: 231 + } else if (var28 == 101) { var66 = var1.array[var48++]; - } else if (var28 == 100) { // L: 232 + } else if (var28 == 100) { var66 = var1.array[var49++]; - } else if (var28 != 64 && var28 != 65 && var28 != 120 && var28 != 121 && var28 != 123) { // L: 233 - var66 = var1.array[var39++]; // L: 234 + } else if (var28 != 64 && var28 != 65 && var28 != 120 && var28 != 121 && var28 != 123) { + var66 = var1.array[var39++]; } else { var66 = var1.array[var30++]; } @@ -289,138 +289,138 @@ public class MusicTrack extends Node { var66 = var1.array[var44++]; } - int var67 = var66 + var59[var28]; // L: 235 - var59[var28] = var67; // L: 236 - var51.writeByte(var67 & 127); // L: 237 - } else if (var62 == 3) { // L: 240 - if (var65) { // L: 241 + int var67 = var66 + var59[var28]; + var59[var28] = var67; + var51.writeByte(var67 & 127); + } else if (var62 == 3) { + if (var65) { var51.writeByte(var52 + 224); } - var56 += var1.array[var45++]; // L: 242 - var56 += var1.array[var33++] << 7; // L: 243 - var51.writeByte(var56 & 127); // L: 244 - var51.writeByte(var56 >> 7 & 127); // L: 245 - } else if (var62 == 4) { // L: 248 - if (var65) { // L: 249 + var56 += var1.array[var45++]; + var56 += var1.array[var33++] << 7; + var51.writeByte(var56 & 127); + var51.writeByte(var56 >> 7 & 127); + } else if (var62 == 4) { + if (var65) { var51.writeByte(var52 + 208); } - var57 += var1.array[var32++]; // L: 250 - var51.writeByte(var57 & 127); // L: 251 - } else if (var62 == 5) { // L: 254 - if (var65) { // L: 255 + var57 += var1.array[var32++]; + var51.writeByte(var57 & 127); + } else if (var62 == 5) { + if (var65) { var51.writeByte(var52 + 160); } - var53 += var1.array[var37++]; // L: 256 - var58 += var1.array[var31++]; // L: 257 - var51.writeByte(var53 & 127); // L: 258 - var51.writeByte(var58 & 127); // L: 259 + var53 += var1.array[var37++]; + var58 += var1.array[var31++]; + var51.writeByte(var53 & 127); + var51.writeByte(var58 & 127); } else { - if (var62 != 6) { // L: 262 - throw new RuntimeException(); // L: 267 + if (var62 != 6) { + throw new RuntimeException(); } - if (var65) { // L: 263 + if (var65) { var51.writeByte(var52 + 192); } - var51.writeByte(var1.array[var44++]); // L: 264 + var51.writeByte(var1.array[var44++]); } } } } } - } // L: 271 + } @ObfuscatedName("b") void method5280() { - if (this.table == null) { // L: 274 - this.table = new NodeHashTable(16); // L: 275 - int[] var1 = new int[16]; // L: 276 - int[] var2 = new int[16]; // L: 277 - var2[9] = 128; // L: 279 - var1[9] = 128; // L: 280 - MidiFileReader var4 = new MidiFileReader(this.midi); // L: 281 - int var5 = var4.trackCount(); // L: 282 + if (this.table == null) { + this.table = new NodeHashTable(16); + int[] var1 = new int[16]; + int[] var2 = new int[16]; + var2[9] = 128; + var1[9] = 128; + MidiFileReader var4 = new MidiFileReader(this.midi); + int var5 = var4.trackCount(); int var6; - for (var6 = 0; var6 < var5; ++var6) { // L: 283 - var4.gotoTrack(var6); // L: 284 - var4.readTrackLength(var6); // L: 285 - var4.markTrackPosition(var6); // L: 286 + for (var6 = 0; var6 < var5; ++var6) { + var4.gotoTrack(var6); + var4.readTrackLength(var6); + var4.markTrackPosition(var6); } label56: do { while (true) { - var6 = var4.getPrioritizedTrack(); // L: 289 - int var7 = var4.trackLengths[var6]; // L: 290 + var6 = var4.getPrioritizedTrack(); + int var7 = var4.trackLengths[var6]; - while (var7 == var4.trackLengths[var6]) { // L: 291 - var4.gotoTrack(var6); // L: 292 - int var8 = var4.readMessage(var6); // L: 293 - if (var8 == 1) { // L: 294 - var4.setTrackDone(); // L: 295 - var4.markTrackPosition(var6); // L: 296 + while (var7 == var4.trackLengths[var6]) { + var4.gotoTrack(var6); + int var8 = var4.readMessage(var6); + if (var8 == 1) { + var4.setTrackDone(); + var4.markTrackPosition(var6); continue label56; } - int var9 = var8 & 240; // L: 300 + int var9 = var8 & 240; int var10; int var11; int var12; - if (var9 == 176) { // L: 301 - var10 = var8 & 15; // L: 302 - var11 = var8 >> 8 & 127; // L: 303 - var12 = var8 >> 16 & 127; // L: 304 - if (var11 == 0) { // L: 305 + if (var9 == 176) { + var10 = var8 & 15; + var11 = var8 >> 8 & 127; + var12 = var8 >> 16 & 127; + if (var11 == 0) { var1[var10] = (var12 << 14) + (var1[var10] & -2080769); } - if (var11 == 32) { // L: 306 + if (var11 == 32) { var1[var10] = (var1[var10] & -16257) + (var12 << 7); } } - if (var9 == 192) { // L: 308 - var10 = var8 & 15; // L: 309 - var11 = var8 >> 8 & 127; // L: 310 - var2[var10] = var11 + var1[var10]; // L: 311 + if (var9 == 192) { + var10 = var8 & 15; + var11 = var8 >> 8 & 127; + var2[var10] = var11 + var1[var10]; } - if (var9 == 144) { // L: 313 - var10 = var8 & 15; // L: 314 - var11 = var8 >> 8 & 127; // L: 315 - var12 = var8 >> 16 & 127; // L: 316 - if (var12 > 0) { // L: 317 - int var13 = var2[var10]; // L: 318 - ByteArrayNode var14 = (ByteArrayNode)this.table.get((long)var13); // L: 319 - if (var14 == null) { // L: 320 - var14 = new ByteArrayNode(new byte[128]); // L: 321 - this.table.put(var14, (long)var13); // L: 322 + if (var9 == 144) { + var10 = var8 & 15; + var11 = var8 >> 8 & 127; + var12 = var8 >> 16 & 127; + if (var12 > 0) { + int var13 = var2[var10]; + ByteArrayNode var14 = (ByteArrayNode)this.table.get((long)var13); + if (var14 == null) { + var14 = new ByteArrayNode(new byte[128]); + this.table.put(var14, (long)var13); } - var14.byteArray[var11] = 1; // L: 324 + var14.byteArray[var11] = 1; } } - var4.readTrackLength(var6); // L: 327 - var4.markTrackPosition(var6); // L: 328 + var4.readTrackLength(var6); + var4.markTrackPosition(var6); } } - } while(!var4.isDone()); // L: 297 + } while(!var4.isDone()); } - } // L: 331 + } @ObfuscatedName("p") @Export("clear") void clear() { - this.table = null; // L: 334 - } // L: 335 + this.table = null; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -428,7 +428,7 @@ public class MusicTrack extends Node { ) @Export("readTrack") public 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 + byte[] var3 = var0.takeFile(var1, var2); + return var3 == null ? null : new MusicTrack(new Buffer(var3)); } } diff --git a/runescape-client/src/main/java/NPC.java b/runescape-client/src/main/java/NPC.java index 7f33e42b62..203d8679d9 100644 --- a/runescape-client/src/main/java/NPC.java +++ b/runescape-client/src/main/java/NPC.java @@ -32,7 +32,7 @@ public final class NPC extends Actor { NPCComposition definition; NPC() { - } // L: 12 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -40,62 +40,62 @@ public final class NPC extends Actor { garbageValue = "1330012132" ) final void method2319(int var1, class185 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 - } - - if (var1 == 1) { // L: 21 + int var3 = super.pathX[0]; + int var4 = super.pathY[0]; + if (var1 == 0) { + --var3; ++var4; } - if (var1 == 2) { // L: 22 - ++var3; // L: 23 - ++var4; // L: 24 + if (var1 == 1) { + ++var4; } - if (var1 == 3) { // L: 26 + if (var1 == 2) { + ++var3; + ++var4; + } + + if (var1 == 3) { --var3; } - if (var1 == 4) { // L: 27 + if (var1 == 4) { ++var3; } - if (var1 == 5) { // L: 28 - --var3; // L: 29 - --var4; // L: 30 - } - - if (var1 == 6) { // L: 32 + if (var1 == 5) { + --var3; --var4; } - if (var1 == 7) { // L: 33 - ++var3; // L: 34 - --var4; // L: 35 + if (var1 == 6) { + --var4; } - if (super.sequence != -1 && UserComparator5.SequenceDefinition_get(super.sequence).field2097 == 1) { // L: 37 + if (var1 == 7) { + ++var3; + --var4; + } + + if (super.sequence != -1 && UserComparator5.SequenceDefinition_get(super.sequence).field2097 == 1) { super.sequence = -1; } - if (super.pathLength < 9) { // L: 38 + if (super.pathLength < 9) { ++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.field1153[var5] = super.field1153[var5 - 1]; // L: 42 + for (int var5 = super.pathLength; var5 > 0; --var5) { + super.pathX[var5] = super.pathX[var5 - 1]; + super.pathY[var5] = super.pathY[var5 - 1]; + super.field1153[var5] = super.field1153[var5 - 1]; } - super.pathX[0] = var3; // L: 44 - super.pathY[0] = var4; // L: 45 - super.field1153[0] = var2; // L: 46 - } // L: 47 + super.pathX[0] = var3; + super.pathY[0] = var4; + super.field1153[0] = var2; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -107,31 +107,31 @@ public final class NPC extends Actor { if (this.definition == null) { return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? UserComparator5.SequenceDefinition_get(super.sequence) : null; // L: 78 - SequenceDefinition var2 = super.movementSequence == -1 || super.idleSequence == super.movementSequence && var1 != null ? null : UserComparator5.SequenceDefinition_get(super.movementSequence); // L: 79 + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? UserComparator5.SequenceDefinition_get(super.sequence) : null; + SequenceDefinition var2 = super.movementSequence == -1 || super.idleSequence == super.movementSequence && var1 != null ? null : UserComparator5.SequenceDefinition_get(super.movementSequence); Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); - if (var3 == null) { // L: 81 + if (var3 == null) { return null; } else { var3.calculateBoundsCylinder(); super.defaultHeight = var3.height; - if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 84 + if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) { Model var4 = AccessFile.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); if (var4 != null) { - var4.offsetBy(0, -super.field1131, 0); // L: 87 - Model[] var5 = new Model[]{var3, var4}; // L: 88 + var4.offsetBy(0, -super.field1131, 0); + Model[] var5 = new Model[]{var3, var4}; var3 = new Model(var5, 2); } } - if (this.definition.size == 1) { // L: 92 + if (this.definition.size == 1) { var3.isSingleTile = true; } - if (super.field1146 != 0 && Client.cycle >= super.field1141 && Client.cycle < super.field1140) { // L: 93 + if (super.field1146 != 0 && Client.cycle >= super.field1141 && Client.cycle < super.field1140) { var3.field2494 = super.field1143; - var3.field2495 = super.field1144; // L: 95 - var3.field2479 = super.field1095; // L: 96 + var3.field2495 = super.field1144; + var3.field2479 = super.field1095; var3.field2474 = super.field1146; } else { var3.field2474 = 0; @@ -148,37 +148,37 @@ public final class NPC extends Actor { garbageValue = "-2138088750" ) final void method2315(int var1, int var2, boolean var3) { - if (super.sequence != -1 && UserComparator5.SequenceDefinition_get(super.sequence).field2097 == 1) { // L: 50 + if (super.sequence != -1 && UserComparator5.SequenceDefinition_get(super.sequence).field2097 == 1) { 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 (!var3) { + int var4 = var1 - super.pathX[0]; + int var5 = var2 - super.pathY[0]; + if (var4 >= -8 && var4 <= 8 && var5 >= -8 && var5 <= 8) { + if (super.pathLength < 9) { ++super.pathLength; } for (int var6 = super.pathLength; var6 > 0; --var6) { - super.pathX[var6] = super.pathX[var6 - 1]; // L: 57 + super.pathX[var6] = super.pathX[var6 - 1]; super.pathY[var6] = super.pathY[var6 - 1]; super.field1153[var6] = super.field1153[var6 - 1]; } super.pathX[0] = var1; super.pathY[0] = var2; - super.field1153[0] = class185.field2123; // L: 63 + super.field1153[0] = class185.field2123; return; } } super.pathLength = 0; super.field1098 = 0; - super.field1117 = 0; // L: 69 - super.pathX[0] = var1; // L: 70 + super.field1117 = 0; + super.pathX[0] = var1; super.pathY[0] = var2; - super.x = super.field1120 * 64 + super.pathX[0] * 128; // L: 72 + super.x = super.field1120 * 64 + super.pathX[0] * 128; super.y = super.pathY[0] * 128 + super.field1120 * 64; } @@ -198,56 +198,56 @@ public final class NPC extends Actor { garbageValue = "68" ) static boolean method2314(String var0, int var1, String var2) { - if (var1 == 0) { // L: 56 + if (var1 == 0) { try { - if (!class29.field177.startsWith("win")) { // L: 58 + if (!class29.field177.startsWith("win")) { throw new Exception(); - } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { // L: 59 + } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { throw new Exception(); } else { - String var11 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; // L: 60 + String var11 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; - for (int var4 = 0; var4 < var0.length(); ++var4) { // L: 61 - if (var11.indexOf(var0.charAt(var4)) == -1) { // L: 62 + for (int var4 = 0; var4 < var0.length(); ++var4) { + if (var11.indexOf(var0.charAt(var4)) == -1) { throw new Exception(); } } - Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); // L: 64 - return true; // L: 65 + Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); + return true; } - } catch (Throwable var5) { // L: 67 - return false; // L: 68 + } catch (Throwable var5) { + return false; } - } else if (var1 == 1) { // L: 71 + } else if (var1 == 1) { try { - Object var10 = class27.method433(class29.field172, var2, new Object[]{(new URL(class29.field172.getCodeBase(), var0)).toString()}); // L: 73 - return var10 != null; // L: 74 - } catch (Throwable var6) { // L: 76 - return false; // L: 77 + Object var10 = class27.method433(class29.field172, var2, new Object[]{(new URL(class29.field172.getCodeBase(), var0)).toString()}); + return var10 != null; + } catch (Throwable var6) { + return false; } - } else if (var1 == 2) { // L: 80 + } else if (var1 == 2) { try { - class29.field172.getAppletContext().showDocument(new URL(class29.field172.getCodeBase(), var0), "_blank"); // L: 82 - return true; // L: 83 - } catch (Exception var7) { // L: 85 - return false; // L: 86 + class29.field172.getAppletContext().showDocument(new URL(class29.field172.getCodeBase(), var0), "_blank"); + return true; + } catch (Exception var7) { + return false; } - } else if (var1 == 3) { // L: 89 + } else if (var1 == 3) { try { - Applet var3 = class29.field172; // L: 91 - JSObject.getWindow(var3).call("loggedout", (Object[])null); // L: 94 - } catch (Throwable var9) { // L: 97 + Applet var3 = class29.field172; + JSObject.getWindow(var3).call("loggedout", (Object[])null); + } catch (Throwable var9) { } try { - class29.field172.getAppletContext().showDocument(new URL(class29.field172.getCodeBase(), var0), "_top"); // L: 99 - return true; // L: 100 - } catch (Exception var8) { // L: 102 - return false; // L: 103 + class29.field172.getAppletContext().showDocument(new URL(class29.field172.getCodeBase(), var0), "_top"); + return true; + } catch (Exception var8) { + return false; } } else { - throw new IllegalArgumentException(); // L: 106 + throw new IllegalArgumentException(); } } } diff --git a/runescape-client/src/main/java/NPCComposition.java b/runescape-client/src/main/java/NPCComposition.java index f980a41dea..a56bb97457 100644 --- a/runescape-client/src/main/java/NPCComposition.java +++ b/runescape-client/src/main/java/NPCComposition.java @@ -198,26 +198,26 @@ public class NPCComposition extends DualNode { this.idleSequence = -1; this.turnLeftSequence = -1; this.turnRightSequence = -1; - this.walkSequence = -1; // L: 28 - 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; // L: 50 - this.isFollower = false; // L: 51 - } // L: 54 + this.walkSequence = -1; + this.walkBackSequence = -1; + this.walkLeftSequence = -1; + this.walkRightSequence = -1; + this.actions = new String[5]; + this.drawMapDot = true; + this.combatLevel = -1; + this.widthScale = 128; + this.heightScale = 128; + this.isVisible = false; + this.ambient = 0; + this.contrast = 0; + this.headIconPrayer = -1; + this.rotation = 32; + this.transformVarbit = -1; + this.transformVarp = -1; + this.isInteractable = true; + this.isClickable = true; + this.isFollower = false; + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -226,7 +226,7 @@ public class NPCComposition extends DualNode { ) @Export("postDecode") void postDecode() { - } // L: 73 + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -236,12 +236,12 @@ public class NPCComposition extends DualNode { @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(); + if (var2 == 0) { + return; } - this.decodeNext(var1, var2); // L: 79 + this.decodeNext(var1, var2); } } @@ -254,123 +254,123 @@ public class NPCComposition extends DualNode { 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) { + var3 = var1.readUnsignedByte(); + this.models = new int[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 87 + for (var4 = 0; var4 < var3; ++var4) { this.models[var4] = var1.readUnsignedShort(); } - } else if (var2 == 2) { // L: 89 + } else if (var2 == 2) { this.name = var1.readStringCp1252NullTerminated(); - } else if (var2 == 12) { // L: 90 + } else if (var2 == 12) { this.size = var1.readUnsignedByte(); - } else if (var2 == 13) { // L: 91 + } else if (var2 == 13) { this.idleSequence = var1.readUnsignedShort(); - } else if (var2 == 14) { // L: 92 + } else if (var2 == 14) { this.walkSequence = var1.readUnsignedShort(); - } else if (var2 == 15) { // L: 93 + } else if (var2 == 15) { this.turnLeftSequence = var1.readUnsignedShort(); - } else if (var2 == 16) { // L: 94 + } else if (var2 == 16) { 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) { + this.walkSequence = var1.readUnsignedShort(); + this.walkBackSequence = var1.readUnsignedShort(); + this.walkLeftSequence = var1.readUnsignedShort(); + this.walkRightSequence = var1.readUnsignedShort(); + } else if (var2 == 18) { + var1.readUnsignedShort(); + } else if (var2 >= 30 && var2 < 35) { + this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); + if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { 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) { + var3 = var1.readUnsignedByte(); + this.recolorFrom = new short[var3]; + this.recolorTo = new short[var3]; - 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) { + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); + this.recolorTo[var4] = (short)var1.readUnsignedShort(); } - } 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) { + var3 = var1.readUnsignedByte(); + this.retextureFrom = new short[var3]; + this.retextureTo = new short[var3]; - 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) { + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); + this.retextureTo[var4] = (short)var1.readUnsignedShort(); } - } else if (var2 == 60) { // L: 126 - var3 = var1.readUnsignedByte(); // L: 127 - this.field1868 = new int[var3]; // L: 128 + } else if (var2 == 60) { + var3 = var1.readUnsignedByte(); + this.field1868 = new int[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 129 + for (var4 = 0; var4 < var3; ++var4) { this.field1868[var4] = var1.readUnsignedShort(); } - } else if (var2 == 93) { // L: 131 + } else if (var2 == 93) { this.drawMapDot = false; - } else if (var2 == 95) { // L: 132 + } else if (var2 == 95) { this.combatLevel = var1.readUnsignedShort(); - } else if (var2 == 97) { // L: 133 + } else if (var2 == 97) { this.widthScale = var1.readUnsignedShort(); - } else if (var2 == 98) { // L: 134 + } else if (var2 == 98) { this.heightScale = var1.readUnsignedShort(); - } else if (var2 == 99) { // L: 135 + } else if (var2 == 99) { this.isVisible = true; - } else if (var2 == 100) { // L: 136 + } else if (var2 == 100) { this.ambient = var1.readByte(); - } else if (var2 == 101) { // L: 137 + } else if (var2 == 101) { this.contrast = var1.readByte() * 5; - } else if (var2 == 102) { // L: 138 + } else if (var2 == 102) { this.headIconPrayer = var1.readUnsignedShort(); - } else if (var2 == 103) { // L: 139 + } else if (var2 == 103) { this.rotation = var1.readUnsignedShort(); - } else if (var2 != 106 && var2 != 118) { // L: 140 - if (var2 == 107) { // L: 158 + } else if (var2 != 106 && var2 != 118) { + if (var2 == 107) { this.isInteractable = false; - } else if (var2 == 109) { // L: 159 + } else if (var2 == 109) { this.isClickable = false; - } else if (var2 == 111) { // L: 160 + } else if (var2 == 111) { this.isFollower = true; - } else if (var2 == 249) { // L: 161 + } else if (var2 == 249) { this.params = Canvas.readStringIntParameters(var1, this.params); } } else { - this.transformVarbit = var1.readUnsignedShort(); // L: 141 + this.transformVarbit = var1.readUnsignedShort(); if (this.transformVarbit == 65535) { - this.transformVarbit = -1; // L: 142 + this.transformVarbit = -1; } - this.transformVarp = var1.readUnsignedShort(); // L: 143 - if (this.transformVarp == 65535) { // L: 144 + this.transformVarp = var1.readUnsignedShort(); + if (this.transformVarp == 65535) { this.transformVarp = -1; } - var3 = -1; // L: 145 - if (var2 == 118) { // L: 146 - var3 = var1.readUnsignedShort(); // L: 147 - if (var3 == 65535) { // L: 148 + var3 = -1; + if (var2 == 118) { + var3 = var1.readUnsignedShort(); + if (var3 == 65535) { var3 = -1; } } - var4 = var1.readUnsignedByte(); // L: 150 - this.transforms = new int[var4 + 2]; // L: 151 + var4 = var1.readUnsignedByte(); + this.transforms = new int[var4 + 2]; - 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) { + this.transforms[var5] = var1.readUnsignedShort(); + if (this.transforms[var5] == 65535) { this.transforms[var5] = -1; } } - this.transforms[var4 + 1] = var3; // L: 156 + this.transforms[var4 + 1] = var3; } - } // L: 163 + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -379,9 +379,9 @@ public class NPCComposition extends DualNode { ) @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 + if (this.transforms != null) { + NPCComposition var12 = this.transform(); + return var12 == null ? null : var12.getModel(var1, var2, var3, var4); } else { Model var5 = (Model)NpcDefinition_cachedModels.get((long)this.id); if (var5 == null) { @@ -393,56 +393,56 @@ public class NPCComposition extends DualNode { } } - if (var6) { // L: 175 + if (var6) { return null; } - ModelData[] var8 = new ModelData[this.models.length]; // L: 177 + ModelData[] var8 = new ModelData[this.models.length]; int var9; - for (var9 = 0; var9 < this.models.length; ++var9) { // L: 178 + for (var9 = 0; var9 < this.models.length; ++var9) { var8[var9] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.models[var9], 0); } ModelData var10; - if (var8.length == 1) { // L: 179 + if (var8.length == 1) { var10 = var8[0]; } else { - var10 = new ModelData(var8, var8.length); // L: 180 + var10 = new ModelData(var8, var8.length); } - 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) { + for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { + var10.recolor(this.recolorFrom[var9], this.recolorTo[var9]); } } - 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) { + for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { + var10.retexture(this.retextureFrom[var9], this.retextureTo[var9]); } } - 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); + NpcDefinition_cachedModels.put(var5, (long)this.id); } Model var11; - if (var1 != null && var3 != null) { // L: 195 + if (var1 != null && var3 != null) { var11 = var1.applyTransformations(var5, var2, var3, var4); - } else if (var1 != null) { // L: 196 + } else if (var1 != null) { var11 = var1.transformActorModel(var5, var2); - } else if (var3 != null) { // L: 197 + } else if (var3 != null) { var11 = var3.transformActorModel(var5, var4); } else { - var11 = var5.toSharedSequenceModel(true); // L: 198 + var11 = var5.toSharedSequenceModel(true); } - if (this.widthScale != 128 || this.heightScale != 128) { // L: 199 + if (this.widthScale != 128 || this.heightScale != 128) { var11.scale(this.widthScale, this.heightScale, this.widthScale); } - return var11; // L: 200 + return var11; } } @@ -453,50 +453,50 @@ public class NPCComposition extends DualNode { ) @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.field1868 == null) { // L: 209 + if (this.transforms != null) { + NPCComposition var7 = this.transform(); + return var7 == null ? null : var7.getModelData(); + } else if (this.field1868 == null) { return null; } else { - boolean var1 = false; // L: 210 + boolean var1 = false; - for (int var2 = 0; var2 < this.field1868.length; ++var2) { // L: 211 + for (int var2 = 0; var2 < this.field1868.length; ++var2) { if (!NpcDefinition_modelArchive.tryLoadFile(this.field1868[var2], 0)) { var1 = true; } } - if (var1) { // L: 212 + if (var1) { return null; } else { - ModelData[] var5 = new ModelData[this.field1868.length]; // L: 213 + ModelData[] var5 = new ModelData[this.field1868.length]; - for (int var3 = 0; var3 < this.field1868.length; ++var3) { // L: 214 + for (int var3 = 0; var3 < this.field1868.length; ++var3) { var5[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field1868[var3], 0); } ModelData var6; if (var5.length == 1) { - var6 = var5[0]; // L: 216 + var6 = var5[0]; } else { - var6 = new ModelData(var5, var5.length); // L: 217 + var6 = new ModelData(var5, var5.length); } 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) { + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { + var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); } } - 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) { + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { + var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); } } - return var6; // L: 228 + return var6; } } } @@ -508,21 +508,21 @@ public class NPCComposition extends DualNode { ) @Export("transform") public final NPCComposition transform() { - int var1 = -1; // L: 232 - if (this.transformVarbit != -1) { // L: 233 + int var1 = -1; + if (this.transformVarbit != -1) { var1 = class273.getVarbit(this.transformVarbit); - } else if (this.transformVarp != -1) { // L: 234 + } else if (this.transformVarp != -1) { 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) { + var2 = this.transforms[var1]; } else { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? WorldMapLabelSize.getNpcDefinition(var2) : null; // L: 238 239 + return var2 != -1 ? WorldMapLabelSize.getNpcDefinition(var2) : null; } @ObfuscatedName("n") @@ -532,18 +532,18 @@ public class NPCComposition extends DualNode { ) @Export("transformIsVisible") public boolean transformIsVisible() { - if (this.transforms == null) { // L: 243 + if (this.transforms == null) { return true; } else { - int var1 = -1; // L: 244 - if (this.transformVarbit != -1) { // L: 245 + int var1 = -1; + if (this.transformVarbit != -1) { var1 = class273.getVarbit(this.transformVarbit); - } else if (this.transformVarp != -1) { // L: 246 + } else if (this.transformVarp != -1) { 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) { + return this.transforms[var1] != -1; } else { return this.transforms[this.transforms.length - 1] != -1; } @@ -557,7 +557,7 @@ public class NPCComposition extends DualNode { ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return class12.method158(this.params, var1, var2); // L: 252 + return class12.method158(this.params, var1, var2); } @ObfuscatedName("o") @@ -567,7 +567,7 @@ public class NPCComposition extends DualNode { ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return Skeleton.method3948(this.params, var1, var2); // L: 256 + return Skeleton.method3948(this.params, var1, var2); } @ObfuscatedName("c") @@ -576,17 +576,17 @@ public class NPCComposition extends DualNode { garbageValue = "1930490534" ) static void method3321(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 + ArchiveDiskAction var3 = new ArchiveDiskAction(); + var3.type = 0; + var3.key = (long)var0; + var3.data = var1; + var3.archiveDisk = var2; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); + } - class174.method3383(); // L: 26 - } // L: 27 + class174.method3383(); + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -595,14 +595,14 @@ public class NPCComposition extends DualNode { ) @Export("isKeyDown") public static final boolean isKeyDown() { - synchronized(KeyHandler.KeyHandler_instance) { // L: 169 - if (KeyHandler.field143 == KeyHandler.field145) { // L: 170 + synchronized(KeyHandler.KeyHandler_instance) { + if (KeyHandler.field143 == KeyHandler.field145) { return false; } else { - Players.field1247 = KeyHandler.field131[KeyHandler.field143]; // L: 171 - ModeWhere.field3954 = KeyHandler.field137[KeyHandler.field143]; // L: 172 - KeyHandler.field143 = KeyHandler.field143 + 1 & 127; // L: 173 - return true; // L: 174 + Players.field1247 = KeyHandler.field131[KeyHandler.field143]; + ModeWhere.field3954 = KeyHandler.field137[KeyHandler.field143]; + KeyHandler.field143 = KeyHandler.field143 + 1 & 127; + return true; } } } diff --git a/runescape-client/src/main/java/NanoClock.java b/runescape-client/src/main/java/NanoClock.java index f48f9b4ad5..46de53804d 100644 --- a/runescape-client/src/main/java/NanoClock.java +++ b/runescape-client/src/main/java/NanoClock.java @@ -15,8 +15,8 @@ public class NanoClock extends Clock { long lastTimeNano; public NanoClock() { - this.lastTimeNano = System.nanoTime(); // L: 10 - } // L: 11 + this.lastTimeNano = System.nanoTime(); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -25,8 +25,8 @@ public class NanoClock extends Clock { ) @Export("mark") public void mark() { - this.lastTimeNano = System.nanoTime(); // L: 14 - } // L: 15 + this.lastTimeNano = System.nanoTime(); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -35,24 +35,24 @@ public class NanoClock extends Clock { ) @Export("wait") public int wait(int var1, int var2) { - long var3 = 1000000L * (long)var2; // L: 18 - long var5 = this.lastTimeNano - System.nanoTime(); // L: 19 - if (var5 < var3) { // L: 20 + long var3 = 1000000L * (long)var2; + long var5 = this.lastTimeNano - System.nanoTime(); + if (var5 < var3) { var5 = var3; } - Bounds.method6608(var5 / 1000000L); // L: 21 - long var7 = System.nanoTime(); // L: 22 + Bounds.method6608(var5 / 1000000L); + long var7 = System.nanoTime(); int var9; - for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += 1000000L * (long)var1) { // L: 23 24 26 - ++var9; // L: 25 + for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += 1000000L * (long)var1) { + ++var9; } - if (this.lastTimeNano < var7) { // L: 28 + if (this.lastTimeNano < var7) { this.lastTimeNano = var7; } - return var9; // L: 29 + return var9; } } diff --git a/runescape-client/src/main/java/NetCache.java b/runescape-client/src/main/java/NetCache.java index fcb128973f..c24185e23a 100644 --- a/runescape-client/src/main/java/NetCache.java +++ b/runescape-client/src/main/java/NetCache.java @@ -110,22 +110,22 @@ public class NetCache { public static int NetCache_ioExceptions; static { - NetCache_loadTime = 0; // L: 13 - NetCache_pendingPriorityWrites = new NodeHashTable(4096); // L: 15 - NetCache_pendingPriorityWritesCount = 0; // L: 16 - NetCache_pendingPriorityResponses = new NodeHashTable(32); // L: 17 - NetCache_pendingPriorityResponsesCount = 0; // L: 18 - NetCache_pendingWritesQueue = new DualNodeDeque(); // L: 19 - NetCache_pendingWrites = new NodeHashTable(4096); // L: 20 - NetCache_pendingWritesCount = 0; // L: 21 - NetCache_pendingResponses = new NodeHashTable(4096); // L: 22 - NetCache_pendingResponsesCount = 0; // L: 23 - NetCache_responseHeaderBuffer = new Buffer(8); // L: 26 - field3863 = 0; // L: 28 - NetCache_crc = new CRC32(); // L: 30 - NetCache_archives = new Archive[256]; // L: 32 - field3866 = 0; // L: 33 - NetCache_crcMismatches = 0; // L: 34 - NetCache_ioExceptions = 0; // L: 35 + NetCache_loadTime = 0; + NetCache_pendingPriorityWrites = new NodeHashTable(4096); + NetCache_pendingPriorityWritesCount = 0; + NetCache_pendingPriorityResponses = new NodeHashTable(32); + NetCache_pendingPriorityResponsesCount = 0; + NetCache_pendingWritesQueue = new DualNodeDeque(); + NetCache_pendingWrites = new NodeHashTable(4096); + NetCache_pendingWritesCount = 0; + NetCache_pendingResponses = new NodeHashTable(4096); + NetCache_pendingResponsesCount = 0; + NetCache_responseHeaderBuffer = new Buffer(8); + field3863 = 0; + NetCache_crc = new CRC32(); + NetCache_archives = new Archive[256]; + field3866 = 0; + NetCache_crcMismatches = 0; + NetCache_ioExceptions = 0; } } diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java index 8b6634c144..965de1773f 100644 --- a/runescape-client/src/main/java/NetFileRequest.java +++ b/runescape-client/src/main/java/NetFileRequest.java @@ -25,7 +25,7 @@ public class NetFileRequest extends DualNode { byte padding; NetFileRequest() { - } // L: 10 + } @ObfuscatedName("d") @ObfuscatedSignature( @@ -33,27 +33,27 @@ public class NetFileRequest extends DualNode { garbageValue = "-77" ) static int method5588(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; // L: 1084 - if (var0 == ScriptOpcodes.CC_GETX) { // L: 1085 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.x; // L: 1086 - return 1; // L: 1087 - } else if (var0 == ScriptOpcodes.CC_GETY) { // L: 1089 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.y; // L: 1090 - return 1; // L: 1091 - } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { // L: 1093 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.width; // L: 1094 - return 1; // L: 1095 - } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { // L: 1097 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.height; // L: 1098 - return 1; // L: 1099 - } else if (var0 == ScriptOpcodes.CC_GETHIDE) { // L: 1101 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1102 - return 1; // L: 1103 - } else if (var0 == ScriptOpcodes.CC_GETLAYER) { // L: 1105 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.parentId; // L: 1106 - return 1; // L: 1107 + Widget var3 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; + if (var0 == ScriptOpcodes.CC_GETX) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.x; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETY) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.y; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.width; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.height; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETHIDE) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETLAYER) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.parentId; + return 1; } else { - return 2; // L: 1109 + return 2; } } @@ -63,8 +63,8 @@ public class NetFileRequest extends DualNode { garbageValue = "-1653414496" ) static void method5587(Archive var0, String var1) { - ArchiveLoader var2 = new ArchiveLoader(var0, var1); // L: 2153 - Client.archiveLoaders.add(var2); // L: 2154 - Client.field753 += var2.groupCount; // L: 2155 - } // L: 2156 + ArchiveLoader var2 = new ArchiveLoader(var0, var1); + Client.archiveLoaders.add(var2); + Client.field753 += var2.groupCount; + } } diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java index 67778fbbd4..51b30d823d 100644 --- a/runescape-client/src/main/java/NetSocket.java +++ b/runescape-client/src/main/java/NetSocket.java @@ -77,14 +77,14 @@ public final class NetSocket extends AbstractSocket implements Runnable { descriptor = "(Ljava/net/Socket;Leb;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.isClosed = false; + this.outLength = 0; + this.outOffset = 0; + this.exceptionWriting = false; this.taskHandler = var2; - this.socket = var1; // L: 29 - this.bufferLength = var3; // L: 30 - this.maxPacketLength = var3 - 100; // L: 31 + this.socket = var1; + this.bufferLength = var3; + this.maxPacketLength = var3 - 100; this.socket.setSoTimeout(30000); this.socket.setTcpNoDelay(true); this.socket.setReceiveBufferSize(65536); @@ -100,28 +100,28 @@ public final class NetSocket extends AbstractSocket implements Runnable { ) @Export("close") public void close() { - if (!this.isClosed) { // L: 41 - synchronized(this) { // L: 42 - this.isClosed = true; // L: 43 - this.notifyAll(); // L: 44 - } // L: 45 + if (!this.isClosed) { + synchronized(this) { + this.isClosed = true; + this.notifyAll(); + } - if (this.task != null) { // L: 46 - while (this.task.status == 0) { // L: 47 - Bounds.method6608(1L); // L: 48 + if (this.task != null) { + while (this.task.status == 0) { + Bounds.method6608(1L); } - if (this.task.status == 1) { // L: 50 + if (this.task.status == 1) { try { - ((Thread)this.task.result).join(); // L: 52 - } catch (InterruptedException var3) { // L: 54 + ((Thread)this.task.result).join(); + } catch (InterruptedException var3) { } } } - this.task = null; // L: 57 + this.task = null; } - } // L: 58 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -130,7 +130,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { - return this.isClosed ? 0 : this.inputStream.read(); // L: 65 66 + return this.isClosed ? 0 : this.inputStream.read(); } @ObfuscatedName("p") @@ -140,7 +140,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { ) @Export("available") public int available() throws IOException { - return this.isClosed ? 0 : this.inputStream.available(); // L: 70 71 + return this.isClosed ? 0 : this.inputStream.available(); } @ObfuscatedName("m") @@ -150,10 +150,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { - if (this.isClosed) { // L: 75 + if (this.isClosed) { return false; } else { - return this.inputStream.available() >= var1; // L: 76 + return this.inputStream.available() >= var1; } } @@ -164,21 +164,21 @@ public final class NetSocket extends AbstractSocket implements Runnable { ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { - if (this.isClosed) { // L: 80 + if (this.isClosed) { return 0; } else { int var4; 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 + for (var4 = var3; var3 > 0; var3 -= var5) { + var5 = this.inputStream.read(var1, var2, var3); + if (var5 <= 0) { throw new EOFException(); } - var2 += var5; // L: 85 + var2 += var5; } - return var4; // L: 88 + return var4; } } @@ -189,33 +189,33 @@ public final class NetSocket extends AbstractSocket implements Runnable { ) @Export("write0") void write0(byte[] var1, int var2, int var3) throws IOException { - if (!this.isClosed) { // L: 92 - if (this.exceptionWriting) { // L: 93 - this.exceptionWriting = false; // L: 94 - throw new IOException(); // L: 95 + if (!this.isClosed) { + if (this.exceptionWriting) { + this.exceptionWriting = false; + throw new IOException(); } else { - if (this.outBuffer == null) { // L: 97 + if (this.outBuffer == null) { this.outBuffer = new byte[this.bufferLength]; } - synchronized(this) { // L: 98 - for (int var5 = 0; var5 < var3; ++var5) { // L: 99 - this.outBuffer[this.outOffset] = var1[var5 + var2]; // L: 100 - this.outOffset = (this.outOffset + 1) % this.bufferLength; // L: 101 - if ((this.maxPacketLength + this.outLength) % this.bufferLength == this.outOffset) { // L: 102 - throw new IOException(); // L: 103 + synchronized(this) { + for (int var5 = 0; var5 < var3; ++var5) { + this.outBuffer[this.outOffset] = var1[var5 + var2]; + this.outOffset = (this.outOffset + 1) % this.bufferLength; + if ((this.maxPacketLength + this.outLength) % this.bufferLength == this.outOffset) { + throw new IOException(); } } - if (this.task == null) { // L: 106 - this.task = this.taskHandler.newThreadTask(this, 3); // L: 107 + if (this.task == null) { + this.task = this.taskHandler.newThreadTask(this, 3); } - this.notifyAll(); // L: 109 + this.notifyAll(); } } } - } // L: 111 + } @ObfuscatedName("j") @ObfuscatedSignature( @@ -224,8 +224,8 @@ public final class NetSocket extends AbstractSocket implements Runnable { ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { - this.write0(var1, var2, var3); // L: 161 - } // L: 162 + this.write0(var1, var2, var3); + } public void run() { try { @@ -233,75 +233,75 @@ public final class NetSocket extends AbstractSocket implements Runnable { label84: { int var1; int var2; - synchronized(this) { // L: 118 - if (this.outOffset == this.outLength) { // L: 119 - if (this.isClosed) { // L: 120 + synchronized(this) { + if (this.outOffset == this.outLength) { + if (this.isClosed) { break label84; } try { - this.wait(); // L: 122 - } catch (InterruptedException var10) { // L: 124 + this.wait(); + } catch (InterruptedException var10) { } } - var2 = this.outLength; // L: 126 - if (this.outOffset >= this.outLength) { // L: 127 + var2 = this.outLength; + if (this.outOffset >= this.outLength) { var1 = this.outOffset - this.outLength; } else { - var1 = this.bufferLength - this.outLength; // L: 128 + var1 = this.bufferLength - this.outLength; } } - if (var1 <= 0) { // L: 130 + if (var1 <= 0) { continue; } try { - this.outputStream.write(this.outBuffer, var2, var1); // L: 132 - } catch (IOException var9) { // L: 134 - this.exceptionWriting = true; // L: 135 + this.outputStream.write(this.outBuffer, var2, var1); + } catch (IOException var9) { + this.exceptionWriting = true; } - this.outLength = (var1 + this.outLength) % this.bufferLength; // L: 137 + this.outLength = (var1 + this.outLength) % this.bufferLength; try { - if (this.outLength == this.outOffset) { // L: 139 + if (this.outLength == this.outOffset) { this.outputStream.flush(); } - } catch (IOException var8) { // L: 141 - this.exceptionWriting = true; // L: 142 + } catch (IOException var8) { + this.exceptionWriting = true; } continue; } try { - if (this.inputStream != null) { // L: 147 + if (this.inputStream != null) { this.inputStream.close(); } - if (this.outputStream != null) { // L: 148 + if (this.outputStream != null) { this.outputStream.close(); } - if (this.socket != null) { // L: 149 + if (this.socket != null) { this.socket.close(); } - } catch (IOException var7) { // L: 151 + } catch (IOException var7) { } - this.outBuffer = null; // L: 152 + this.outBuffer = null; break; } - } catch (Exception var12) { // L: 154 - AccessFile.RunException_sendStackTrace((String)null, var12); // L: 155 + } catch (Exception var12) { + AccessFile.RunException_sendStackTrace((String)null, var12); } - } // L: 157 + } protected void finalize() { - this.close(); // L: 61 - } // L: 62 + this.close(); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -309,7 +309,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { garbageValue = "320078998" ) static final boolean method3119(char var0) { - return var0 == 160 || var0 == ' ' || var0 == '_' || var0 == '-'; // L: 28 + return var0 == 160 || var0 == ' ' || var0 == '_' || var0 == '-'; } @ObfuscatedName("b") @@ -318,12 +318,12 @@ public final class NetSocket extends AbstractSocket implements Runnable { garbageValue = "1774445817" ) public static void method3118(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { - class260.musicPlayerStatus = 1; // L: 32 - class124.musicTrackArchive = var0; // L: 33 - VarcInt.musicTrackGroupId = var1; // L: 34 - class260.musicTrackFileId = var2; // L: 35 - ChatChannel.musicTrackVolume = var3; // L: 36 - DynamicObject.musicTrackBoolean = var4; // L: 37 - class260.pcmSampleLength = 10000; // L: 38 - } // L: 39 + class260.musicPlayerStatus = 1; + class124.musicTrackArchive = var0; + VarcInt.musicTrackGroupId = var1; + class260.musicTrackFileId = var2; + ChatChannel.musicTrackVolume = var3; + DynamicObject.musicTrackBoolean = var4; + class260.pcmSampleLength = 10000; + } } diff --git a/runescape-client/src/main/java/Node.java b/runescape-client/src/main/java/Node.java index 703dc59e96..a614569be7 100644 --- a/runescape-client/src/main/java/Node.java +++ b/runescape-client/src/main/java/Node.java @@ -25,17 +25,17 @@ public class Node { @ObfuscatedName("fe") @Export("remove") public void remove() { - if (this.next != null) { // L: 9 - this.next.previous = this.previous; // L: 10 - this.previous.next = this.next; // L: 11 - this.previous = null; // L: 12 - this.next = null; // L: 13 + if (this.next != null) { + this.next.previous = this.previous; + this.previous.next = this.next; + this.previous = null; + this.next = null; } - } // L: 14 + } @ObfuscatedName("fu") @Export("hasNext") public boolean hasNext() { - return this.next != null; // L: 17 + return this.next != null; } } diff --git a/runescape-client/src/main/java/NodeDeque.java b/runescape-client/src/main/java/NodeDeque.java index a6721b9d47..c6574dc705 100644 --- a/runescape-client/src/main/java/NodeDeque.java +++ b/runescape-client/src/main/java/NodeDeque.java @@ -20,22 +20,22 @@ public class NodeDeque { Node current; public NodeDeque() { - this.sentinel = new Node(); // L: 6 - this.sentinel.previous = this.sentinel; // L: 10 - this.sentinel.next = this.sentinel; // L: 11 - } // L: 12 + this.sentinel = new Node(); + this.sentinel.previous = this.sentinel; + this.sentinel.next = this.sentinel; + } @ObfuscatedName("c") @Export("clear") public void clear() { while (true) { - Node var1 = this.sentinel.previous; // L: 16 - if (var1 == this.sentinel) { // L: 17 - this.current = null; // L: 20 - return; // L: 21 + Node var1 = this.sentinel.previous; + if (var1 == this.sentinel) { + this.current = null; + return; } - var1.remove(); // L: 18 + var1.remove(); } } @@ -45,15 +45,15 @@ public class NodeDeque { ) @Export("addFirst") public void addFirst(Node var1) { - if (var1.next != null) { // L: 24 + if (var1.next != null) { var1.remove(); } - var1.next = this.sentinel.next; // L: 25 - var1.previous = this.sentinel; // L: 26 - var1.next.previous = var1; // L: 27 - var1.previous.next = var1; // L: 28 - } // L: 29 + var1.next = this.sentinel.next; + var1.previous = this.sentinel; + var1.next.previous = var1; + var1.previous.next = var1; + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -61,15 +61,15 @@ public class NodeDeque { ) @Export("addLast") public void addLast(Node var1) { - if (var1.next != null) { // L: 32 + if (var1.next != null) { var1.remove(); } - var1.next = this.sentinel; // L: 33 - var1.previous = this.sentinel.previous; // L: 34 - var1.next.previous = var1; // L: 35 - var1.previous.next = var1; // L: 36 - } // L: 37 + var1.next = this.sentinel; + var1.previous = this.sentinel.previous; + var1.next.previous = var1; + var1.previous.next = var1; + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -77,12 +77,12 @@ public class NodeDeque { ) @Export("removeLast") public Node removeLast() { - Node var1 = this.sentinel.previous; // L: 48 + Node var1 = this.sentinel.previous; if (var1 == this.sentinel) { - return null; // L: 49 + return null; } else { - var1.remove(); // L: 50 - return var1; // L: 51 + var1.remove(); + return var1; } } @@ -92,12 +92,12 @@ public class NodeDeque { ) @Export("removeFirst") public Node removeFirst() { - Node var1 = this.sentinel.next; // L: 55 + Node var1 = this.sentinel.next; if (var1 == this.sentinel) { - return null; // L: 56 + return null; } else { - var1.remove(); // L: 57 - return var1; // L: 58 + var1.remove(); + return var1; } } @@ -107,13 +107,13 @@ public class NodeDeque { ) @Export("last") public Node last() { - Node var1 = this.sentinel.previous; // L: 62 - if (var1 == this.sentinel) { // L: 63 - this.current = null; // L: 64 - return null; // L: 65 + Node var1 = this.sentinel.previous; + if (var1 == this.sentinel) { + this.current = null; + return null; } else { - this.current = var1.previous; // L: 67 - return var1; // L: 68 + this.current = var1.previous; + return var1; } } @@ -123,13 +123,13 @@ public class NodeDeque { ) @Export("first") public Node first() { - Node var1 = this.sentinel.next; // L: 72 - if (var1 == this.sentinel) { // L: 73 - this.current = null; // L: 74 - return null; // L: 75 + Node var1 = this.sentinel.next; + if (var1 == this.sentinel) { + this.current = null; + return null; } else { - this.current = var1.next; // L: 77 - return var1; // L: 78 + this.current = var1.next; + return var1; } } @@ -139,13 +139,13 @@ public class NodeDeque { ) @Export("previous") public Node previous() { - Node var1 = this.current; // L: 82 - if (var1 == this.sentinel) { // L: 83 - this.current = null; // L: 84 - return null; // L: 85 + Node var1 = this.current; + if (var1 == this.sentinel) { + this.current = null; + return null; } else { - this.current = var1.previous; // L: 87 - return var1; // L: 88 + this.current = var1.previous; + return var1; } } @@ -155,13 +155,13 @@ public class NodeDeque { ) @Export("next") public Node next() { - Node var1 = this.current; // L: 92 - if (var1 == this.sentinel) { // L: 93 - this.current = null; // L: 94 - return null; // L: 95 + Node var1 = this.current; + if (var1 == this.sentinel) { + this.current = null; + return null; } else { - this.current = var1.next; // L: 97 - return var1; // L: 98 + this.current = var1.next; + return var1; } } @@ -171,13 +171,13 @@ public class NodeDeque { ) @Export("NodeDeque_addBefore") public static void NodeDeque_addBefore(Node var0, Node var1) { - if (var0.next != null) { // L: 40 + if (var0.next != null) { var0.remove(); } - var0.next = var1.next; // L: 41 - var0.previous = var1; // L: 42 - var0.next.previous = var0; // L: 43 - var0.previous.next = var0; // L: 44 - } // L: 45 + var0.next = var1.next; + var0.previous = var1; + var0.next.previous = var0; + var0.previous.next = var0; + } } diff --git a/runescape-client/src/main/java/NodeHashTable.java b/runescape-client/src/main/java/NodeHashTable.java index 88aedca631..90107ff6c8 100644 --- a/runescape-client/src/main/java/NodeHashTable.java +++ b/runescape-client/src/main/java/NodeHashTable.java @@ -32,17 +32,17 @@ public final class NodeHashTable { int index; public NodeHashTable(int var1) { - this.index = 0; // L: 10 - this.size = var1; // L: 13 - this.buckets = new Node[var1]; // L: 14 + this.index = 0; + this.size = var1; + this.buckets = new Node[var1]; - for (int var2 = 0; var2 < var1; ++var2) { // L: 15 - Node var3 = this.buckets[var2] = new Node(); // L: 16 - var3.previous = var3; // L: 17 - var3.next = var3; // L: 18 + for (int var2 = 0; var2 < var1; ++var2) { + Node var3 = this.buckets[var2] = new Node(); + var3.previous = var3; + var3.next = var3; } - } // L: 20 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -50,18 +50,18 @@ public final class NodeHashTable { ) @Export("get") public Node get(long var1) { - Node var3 = this.buckets[(int)(var1 & (long)(this.size - 1))]; // L: 23 + Node var3 = this.buckets[(int)(var1 & (long)(this.size - 1))]; - for (this.currentGet = var3.previous; var3 != this.currentGet; this.currentGet = this.currentGet.previous) { // L: 24 25 31 - if (this.currentGet.key == var1) { // L: 26 - Node var4 = this.currentGet; // L: 27 - this.currentGet = this.currentGet.previous; // L: 28 - return var4; // L: 29 + for (this.currentGet = var3.previous; var3 != this.currentGet; this.currentGet = this.currentGet.previous) { + if (this.currentGet.key == var1) { + Node var4 = this.currentGet; + this.currentGet = this.currentGet.previous; + return var4; } } - this.currentGet = null; // L: 33 - return null; // L: 34 + this.currentGet = null; + return null; } @ObfuscatedName("b") @@ -70,17 +70,17 @@ public final class NodeHashTable { ) @Export("put") public void put(Node var1, long var2) { - if (var1.next != null) { // L: 38 + if (var1.next != null) { var1.remove(); } - Node var4 = this.buckets[(int)(var2 & (long)(this.size - 1))]; // L: 39 - var1.next = var4.next; // L: 40 - var1.previous = var4; // L: 41 - var1.next.previous = var1; // L: 42 - var1.previous.next = var1; // L: 43 - var1.key = var2; // L: 44 - } // L: 45 + Node var4 = this.buckets[(int)(var2 & (long)(this.size - 1))]; + var1.next = var4.next; + var1.previous = var4; + var1.next.previous = var1; + var1.previous.next = var1; + var1.key = var2; + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -88,8 +88,8 @@ public final class NodeHashTable { ) @Export("first") public Node first() { - this.index = 0; // L: 48 - return this.next(); // L: 49 + this.index = 0; + return this.next(); } @ObfuscatedName("m") @@ -99,21 +99,21 @@ public final class NodeHashTable { @Export("next") public Node next() { Node var1; - if (this.index > 0 && this.buckets[this.index - 1] != this.current) { // L: 53 - var1 = this.current; // L: 54 - this.current = var1.previous; // L: 55 - return var1; // L: 56 + if (this.index > 0 && this.buckets[this.index - 1] != this.current) { + var1 = this.current; + this.current = var1.previous; + return var1; } else { do { - if (this.index >= this.size) { // L: 58 - return null; // L: 65 + if (this.index >= this.size) { + return null; } - var1 = this.buckets[this.index++].previous; // L: 59 - } while(var1 == this.buckets[this.index - 1]); // L: 60 + var1 = this.buckets[this.index++].previous; + } while(var1 == this.buckets[this.index - 1]); - this.current = var1.previous; // L: 61 - return var1; // L: 62 + this.current = var1.previous; + return var1; } } } diff --git a/runescape-client/src/main/java/ObjectComposition.java b/runescape-client/src/main/java/ObjectComposition.java index 823bbc1bc4..7ec9123cdf 100644 --- a/runescape-client/src/main/java/ObjectComposition.java +++ b/runescape-client/src/main/java/ObjectComposition.java @@ -263,50 +263,50 @@ public class ObjectComposition extends DualNode { IterableNodeHashTable params; static { - ObjectDefinition_isLowDetail = false; // L: 17 - 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 - field1957 = new ModelData[4]; // L: 24 + ObjectDefinition_isLowDetail = false; + ObjectDefinition_cached = new EvictingDualNodeHashTable(4096); + ObjectDefinition_cachedModelData = new EvictingDualNodeHashTable(500); + ObjectDefinition_cachedEntities = new EvictingDualNodeHashTable(30); + ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30); + field1957 = new ModelData[4]; } ObjectComposition() { - this.name = "null"; // L: 28 - this.sizeX = 1; // L: 33 - this.sizeY = 1; // L: 34 - this.interactType = 2; // L: 35 - this.boolean1 = true; // L: 36 - this.int1 = -1; // L: 37 - this.clipType = -1; // L: 38 - this.nonFlatShading = false; // L: 39 - this.modelClipped = false; // L: 40 - this.animationId = -1; // L: 41 - this.int2 = 16; // L: 42 - this.ambient = 0; // L: 43 + this.name = "null"; + this.sizeX = 1; + this.sizeY = 1; + this.interactType = 2; + this.boolean1 = true; + this.int1 = -1; + this.clipType = -1; + this.nonFlatShading = false; + this.modelClipped = false; + this.animationId = -1; + this.int2 = 16; + this.ambient = 0; this.contrast = 0; this.actions = new String[5]; - this.mapIconId = -1; // L: 46 + this.mapIconId = -1; this.mapSceneId = -1; - this.isRotated = false; // L: 48 - this.clipped = true; // L: 49 - this.modelSizeX = 128; // L: 50 - this.modelHeight = 128; // L: 51 - this.modelSizeY = 128; // L: 52 - this.offsetX = 0; // L: 53 - this.offsetHeight = 0; // L: 54 - this.offsetY = 0; // L: 55 - this.boolean2 = false; // L: 56 + this.isRotated = false; + this.clipped = true; + this.modelSizeX = 128; + this.modelHeight = 128; + this.modelSizeY = 128; + this.offsetX = 0; + this.offsetHeight = 0; + this.offsetY = 0; + this.boolean2 = false; this.isSolid = false; this.int3 = -1; - this.transformVarbit = -1; // L: 60 - this.transformVarp = -1; // L: 61 - 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 + this.transformVarbit = -1; + this.transformVarp = -1; + this.ambientSoundId = -1; + this.int7 = 0; + this.int5 = 0; + this.int6 = 0; + this.boolean3 = true; + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -315,24 +315,24 @@ public class ObjectComposition extends DualNode { ) @Export("postDecode") void postDecode() { - if (this.int1 == -1) { // L: 95 - this.int1 = 0; // L: 96 - if (this.modelIds != null && (this.models == null || this.models[0] == 10)) { // L: 97 + if (this.int1 == -1) { + this.int1 = 0; + if (this.modelIds != null && (this.models == null || this.models[0] == 10)) { this.int1 = 1; } - for (int var1 = 0; var1 < 5; ++var1) { // L: 98 + for (int var1 = 0; var1 < 5; ++var1) { if (this.actions[var1] != null) { this.int1 = 1; } } } - if (this.int3 == -1) { // L: 100 + if (this.int3 == -1) { this.int3 = this.interactType != 0 ? 1 : 0; } - } // L: 101 + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -342,12 +342,12 @@ public class ObjectComposition extends DualNode { @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 105 - if (var2 == 0) { // L: 106 - return; // L: 109 + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; } - this.decodeNext(var1, var2); // L: 107 + this.decodeNext(var1, var2); } } @@ -360,174 +360,174 @@ public class ObjectComposition extends DualNode { void decodeNext(Buffer var1, int var2) { int var3; int var4; - 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 + if (var2 == 1) { + var3 = var1.readUnsignedByte(); + if (var3 > 0) { + if (this.modelIds != null && !ObjectDefinition_isLowDetail) { + var1.offset += 3 * var3; } else { - this.models = new int[var3]; // L: 116 - this.modelIds = new int[var3]; // L: 117 + this.models = new int[var3]; + this.modelIds = new int[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 118 - this.modelIds[var4] = var1.readUnsignedShort(); // L: 119 - this.models[var4] = var1.readUnsignedByte(); // L: 120 + for (var4 = 0; var4 < var3; ++var4) { + this.modelIds[var4] = var1.readUnsignedShort(); + this.models[var4] = var1.readUnsignedByte(); } } } - } else if (var2 == 2) { // L: 126 + } else if (var2 == 2) { this.name = var1.readStringCp1252NullTerminated(); - } 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 if (var2 == 5) { + var3 = var1.readUnsignedByte(); + if (var3 > 0) { + if (this.modelIds != null && !ObjectDefinition_isLowDetail) { + var1.offset += var3 * 2; } else { - this.models = null; // L: 131 - this.modelIds = new int[var3]; // L: 132 + this.models = null; + this.modelIds = new int[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 133 + for (var4 = 0; var4 < var3; ++var4) { this.modelIds[var4] = var1.readUnsignedShort(); } } } - } else if (var2 == 14) { // L: 138 + } else if (var2 == 14) { this.sizeX = var1.readUnsignedByte(); - } else if (var2 == 15) { // L: 139 + } else if (var2 == 15) { this.sizeY = var1.readUnsignedByte(); - } else if (var2 == 17) { // L: 140 - this.interactType = 0; // L: 141 - this.boolean1 = false; // L: 142 - } else if (var2 == 18) { // L: 144 + } else if (var2 == 17) { + this.interactType = 0; this.boolean1 = false; - } else if (var2 == 19) { // L: 145 + } else if (var2 == 18) { + this.boolean1 = false; + } else if (var2 == 19) { this.int1 = var1.readUnsignedByte(); - } else if (var2 == 21) { // L: 146 + } else if (var2 == 21) { this.clipType = 0; - } else if (var2 == 22) { // L: 147 + } else if (var2 == 22) { this.nonFlatShading = true; - } else if (var2 == 23) { // L: 148 + } else if (var2 == 23) { this.modelClipped = true; - } else if (var2 == 24) { // L: 149 - this.animationId = var1.readUnsignedShort(); // L: 150 - if (this.animationId == 65535) { // L: 151 + } else if (var2 == 24) { + this.animationId = var1.readUnsignedShort(); + if (this.animationId == 65535) { this.animationId = -1; } - } else if (var2 == 27) { // L: 153 + } else if (var2 == 27) { this.interactType = 1; - } else if (var2 == 28) { // L: 154 + } else if (var2 == 28) { this.int2 = var1.readUnsignedByte(); - } else if (var2 == 29) { // L: 155 + } else if (var2 == 29) { this.ambient = var1.readByte(); - } else if (var2 == 39) { // L: 156 + } else if (var2 == 39) { this.contrast = var1.readByte() * 25; - } 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 + } else if (var2 >= 30 && var2 < 35) { + this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); + if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { this.actions[var2 - 30] = null; } - } 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 + } else if (var2 == 40) { + var3 = var1.readUnsignedByte(); + this.recolorFrom = new short[var3]; + this.recolorTo = new short[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 165 - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 166 - this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 167 + for (var4 = 0; var4 < var3; ++var4) { + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); + this.recolorTo[var4] = (short)var1.readUnsignedShort(); } - } 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 + } else if (var2 == 41) { + var3 = var1.readUnsignedByte(); + this.retextureFrom = new short[var3]; + this.retextureTo = new short[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 174 - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 175 - this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 176 + for (var4 = 0; var4 < var3; ++var4) { + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); + this.retextureTo[var4] = (short)var1.readUnsignedShort(); } - } else if (var2 == 61) { // L: 179 - var1.readUnsignedShort(); // L: 180 - } else if (var2 == 62) { // L: 182 + } else if (var2 == 61) { + var1.readUnsignedShort(); + } else if (var2 == 62) { this.isRotated = true; - } else if (var2 == 64) { // L: 183 + } else if (var2 == 64) { this.clipped = false; - } else if (var2 == 65) { // L: 184 + } else if (var2 == 65) { this.modelSizeX = var1.readUnsignedShort(); - } else if (var2 == 66) { // L: 185 + } else if (var2 == 66) { this.modelHeight = var1.readUnsignedShort(); - } else if (var2 == 67) { // L: 186 + } else if (var2 == 67) { this.modelSizeY = var1.readUnsignedShort(); - } else if (var2 == 68) { // L: 187 + } else if (var2 == 68) { this.mapSceneId = var1.readUnsignedShort(); - } else if (var2 == 69) { // L: 188 - var1.readUnsignedByte(); // L: 189 - } else if (var2 == 70) { // L: 191 + } else if (var2 == 69) { + var1.readUnsignedByte(); + } else if (var2 == 70) { this.offsetX = var1.readShort(); - } else if (var2 == 71) { // L: 192 + } else if (var2 == 71) { this.offsetHeight = var1.readShort(); } else if (var2 == 72) { - this.offsetY = var1.readShort(); // L: 193 - } else if (var2 == 73) { // L: 194 + this.offsetY = var1.readShort(); + } else if (var2 == 73) { this.boolean2 = true; - } else if (var2 == 74) { // L: 195 + } else if (var2 == 74) { this.isSolid = true; - } else if (var2 == 75) { // L: 196 + } else if (var2 == 75) { this.int3 = var1.readUnsignedByte(); - } 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 + } else if (var2 != 77 && var2 != 92) { + if (var2 == 78) { + this.ambientSoundId = var1.readUnsignedShort(); + this.int7 = var1.readUnsignedByte(); + } else if (var2 == 79) { + this.int5 = var1.readUnsignedShort(); + this.int6 = var1.readUnsignedShort(); + this.int7 = var1.readUnsignedByte(); + var3 = var1.readUnsignedByte(); + this.soundEffectIds = new int[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 225 + for (var4 = 0; var4 < var3; ++var4) { this.soundEffectIds[var4] = var1.readUnsignedShort(); } - } else if (var2 == 81) { // L: 227 + } else if (var2 == 81) { this.clipType = var1.readUnsignedByte() * 256; - } else if (var2 == 82) { // L: 228 + } else if (var2 == 82) { this.mapIconId = var1.readUnsignedShort(); - } else if (var2 == 89) { // L: 229 + } else if (var2 == 89) { this.boolean3 = false; - } else if (var2 == 249) { // L: 230 + } else if (var2 == 249) { this.params = Canvas.readStringIntParameters(var1, this.params); } } else { - this.transformVarbit = var1.readUnsignedShort(); // L: 198 - if (this.transformVarbit == 65535) { // L: 199 + this.transformVarbit = var1.readUnsignedShort(); + if (this.transformVarbit == 65535) { this.transformVarbit = -1; } - this.transformVarp = var1.readUnsignedShort(); // L: 200 - if (this.transformVarp == 65535) { // L: 201 + this.transformVarp = var1.readUnsignedShort(); + if (this.transformVarp == 65535) { this.transformVarp = -1; } - var3 = -1; // L: 202 - if (var2 == 92) { // L: 203 - var3 = var1.readUnsignedShort(); // L: 204 - if (var3 == 65535) { // L: 205 + var3 = -1; + if (var2 == 92) { + var3 = var1.readUnsignedShort(); + if (var3 == 65535) { var3 = -1; } } - var4 = var1.readUnsignedByte(); // L: 207 - this.transforms = new int[var4 + 2]; // L: 208 + var4 = var1.readUnsignedByte(); + this.transforms = new int[var4 + 2]; - for (int var5 = 0; var5 <= var4; ++var5) { // L: 209 - this.transforms[var5] = var1.readUnsignedShort(); // L: 210 - if (this.transforms[var5] == 65535) { // L: 211 + for (int var5 = 0; var5 <= var4; ++var5) { + this.transforms[var5] = var1.readUnsignedShort(); + if (this.transforms[var5] == 65535) { this.transforms[var5] = -1; } } - this.transforms[var4 + 1] = var3; // L: 213 + this.transforms[var4 + 1] = var3; } - } // L: 232 + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -535,26 +535,26 @@ public class ObjectComposition extends DualNode { garbageValue = "-2022345468" ) public final boolean method3491(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 + if (this.models != null) { + for (int var4 = 0; var4 < this.models.length; ++var4) { + if (this.models[var4] == var1) { return ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var4] & 65535, 0); } } - return true; // L: 248 - } else if (this.modelIds == null) { // L: 236 return true; - } else if (var1 != 10) { // L: 237 + } else if (this.modelIds == null) { + return true; + } else if (var1 != 10) { return true; } else { - boolean var2 = true; // L: 238 + boolean var2 = true; - for (int var3 = 0; var3 < this.modelIds.length; ++var3) { // L: 239 - var2 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var3] & 65535, 0); // L: 240 + for (int var3 = 0; var3 < this.modelIds.length; ++var3) { + var2 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var3] & 65535, 0); } - return var2; // L: 242 + return var2; } } @@ -565,16 +565,16 @@ public class ObjectComposition extends DualNode { ) @Export("needsModelFiles") public final boolean needsModelFiles() { - if (this.modelIds == null) { // L: 253 + if (this.modelIds == null) { return true; } else { - boolean var1 = true; // L: 254 + boolean var1 = true; - for (int var2 = 0; var2 < this.modelIds.length; ++var2) { // L: 255 - var1 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var2] & 65535, 0); // L: 256 + for (int var2 = 0; var2 < this.modelIds.length; ++var2) { + var1 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var2] & 65535, 0); } - return var1; // L: 258 + return var1; } } @@ -586,44 +586,44 @@ public class ObjectComposition extends DualNode { @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: 263 + if (this.models == null) { var7 = (long)(var2 + (this.id << 10)); } else { - var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 264 + var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); } - 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 + Object var9 = (Renderable)ObjectDefinition_cachedEntities.get(var7); + if (var9 == null) { + ModelData var10 = this.getModelData(var1, var2); + if (var10 == null) { return null; } - if (!this.nonFlatShading) { // L: 269 + if (!this.nonFlatShading) { var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); } else { - var10.ambient = (short)(this.ambient + 64); // L: 271 - var10.contrast = (short)(this.contrast + 768); // L: 272 - var10.calculateVertexNormals(); // L: 273 - var9 = var10; // L: 274 + var10.ambient = (short)(this.ambient + 64); + var10.contrast = (short)(this.contrast + 768); + var10.calculateVertexNormals(); + var9 = var10; } - ObjectDefinition_cachedEntities.put((DualNode)var9, var7); // L: 276 + ObjectDefinition_cachedEntities.put((DualNode)var9, var7); } - if (this.nonFlatShading) { // L: 278 - var9 = ((ModelData)var9).method3751(); // L: 279 + if (this.nonFlatShading) { + var9 = ((ModelData)var9).method3751(); } - if (this.clipType >= 0) { // L: 281 - if (var9 instanceof Model) { // L: 282 + if (this.clipType >= 0) { + if (var9 instanceof Model) { var9 = ((Model)var9).contourGround(var3, var4, var5, var6, true, this.clipType); } else if (var9 instanceof ModelData) { - var9 = ((ModelData)var9).method3752(var3, var4, var5, var6, true, this.clipType); // L: 283 + var9 = ((ModelData)var9).method3752(var3, var4, var5, var6, true, this.clipType); } } - return (Renderable)var9; // L: 285 + return (Renderable)var9; } @ObfuscatedName("n") @@ -634,28 +634,28 @@ public class ObjectComposition extends DualNode { @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: 290 + if (this.models == null) { var7 = (long)(var2 + (this.id << 10)); } else { - var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 291 + var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); } - 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 + Model var9 = (Model)ObjectDefinition_cachedModels.get(var7); + if (var9 == null) { + ModelData var10 = this.getModelData(var1, var2); + if (var10 == null) { return null; } - var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 296 - ObjectDefinition_cachedModels.put(var9, var7); // L: 297 + var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); + ObjectDefinition_cachedModels.put(var9, var7); } if (this.clipType >= 0) { - var9 = var9.contourGround(var3, var4, var5, var6, true, this.clipType); // L: 299 + var9 = var9.contourGround(var3, var4, var5, var6, true, this.clipType); } - return var9; // L: 300 + return var9; } @ObfuscatedName("r") @@ -666,37 +666,37 @@ public class ObjectComposition extends DualNode { @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: 305 + if (this.models == null) { var9 = (long)(var2 + (this.id << 10)); } else { - var9 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 306 + var9 = (long)(var2 + (var1 << 3) + (this.id << 10)); } - 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 + Model var11 = (Model)ObjectDefinition_cachedModels.get(var9); + if (var11 == null) { + ModelData var12 = this.getModelData(var1, var2); + if (var12 == null) { return null; } - var11 = var12.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 311 - ObjectDefinition_cachedModels.put(var11, var9); // L: 312 + var11 = var12.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); + ObjectDefinition_cachedModels.put(var11, var9); } - if (var7 == null && this.clipType == -1) { // L: 314 + if (var7 == null && this.clipType == -1) { return var11; } else { - if (var7 != null) { // L: 315 - var11 = var7.transformObjectModel(var11, var8, var2); // L: 316 + if (var7 != null) { + var11 = var7.transformObjectModel(var11, var8, var2); } else { - var11 = var11.toSharedSequenceModel(true); // L: 318 + var11 = var11.toSharedSequenceModel(true); } - if (this.clipType >= 0) { // L: 319 + if (this.clipType >= 0) { var11 = var11.contourGround(var3, var4, var5, var6, false, this.clipType); } - return var11; // L: 320 + return var11; } } @@ -707,138 +707,138 @@ public class ObjectComposition extends DualNode { ) @Export("getModelData") final ModelData getModelData(int var1, int var2) { - ModelData var3 = null; // L: 324 + ModelData var3 = null; boolean var4; int var5; int var7; - if (this.models == null) { // L: 325 - if (var1 != 10) { // L: 326 + if (this.models == null) { + if (var1 != 10) { return null; } - if (this.modelIds == null) { // L: 327 + if (this.modelIds == null) { return null; } - var4 = this.isRotated; // L: 328 - if (var1 == 2 && var2 > 3) { // L: 329 + var4 = this.isRotated; + if (var1 == 2 && var2 > 3) { var4 = !var4; } - var5 = this.modelIds.length; // L: 330 + var5 = this.modelIds.length; - for (int var6 = 0; var6 < var5; ++var6) { // L: 331 - var7 = this.modelIds[var6]; // L: 332 - if (var4) { // L: 333 + for (int var6 = 0; var6 < var5; ++var6) { + var7 = this.modelIds[var6]; + if (var4) { var7 += 65536; } - 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 + var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var7); + if (var3 == null) { + var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var7 & 65535, 0); + if (var3 == null) { return null; } - if (var4) { // L: 338 + if (var4) { var3.method3761(); } - ObjectDefinition_cachedModelData.put(var3, (long)var7); // L: 339 + ObjectDefinition_cachedModelData.put(var3, (long)var7); } - if (var5 > 1) { // L: 341 + if (var5 > 1) { field1957[var6] = var3; } } - if (var5 > 1) { // L: 343 + if (var5 > 1) { var3 = new ModelData(field1957, var5); } } else { - int var9 = -1; // L: 346 + int var9 = -1; - for (var5 = 0; var5 < this.models.length; ++var5) { // L: 347 - if (this.models[var5] == var1) { // L: 348 - var9 = var5; // L: 349 + for (var5 = 0; var5 < this.models.length; ++var5) { + if (this.models[var5] == var1) { + var9 = var5; break; } } - if (var9 == -1) { // L: 353 + if (var9 == -1) { return null; } - var5 = this.modelIds[var9]; // L: 354 - boolean var10 = this.isRotated ^ var2 > 3; // L: 355 - if (var10) { // L: 356 + var5 = this.modelIds[var9]; + boolean var10 = this.isRotated ^ var2 > 3; + if (var10) { var5 += 65536; } - 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 + var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var5); + if (var3 == null) { + var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var5 & 65535, 0); + if (var3 == null) { return null; } - if (var10) { // L: 361 + if (var10) { var3.method3761(); } - ObjectDefinition_cachedModelData.put(var3, (long)var5); // L: 362 + ObjectDefinition_cachedModelData.put(var3, (long)var5); } } - if (this.modelSizeX == 128 && this.modelHeight == 128 && this.modelSizeY == 128) { // L: 366 - var4 = false; // L: 367 + if (this.modelSizeX == 128 && this.modelHeight == 128 && this.modelSizeY == 128) { + var4 = false; } else { var4 = true; } boolean var11; - if (this.offsetX == 0 && this.offsetHeight == 0 && this.offsetY == 0) { // L: 369 - var11 = false; // L: 370 + if (this.offsetX == 0 && this.offsetHeight == 0 && this.offsetY == 0) { + var11 = false; } else { var11 = true; } - ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, null == this.recolorFrom, null == this.retextureFrom, true); // L: 371 - if (var1 == 4 && var2 > 3) { // L: 372 - var8.method3757(256); // L: 373 - var8.changeOffset(45, 0, -45); // L: 374 + ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, null == this.recolorFrom, null == this.retextureFrom, true); + if (var1 == 4 && var2 > 3) { + var8.method3757(256); + var8.changeOffset(45, 0, -45); } - var2 &= 3; // L: 376 - if (var2 == 1) { // L: 377 + var2 &= 3; + if (var2 == 1) { var8.method3754(); - } else if (var2 == 2) { // L: 378 + } else if (var2 == 2) { var8.method3755(); - } else if (var2 == 3) { // L: 379 + } else if (var2 == 3) { var8.method3756(); } - 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.recolorFrom != null) { + for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { + var8.recolor(this.recolorFrom[var7], this.recolorTo[var7]); } } - 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 (this.retextureFrom != null) { + for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { + var8.retexture(this.retextureFrom[var7], this.retextureTo[var7]); } } - if (var4) { // L: 390 + if (var4) { var8.resize(this.modelSizeX, this.modelHeight, this.modelSizeY); } - if (var11) { // L: 391 + if (var11) { var8.changeOffset(this.offsetX, this.offsetHeight, this.offsetY); } - return var8; // L: 392 + return var8; } @ObfuscatedName("v") @@ -848,21 +848,21 @@ public class ObjectComposition extends DualNode { ) @Export("transform") public final ObjectComposition transform() { - int var1 = -1; // L: 396 - if (this.transformVarbit != -1) { // L: 397 + int var1 = -1; + if (this.transformVarbit != -1) { var1 = class273.getVarbit(this.transformVarbit); - } else if (this.transformVarp != -1) { // L: 398 + } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } int var2; - if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 400 - var2 = this.transforms[var1]; // L: 401 + if (var1 >= 0 && var1 < this.transforms.length - 1) { + var2 = this.transforms[var1]; } else { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? class148.getObjectDefinition(var2) : null; // L: 402 403 + return var2 != -1 ? class148.getObjectDefinition(var2) : null; } @ObfuscatedName("d") @@ -872,7 +872,7 @@ public class ObjectComposition extends DualNode { ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return class12.method158(this.params, var1, var2); // L: 407 + return class12.method158(this.params, var1, var2); } @ObfuscatedName("h") @@ -882,7 +882,7 @@ public class ObjectComposition extends DualNode { ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return Skeleton.method3948(this.params, var1, var2); // L: 411 + return Skeleton.method3948(this.params, var1, var2); } @ObfuscatedName("e") @@ -892,19 +892,19 @@ public class ObjectComposition extends DualNode { ) @Export("hasSound") public boolean hasSound() { - if (this.transforms == null) { // L: 422 + if (this.transforms == null) { return this.ambientSoundId != -1 || this.soundEffectIds != null; } else { - for (int var1 = 0; var1 < this.transforms.length; ++var1) { // L: 423 - if (this.transforms[var1] != -1) { // L: 424 - ObjectComposition var2 = class148.getObjectDefinition(this.transforms[var1]); // L: 425 - if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { // L: 426 + for (int var1 = 0; var1 < this.transforms.length; ++var1) { + if (this.transforms[var1] != -1) { + ObjectComposition var2 = class148.getObjectDefinition(this.transforms[var1]); + if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { return true; } } } - return false; // L: 429 + return false; } } @@ -914,13 +914,13 @@ public class ObjectComposition extends DualNode { garbageValue = "109672406" ) static void method3540() { - for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 44 - if (var0.obj != null) { // L: 45 + for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var0.obj != null) { var0.set(); } } - } // L: 47 + } @ObfuscatedName("w") @ObfuscatedSignature( @@ -928,8 +928,8 @@ public class ObjectComposition extends DualNode { garbageValue = "768656808" ) public static void method3542() { - StructComposition.StructDefinition_cached.clear(); // L: 57 - } // L: 58 + StructComposition.StructDefinition_cached.clear(); + } @ObfuscatedName("lt") @ObfuscatedSignature( @@ -937,19 +937,19 @@ public class ObjectComposition extends DualNode { garbageValue = "1543317182" ) static void method3541(Buffer var0, int var1) { - byte[] var2 = var0.array; // L: 12644 - if (Client.randomDatData == null) { // L: 12646 + byte[] var2 = var0.array; + if (Client.randomDatData == null) { Client.randomDatData = new byte[24]; } - class333.writeRandomDat(var2, var1, Client.randomDatData, 0, 24); // L: 12647 - if (JagexCache.JagexCache_randomDat != null) { // L: 12650 + class333.writeRandomDat(var2, var1, Client.randomDatData, 0, 24); + if (JagexCache.JagexCache_randomDat != null) { try { - JagexCache.JagexCache_randomDat.seek(0L); // L: 12652 - JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); // L: 12653 - } catch (Exception var4) { // L: 12655 + JagexCache.JagexCache_randomDat.seek(0L); + JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); + } catch (Exception var4) { } } - } // L: 12658 + } } diff --git a/runescape-client/src/main/java/ObjectNode.java b/runescape-client/src/main/java/ObjectNode.java index 53832a483e..0c31953055 100644 --- a/runescape-client/src/main/java/ObjectNode.java +++ b/runescape-client/src/main/java/ObjectNode.java @@ -10,6 +10,6 @@ public class ObjectNode extends Node { public final Object obj; public ObjectNode(Object var1) { - this.obj = var1; // L: 7 - } // L: 8 + this.obj = var1; + } } diff --git a/runescape-client/src/main/java/ObjectSound.java b/runescape-client/src/main/java/ObjectSound.java index 66af5e1da4..f7387e361c 100644 --- a/runescape-client/src/main/java/ObjectSound.java +++ b/runescape-client/src/main/java/ObjectSound.java @@ -95,11 +95,11 @@ public final class ObjectSound extends Node { RawPcmStream stream2; static { - objectSounds = new NodeDeque(); // L: 11 + objectSounds = new NodeDeque(); } ObjectSound() { - } // L: 27 + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -108,28 +108,28 @@ public final class ObjectSound extends Node { ) @Export("set") void set() { - int var1 = this.soundEffectId; // L: 50 - ObjectComposition var2 = this.obj.transform(); // L: 51 - if (var2 != null) { // L: 52 - this.soundEffectId = var2.ambientSoundId; // L: 53 - this.field793 = var2.int7 * 128; // L: 54 - this.field796 = var2.int5; // L: 55 - this.field797 = var2.int6; // L: 56 - this.soundEffectIds = var2.soundEffectIds; // L: 57 + int var1 = this.soundEffectId; + ObjectComposition var2 = this.obj.transform(); + if (var2 != null) { + this.soundEffectId = var2.ambientSoundId; + this.field793 = var2.int7 * 128; + this.field796 = var2.int5; + this.field797 = var2.int6; + this.soundEffectIds = var2.soundEffectIds; } else { - this.soundEffectId = -1; // L: 60 - this.field793 = 0; // L: 61 - this.field796 = 0; // L: 62 - this.field797 = 0; // L: 63 - this.soundEffectIds = null; // L: 64 + this.soundEffectId = -1; + this.field793 = 0; + this.field796 = 0; + this.field797 = 0; + this.soundEffectIds = null; } - if (var1 != this.soundEffectId && this.stream1 != null) { // L: 66 - class281.pcmStreamMixer.removeSubStream(this.stream1); // L: 67 - this.stream1 = null; // L: 68 + if (var1 != this.soundEffectId && this.stream1 != null) { + class281.pcmStreamMixer.removeSubStream(this.stream1); + this.stream1 = null; } - } // L: 70 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -137,9 +137,9 @@ public final class ObjectSound extends Node { garbageValue = "-45" ) public static void method1803(AbstractArchive var0, AbstractArchive var1) { - GrandExchangeOfferAgeComparator.HealthBarDefinition_archive = var0; // L: 32 - HealthBarDefinition.field1802 = var1; // L: 33 - } // L: 34 + GrandExchangeOfferAgeComparator.HealthBarDefinition_archive = var0; + HealthBarDefinition.field1802 = var1; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -148,113 +148,113 @@ public final class ObjectSound extends Node { ) @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 + ReflectionCheck var2 = new ReflectionCheck(); + var2.size = var0.readUnsignedByte(); + var2.id = var0.readInt(); + var2.operations = new int[var2.size]; + var2.creationErrors = new int[var2.size]; + var2.fields = new Field[var2.size]; + var2.intReplaceValues = new int[var2.size]; + var2.methods = new Method[var2.size]; + var2.arguments = new byte[var2.size][][]; - for (int var3 = 0; var3 < var2.size; ++var3) { // L: 132 + for (int var3 = 0; var3 < var2.size; ++var3) { try { - int var4 = var0.readUnsignedByte(); // L: 134 + int var4 = var0.readUnsignedByte(); 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 + if (var4 != 0 && var4 != 1 && var4 != 2) { + if (var4 == 3 || var4 == 4) { + var5 = var0.readStringCp1252NullTerminated(); + var6 = var0.readStringCp1252NullTerminated(); + var7 = var0.readUnsignedByte(); + String[] var8 = new String[var7]; - for (int var9 = 0; var9 < var7; ++var9) { // L: 150 + for (int var9 = 0; var9 < var7; ++var9) { var8[var9] = var0.readStringCp1252NullTerminated(); } - String var20 = var0.readStringCp1252NullTerminated(); // L: 151 - byte[][] var10 = new byte[var7][]; // L: 152 + String var20 = var0.readStringCp1252NullTerminated(); + byte[][] var10 = new byte[var7][]; 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 + if (var4 == 3) { + for (int var11 = 0; var11 < var7; ++var11) { + var12 = var0.readInt(); + var10[var11] = new byte[var12]; + var0.readBytes(var10[var11], 0, var12); } } - var2.operations[var3] = var4; // L: 160 - Class[] var21 = new Class[var7]; // L: 161 + var2.operations[var3] = var4; + Class[] var21 = new Class[var7]; - for (var12 = 0; var12 < var7; ++var12) { // L: 162 + for (var12 = 0; var12 < var7; ++var12) { var21[var12] = class4.loadClassFromDescriptor(var8[var12]); } - Class var22 = class4.loadClassFromDescriptor(var20); // L: 163 - if (class4.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 164 + Class var22 = class4.loadClassFromDescriptor(var20); + if (class4.loadClassFromDescriptor(var5).getClassLoader() == null) { throw new SecurityException(); } - Method[] var13 = class4.loadClassFromDescriptor(var5).getDeclaredMethods(); // L: 165 - Method[] var14 = var13; // L: 167 + Method[] var13 = class4.loadClassFromDescriptor(var5).getDeclaredMethods(); + Method[] var14 = var13; - 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 (var17.length == var21.length) { // L: 173 - boolean var18 = true; // L: 174 + for (int var15 = 0; var15 < var14.length; ++var15) { + Method var16 = var14[var15]; + if (Reflection.getMethodName(var16).equals(var6)) { + Class[] var17 = Reflection.getParameterTypes(var16); + if (var17.length == var21.length) { + boolean var18 = true; - for (int var19 = 0; var19 < var21.length; ++var19) { // L: 175 - if (var17[var19] != var21[var19]) { // L: 176 - var18 = false; // L: 177 - break; // L: 178 + for (int var19 = 0; var19 < var21.length; ++var19) { + if (var17[var19] != var21[var19]) { + var18 = false; + break; } } - if (var18 && var22 == var16.getReturnType()) { // L: 181 - var2.methods[var3] = var16; // L: 182 + if (var18 && var22 == var16.getReturnType()) { + var2.methods[var3] = var16; } } } } - var2.arguments[var3] = var10; // L: 189 + var2.arguments[var3] = var10; } } else { - var5 = var0.readStringCp1252NullTerminated(); // L: 136 - var6 = var0.readStringCp1252NullTerminated(); // L: 137 - var7 = 0; // L: 138 - if (var4 == 1) { // L: 139 + var5 = var0.readStringCp1252NullTerminated(); + var6 = var0.readStringCp1252NullTerminated(); + var7 = 0; + if (var4 == 1) { var7 = var0.readInt(); } - var2.operations[var3] = var4; // L: 140 - var2.intReplaceValues[var3] = var7; // L: 141 - if (class4.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 142 + var2.operations[var3] = var4; + var2.intReplaceValues[var3] = var7; + if (class4.loadClassFromDescriptor(var5).getClassLoader() == null) { throw new SecurityException(); } - var2.fields[var3] = Reflection.findField(class4.loadClassFromDescriptor(var5), var6); // L: 143 + var2.fields[var3] = Reflection.findField(class4.loadClassFromDescriptor(var5), var6); } - } 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 + } catch (ClassNotFoundException var24) { + var2.creationErrors[var3] = -1; + } catch (SecurityException var25) { + var2.creationErrors[var3] = -2; + } catch (NullPointerException var26) { var2.creationErrors[var3] = -3; } catch (Exception var27) { var2.creationErrors[var3] = -4; - } catch (Throwable var28) { // L: 204 - var2.creationErrors[var3] = -5; // L: 205 + } catch (Throwable var28) { + var2.creationErrors[var3] = -5; } } - class33.reflectionChecks.addFirst(var2); // L: 208 - } // L: 209 + class33.reflectionChecks.addFirst(var2); + } @ObfuscatedName("v") @ObfuscatedSignature( @@ -262,8 +262,8 @@ public final class ObjectSound extends Node { garbageValue = "30466" ) public static void method1796() { - HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); // L: 199 - HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); // L: 200 - HitSplatDefinition.HealthBarDefinition_cached.clear(); // L: 201 - } // L: 202 + HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); + HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); + HitSplatDefinition.HealthBarDefinition_cached.clear(); + } } diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java index 11879a9bcc..8ef22bcabb 100644 --- a/runescape-client/src/main/java/Occluder.java +++ b/runescape-client/src/main/java/Occluder.java @@ -110,7 +110,7 @@ public final class Occluder { int field2367; Occluder() { - } // L: 23 + } @ObfuscatedName("gt") @ObfuscatedSignature( @@ -119,26 +119,26 @@ public final class Occluder { ) @Export("setWindowedMode") static void setWindowedMode(int var0) { - Client.field514 = 0L; // L: 4973 - if (var0 >= 2) { // L: 4974 + Client.field514 = 0L; + if (var0 >= 2) { Client.isResizable = true; } else { - Client.isResizable = false; // L: 4975 + Client.isResizable = false; } - if (class143.getWindowedMode() == 1) { // L: 4976 - class295.client.setMaxCanvasSize(765, 503); // L: 4977 + if (class143.getWindowedMode() == 1) { + class295.client.setMaxCanvasSize(765, 503); } else { - class295.client.setMaxCanvasSize(7680, 2160); // L: 4980 + class295.client.setMaxCanvasSize(7680, 2160); } - if (Client.gameState >= 25) { // L: 4982 - PacketBufferNode var1 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2824, Client.packetWriter.isaacCipher); // L: 4984 - var1.packetBuffer.writeByte(class143.getWindowedMode()); // L: 4985 - var1.packetBuffer.writeShort(class186.canvasWidth); // L: 4986 - var1.packetBuffer.writeShort(BoundaryObject.canvasHeight); // L: 4987 - Client.packetWriter.addNode(var1); // L: 4988 + if (Client.gameState >= 25) { + PacketBufferNode var1 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2824, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(class143.getWindowedMode()); + var1.packetBuffer.writeShort(class186.canvasWidth); + var1.packetBuffer.writeShort(BoundaryObject.canvasHeight); + Client.packetWriter.addNode(var1); } - } // L: 4990 + } } diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java index 06e0c4bdcf..5cc2e818d2 100644 --- a/runescape-client/src/main/java/PacketBuffer.java +++ b/runescape-client/src/main/java/PacketBuffer.java @@ -23,12 +23,12 @@ public class PacketBuffer extends Buffer { int bitIndex; static { - field4469 = 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 + field4469 = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1}; } public PacketBuffer(int var1) { - super(var1); // L: 11 - } // L: 12 + super(var1); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -37,8 +37,8 @@ public class PacketBuffer extends Buffer { ) @Export("newIsaacCipher") public void newIsaacCipher(int[] var1) { - this.isaacCipher = new IsaacCipher(var1); // L: 15 - } // L: 16 + this.isaacCipher = new IsaacCipher(var1); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -47,8 +47,8 @@ public class PacketBuffer extends Buffer { ) @Export("setIsaacCipher") public void setIsaacCipher(IsaacCipher var1) { - this.isaacCipher = var1; // L: 19 - } // L: 20 + this.isaacCipher = var1; + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -57,8 +57,8 @@ public class PacketBuffer extends Buffer { ) @Export("writeByteIsaac") public void writeByteIsaac(int var1) { - super.array[++super.offset - 1] = (byte)(var1 + this.isaacCipher.nextInt()); // L: 23 - } // L: 24 + super.array[++super.offset - 1] = (byte)(var1 + this.isaacCipher.nextInt()); + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -67,7 +67,7 @@ public class PacketBuffer extends Buffer { ) @Export("readByteIsaac") public int readByteIsaac() { - return super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; // L: 27 + return super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; } @ObfuscatedName("t") @@ -76,8 +76,8 @@ public class PacketBuffer extends Buffer { garbageValue = "-794374917" ) public boolean method7311() { - int var1 = super.array[super.offset] - this.isaacCipher.method7874() & 255; // L: 31 - return var1 >= 128; // L: 32 + int var1 = super.array[super.offset] - this.isaacCipher.method7874() & 255; + return var1 >= 128; } @ObfuscatedName("s") @@ -87,8 +87,8 @@ public class PacketBuffer extends Buffer { ) @Export("readSmartByteShortIsaac") public int readSmartByteShortIsaac() { - int var1 = super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; // L: 37 - return var1 < 128 ? var1 : (var1 - 128 << 8) + (super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255); // L: 38 39 + int var1 = super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; + return var1 < 128 ? var1 : (var1 - 128 << 8) + (super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255); } @ObfuscatedName("j") @@ -97,11 +97,11 @@ public class PacketBuffer extends Buffer { garbageValue = "58" ) public void method7312(byte[] var1, int var2, int var3) { - for (int var4 = 0; var4 < var3; ++var4) { // L: 43 + for (int var4 = 0; var4 < var3; ++var4) { var1[var4 + var2] = (byte)(super.array[++super.offset - 1] - this.isaacCipher.nextInt()); } - } // L: 44 + } @ObfuscatedName("w") @ObfuscatedSignature( @@ -110,8 +110,8 @@ public class PacketBuffer extends Buffer { ) @Export("importIndex") public void importIndex() { - this.bitIndex = super.offset * 8; // L: 47 - } // L: 48 + this.bitIndex = super.offset * 8; + } @ObfuscatedName("n") @ObfuscatedSignature( @@ -120,22 +120,22 @@ public class PacketBuffer extends Buffer { ) @Export("readBits") public int readBits(int var1) { - int var2 = this.bitIndex >> 3; // L: 51 - int var3 = 8 - (this.bitIndex & 7); // L: 52 - int var4 = 0; // L: 53 + int var2 = this.bitIndex >> 3; + int var3 = 8 - (this.bitIndex & 7); + int var4 = 0; - for (this.bitIndex += var1; var1 > var3; var3 = 8) { // L: 54 55 58 - var4 += (super.array[var2++] & field4469[var3]) << var1 - var3; // L: 56 - var1 -= var3; // L: 57 + for (this.bitIndex += var1; var1 > var3; var3 = 8) { + var4 += (super.array[var2++] & field4469[var3]) << var1 - var3; + var1 -= var3; } - if (var3 == var1) { // L: 60 + if (var3 == var1) { var4 += super.array[var2] & field4469[var3]; } else { - var4 += super.array[var2] >> var3 - var1 & field4469[var1]; // L: 61 + var4 += super.array[var2] >> var3 - var1 & field4469[var1]; } - return var4; // L: 62 + return var4; } @ObfuscatedName("r") @@ -145,8 +145,8 @@ public class PacketBuffer extends Buffer { ) @Export("exportIndex") public void exportIndex() { - super.offset = (this.bitIndex + 7) / 8; // L: 66 - } // L: 67 + super.offset = (this.bitIndex + 7) / 8; + } @ObfuscatedName("o") @ObfuscatedSignature( @@ -155,6 +155,6 @@ public class PacketBuffer extends Buffer { ) @Export("bitsRemaining") public int bitsRemaining(int var1) { - return var1 * 8 - this.bitIndex; // L: 70 + return var1 * 8 - this.bitIndex; } } diff --git a/runescape-client/src/main/java/PacketBufferNode.java b/runescape-client/src/main/java/PacketBufferNode.java index cc1d32e15d..e543b0373a 100644 --- a/runescape-client/src/main/java/PacketBufferNode.java +++ b/runescape-client/src/main/java/PacketBufferNode.java @@ -49,12 +49,12 @@ public class PacketBufferNode extends Node { public PacketBuffer packetBuffer; static { - PacketBufferNode_packetBufferNodes = new PacketBufferNode[300]; // L: 13 - PacketBufferNode_packetBufferNodeCount = 0; // L: 14 + PacketBufferNode_packetBufferNodes = new PacketBufferNode[300]; + PacketBufferNode_packetBufferNodeCount = 0; } PacketBufferNode() { - } // L: 19 + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -63,10 +63,10 @@ public class PacketBufferNode extends Node { ) @Export("release") public void release() { - if (PacketBufferNode_packetBufferNodeCount < PacketBufferNode_packetBufferNodes.length) { // L: 61 - PacketBufferNode_packetBufferNodes[++PacketBufferNode_packetBufferNodeCount - 1] = this; // L: 62 + if (PacketBufferNode_packetBufferNodeCount < PacketBufferNode_packetBufferNodes.length) { + PacketBufferNode_packetBufferNodes[++PacketBufferNode_packetBufferNodeCount - 1] = this; } - } // L: 63 + } @ObfuscatedName("mk") @ObfuscatedSignature( @@ -74,8 +74,8 @@ public class PacketBufferNode extends Node { garbageValue = "-1828413921" ) static void method5016(int var0) { - if (var0 != Client.loginState) { // L: 12733 - Client.loginState = var0; // L: 12734 + if (var0 != Client.loginState) { + Client.loginState = var0; } - } // L: 12735 + } } diff --git a/runescape-client/src/main/java/PacketWriter.java b/runescape-client/src/main/java/PacketWriter.java index 7b362e6bce..8387439d1a 100644 --- a/runescape-client/src/main/java/PacketWriter.java +++ b/runescape-client/src/main/java/PacketWriter.java @@ -92,16 +92,16 @@ public class PacketWriter { ServerPacket field1291; PacketWriter() { - this.packetBufferNodes = new IterableNodeDeque(); // L: 15 - this.bufferSize = 0; // L: 16 - this.buffer = new Buffer(5000); // L: 17 - this.packetBuffer = new PacketBuffer(40000); // L: 19 - this.serverPacket = null; // L: 20 - this.serverPacketLength = 0; // L: 21 - this.field1278 = true; // L: 22 - this.field1287 = 0; // L: 23 - this.pendingWrites = 0; // L: 24 - } // L: 29 + this.packetBufferNodes = new IterableNodeDeque(); + this.bufferSize = 0; + this.buffer = new Buffer(5000); + this.packetBuffer = new PacketBuffer(40000); + this.serverPacket = null; + this.serverPacketLength = 0; + this.field1278 = true; + this.field1287 = 0; + this.pendingWrites = 0; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -110,9 +110,9 @@ public class PacketWriter { ) @Export("clearBuffer") final void clearBuffer() { - this.packetBufferNodes.rsClear(); // L: 32 - this.bufferSize = 0; // L: 33 - } // L: 34 + this.packetBufferNodes.rsClear(); + this.bufferSize = 0; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -121,26 +121,26 @@ public class PacketWriter { ) @Export("flush") final void flush() throws IOException { - if (this.socket != null && this.bufferSize > 0) { // L: 37 - this.buffer.offset = 0; // L: 38 + if (this.socket != null && this.bufferSize > 0) { + this.buffer.offset = 0; while (true) { - PacketBufferNode var1 = (PacketBufferNode)this.packetBufferNodes.last(); // L: 40 - if (var1 == null || var1.index > this.buffer.array.length - this.buffer.offset) { // L: 41 42 - this.socket.write(this.buffer.array, 0, this.buffer.offset); // L: 49 - this.pendingWrites = 0; // L: 50 + PacketBufferNode var1 = (PacketBufferNode)this.packetBufferNodes.last(); + if (var1 == null || var1.index > this.buffer.array.length - this.buffer.offset) { + this.socket.write(this.buffer.array, 0, this.buffer.offset); + this.pendingWrites = 0; break; } - this.buffer.writeBytes(var1.packetBuffer.array, 0, var1.index); // L: 43 - this.bufferSize -= var1.index; // L: 44 - var1.remove(); // L: 45 - var1.packetBuffer.releaseArray(); // L: 46 - var1.release(); // L: 47 + this.buffer.writeBytes(var1.packetBuffer.array, 0, var1.index); + this.bufferSize -= var1.index; + var1.remove(); + var1.packetBuffer.releaseArray(); + var1.release(); } } - } // L: 52 + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -149,11 +149,11 @@ public class PacketWriter { ) @Export("addNode") public final void addNode(PacketBufferNode var1) { - this.packetBufferNodes.addFirst(var1); // L: 55 - var1.index = var1.packetBuffer.offset; // L: 56 - var1.packetBuffer.offset = 0; // L: 57 - this.bufferSize += var1.index; // L: 58 - } // L: 59 + this.packetBufferNodes.addFirst(var1); + var1.index = var1.packetBuffer.offset; + var1.packetBuffer.offset = 0; + this.bufferSize += var1.index; + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -162,8 +162,8 @@ public class PacketWriter { ) @Export("setSocket") void setSocket(AbstractSocket var1) { - this.socket = var1; // L: 62 - } // L: 63 + this.socket = var1; + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -172,12 +172,12 @@ public class PacketWriter { ) @Export("close") void close() { - if (this.socket != null) { // L: 66 - this.socket.close(); // L: 67 - this.socket = null; // L: 68 + if (this.socket != null) { + this.socket.close(); + this.socket = null; } - } // L: 70 + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -186,8 +186,8 @@ public class PacketWriter { ) @Export("removeSocket") void removeSocket() { - this.socket = null; // L: 73 - } // L: 74 + this.socket = null; + } @ObfuscatedName("j") @ObfuscatedSignature( @@ -196,12 +196,12 @@ public class PacketWriter { ) @Export("getSocket") AbstractSocket getSocket() { - return this.socket; // L: 77 + return this.socket; } @ObfuscatedName("n") @Export("Entity_unpackID") public static int Entity_unpackID(long var0) { - return (int)(var0 >>> 17 & 4294967295L); // L: 85 + return (int)(var0 >>> 17 & 4294967295L); } } diff --git a/runescape-client/src/main/java/ParamComposition.java b/runescape-client/src/main/java/ParamComposition.java index 8574dd8cc6..946e77d152 100644 --- a/runescape-client/src/main/java/ParamComposition.java +++ b/runescape-client/src/main/java/ParamComposition.java @@ -43,12 +43,12 @@ public class ParamComposition extends DualNode { boolean autoDisable; static { - ParamDefinition_cached = new EvictingDualNodeHashTable(64); // L: 12 + ParamDefinition_cached = new EvictingDualNodeHashTable(64); } ParamComposition() { - this.autoDisable = true; // L: 16 - } // L: 18 + this.autoDisable = true; + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -57,7 +57,7 @@ public class ParamComposition extends DualNode { ) @Export("postDecode") void postDecode() { - } // L: 35 + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -67,12 +67,12 @@ public class ParamComposition extends DualNode { @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 39 - if (var2 == 0) { // L: 40 - return; // L: 43 + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; } - this.decodeNext(var1, var2); // L: 41 + this.decodeNext(var1, var2); } } @@ -83,17 +83,17 @@ public class ParamComposition extends DualNode { ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 46 - this.type = class279.method5406(var1.readByte()); // L: 47 - } else if (var2 == 2) { // L: 49 + if (var2 == 1) { + this.type = class279.method5406(var1.readByte()); + } else if (var2 == 2) { this.defaultInt = var1.readInt(); } else if (var2 == 4) { - this.autoDisable = false; // L: 50 - } else if (var2 == 5) { // L: 51 + this.autoDisable = false; + } else if (var2 == 5) { this.defaultStr = var1.readStringCp1252NullTerminated(); } - } // L: 53 + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -102,7 +102,7 @@ public class ParamComposition extends DualNode { ) @Export("isString") public boolean isString() { - return this.type == 's'; // L: 56 + return this.type == 's'; } @ObfuscatedName("x") @@ -111,82 +111,82 @@ public class ParamComposition extends DualNode { garbageValue = "-893226045" ) static int method3397(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.SOUND_SYNTH) { // L: 1822 - IsaacCipher.Interpreter_intStackSize -= 3; // L: 1823 - LoginScreenAnimation.queueSoundEffect(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize], Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]); // L: 1824 - return 1; // L: 1825 - } else if (var0 == ScriptOpcodes.SOUND_SONG) { // L: 1827 - class18.playSong(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 1828 - return 1; // L: 1829 - } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { // L: 1831 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 1832 - class315.method5822(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize], Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]); // L: 1833 - return 1; // L: 1834 + if (var0 == ScriptOpcodes.SOUND_SYNTH) { + IsaacCipher.Interpreter_intStackSize -= 3; + LoginScreenAnimation.queueSoundEffect(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize], Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]); + return 1; + } else if (var0 == ScriptOpcodes.SOUND_SONG) { + class18.playSong(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); + return 1; + } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { + IsaacCipher.Interpreter_intStackSize -= 2; + class315.method5822(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize], Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]); + return 1; } else { int var3; int var4; - if (var0 != 3209 && var0 != 3181 && var0 != 3203 && var0 != 3205 && var0 != 3207) { // L: 1836 - if (var0 != 3210 && var0 != 3182 && var0 != 3204 && var0 != 3206 && var0 != 3208) { // L: 1872 - return var0 == 3211 ? 1 : 2; // L: 1906 1907 1909 + if (var0 != 3209 && var0 != 3181 && var0 != 3203 && var0 != 3205 && var0 != 3207) { + if (var0 != 3210 && var0 != 3182 && var0 != 3204 && var0 != 3206 && var0 != 3208) { + return var0 == 3211 ? 1 : 2; } else { - var3 = 0; // L: 1873 - var4 = 0; // L: 1874 - if (var0 == 3210) { // L: 1875 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1876 - } else if (var0 == 3182) { // L: 1878 - var3 = 6; // L: 1879 - } else if (var0 == 3204) { // L: 1881 - var3 = 7; // L: 1882 - } else if (var0 == 3206) { // L: 1884 - var3 = 8; // L: 1885 - } else if (var0 == 3208) { // L: 1887 - var3 = 9; // L: 1888 + var3 = 0; + var4 = 0; + if (var0 == 3210) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + } else if (var0 == 3182) { + var3 = 6; + } else if (var0 == 3204) { + var3 = 7; + } else if (var0 == 3206) { + var3 = 8; + } else if (var0 == 3208) { + var3 = 9; } - if (var3 == 6) { // L: 1890 - float var5 = 200.0F * ((float)SecureRandomFuture.clientPreferences.brightness - 0.5F); // L: 1891 - var4 = 100 - Math.round(var5); // L: 1892 - } else if (var3 == 7) { // L: 1894 - var4 = Math.round((float)SecureRandomFuture.clientPreferences.musicVolume / 2.55F); // L: 1895 - } else if (var3 == 8) { // L: 1897 - var4 = Math.round((float)SecureRandomFuture.clientPreferences.soundEffectsVolume / 1.27F); // L: 1898 - } else if (var3 == 9) { // L: 1900 - var4 = Math.round((float)SecureRandomFuture.clientPreferences.areaSoundEffectsVolume / 1.27F); // L: 1901 + if (var3 == 6) { + float var5 = 200.0F * ((float)SecureRandomFuture.clientPreferences.brightness - 0.5F); + var4 = 100 - Math.round(var5); + } else if (var3 == 7) { + var4 = Math.round((float)SecureRandomFuture.clientPreferences.musicVolume / 2.55F); + } else if (var3 == 8) { + var4 = Math.round((float)SecureRandomFuture.clientPreferences.soundEffectsVolume / 1.27F); + } else if (var3 == 9) { + var4 = Math.round((float)SecureRandomFuture.clientPreferences.areaSoundEffectsVolume / 1.27F); } - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4; // L: 1903 - return 1; // L: 1904 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4; + return 1; } } else { - var3 = 0; // L: 1837 - var4 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1838 - if (var0 == 3209) { // L: 1839 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1840 - } else if (var0 == 3181) { // L: 1842 - var3 = 6; // L: 1843 - } else if (var0 == 3203) { // L: 1845 - var3 = 7; // L: 1846 - } else if (var0 == 3205) { // L: 1848 - var3 = 8; // L: 1849 - } else if (var0 == 3207) { // L: 1851 - var3 = 9; // L: 1852 + var3 = 0; + var4 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + if (var0 == 3209) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + } else if (var0 == 3181) { + var3 = 6; + } else if (var0 == 3203) { + var3 = 7; + } else if (var0 == 3205) { + var3 = 8; + } else if (var0 == 3207) { + var3 = 9; } - if (var3 == 6) { // L: 1854 - var4 = 100 - Math.min(Math.max(var4, 0), 100); // L: 1855 - InterfaceParent.method2142((double)(0.5F + (float)var4 / 200.0F)); // L: 1856 - } else if (var3 == 7) { // L: 1858 - var4 = Math.min(Math.max(var4, 0), 100); // L: 1859 - Varcs.method2426(Math.round((float)var4 * 2.55F)); // L: 1860 - } else if (var3 == 8) { // L: 1862 - var4 = Math.min(Math.max(var4, 0), 100); // L: 1863 - class20.updateSoundEffectVolume(Math.round((float)var4 * 1.27F)); // L: 1864 - } else if (var3 == 9) { // L: 1866 - var4 = Math.min(Math.max(var4, 0), 100); // L: 1867 - Players.method2383(Math.round(1.27F * (float)var4)); // L: 1868 + if (var3 == 6) { + var4 = 100 - Math.min(Math.max(var4, 0), 100); + InterfaceParent.method2142((double)(0.5F + (float)var4 / 200.0F)); + } else if (var3 == 7) { + var4 = Math.min(Math.max(var4, 0), 100); + Varcs.method2426(Math.round((float)var4 * 2.55F)); + } else if (var3 == 8) { + var4 = Math.min(Math.max(var4, 0), 100); + class20.updateSoundEffectVolume(Math.round((float)var4 * 1.27F)); + } else if (var3 == 9) { + var4 = Math.min(Math.max(var4, 0), 100); + Players.method2383(Math.round(1.27F * (float)var4)); } - return 1; // L: 1870 + return 1; } } } diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java index af3191ab7b..a49dd0f8a5 100644 --- a/runescape-client/src/main/java/PcmPlayer.java +++ b/runescape-client/src/main/java/PcmPlayer.java @@ -103,18 +103,18 @@ public class PcmPlayer { PcmStream[] field285; protected PcmPlayer() { - this.field284 = 32; // L: 22 - this.timeMs = Ignored.method6459(); // L: 23 - this.field280 = 0L; // L: 27 - this.field290 = 0; // L: 28 - this.field291 = 0; // L: 29 - this.field292 = 0; // L: 30 - this.field293 = 0L; // L: 31 - this.field294 = true; // L: 32 - this.field295 = 0; // L: 38 - this.field296 = new PcmStream[8]; // L: 39 - this.field285 = new PcmStream[8]; // L: 40 - } // L: 42 + this.field284 = 32; + this.timeMs = Ignored.method6459(); + this.field280 = 0L; + this.field290 = 0; + this.field291 = 0; + this.field292 = 0; + this.field293 = 0L; + this.field294 = true; + this.field295 = 0; + this.field296 = new PcmStream[8]; + this.field285 = new PcmStream[8]; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -123,7 +123,7 @@ public class PcmPlayer { ) @Export("init") protected void init() throws Exception { - } // L: 277 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -132,7 +132,7 @@ public class PcmPlayer { ) @Export("open") protected void open(int var1) throws Exception { - } // L: 278 + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -141,13 +141,13 @@ public class PcmPlayer { ) @Export("position") protected int position() throws Exception { - return this.capacity; // L: 281 + return this.capacity; } @ObfuscatedName("m") @Export("write") protected void write() throws Exception { - } // L: 284 + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -156,7 +156,7 @@ public class PcmPlayer { ) @Export("close") protected void close() { - } // L: 285 + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -165,7 +165,7 @@ public class PcmPlayer { ) @Export("discard") protected void discard() throws Exception { - } // L: 286 + } @ObfuscatedName("i") @ObfuscatedSignature( @@ -174,8 +174,8 @@ public class PcmPlayer { ) @Export("setStream") public final synchronized void setStream(PcmStream var1) { - this.stream = var1; // L: 76 - } // L: 77 + this.stream = var1; + } @ObfuscatedName("y") @ObfuscatedSignature( @@ -184,91 +184,91 @@ public class PcmPlayer { ) @Export("run") public final synchronized void run() { - if (this.samples != null) { // L: 80 - long var1 = Ignored.method6459(); // L: 81 + if (this.samples != null) { + long var1 = Ignored.method6459(); try { - if (0L != this.field280) { // L: 83 - if (var1 < this.field280) { // L: 84 + if (0L != this.field280) { + if (var1 < this.field280) { return; } - this.open(this.capacity); // L: 85 - this.field280 = 0L; // L: 86 - this.field294 = true; // L: 87 + this.open(this.capacity); + this.field280 = 0L; + this.field294 = true; } - int var3 = this.position(); // L: 89 - if (this.field292 - var3 > this.field290) { // L: 90 + int var3 = this.position(); + if (this.field292 - var3 > this.field290) { this.field290 = this.field292 - var3; } - int var4 = this.field288 + this.field298; // L: 91 - if (var4 + 256 > 16384) { // L: 92 + int var4 = this.field288 + this.field298; + if (var4 + 256 > 16384) { var4 = 16128; } - if (var4 + 256 > this.capacity) { // L: 93 - this.capacity += 1024; // L: 94 - if (this.capacity > 16384) { // L: 95 + if (var4 + 256 > this.capacity) { + this.capacity += 1024; + if (this.capacity > 16384) { this.capacity = 16384; } - this.close(); // L: 96 - this.open(this.capacity); // L: 97 - var3 = 0; // L: 98 - this.field294 = true; // L: 99 - if (var4 + 256 > this.capacity) { // L: 100 - var4 = this.capacity - 256; // L: 101 - this.field288 = var4 - this.field298; // L: 102 + this.close(); + this.open(this.capacity); + var3 = 0; + this.field294 = true; + if (var4 + 256 > this.capacity) { + var4 = this.capacity - 256; + this.field288 = var4 - this.field298; } } - while (var3 < var4) { // L: 105 - this.fill(this.samples, 256); // L: 106 - this.write(); // L: 107 - var3 += 256; // L: 108 + while (var3 < var4) { + this.fill(this.samples, 256); + this.write(); + var3 += 256; } - if (var1 > this.field293) { // L: 110 - if (!this.field294) { // L: 111 - if (this.field290 == 0 && this.field291 == 0) { // L: 112 - this.close(); // L: 113 - this.field280 = 2000L + var1; // L: 114 - return; // L: 115 + if (var1 > this.field293) { + if (!this.field294) { + if (this.field290 == 0 && this.field291 == 0) { + this.close(); + this.field280 = 2000L + var1; + return; } - this.field288 = Math.min(this.field291, this.field290); // L: 117 - this.field291 = this.field290; // L: 118 + this.field288 = Math.min(this.field291, this.field290); + this.field291 = this.field290; } else { - this.field294 = false; // L: 120 + this.field294 = false; } - this.field290 = 0; // L: 121 - this.field293 = 2000L + var1; // L: 122 + this.field290 = 0; + this.field293 = 2000L + var1; } - this.field292 = var3; // L: 124 - } catch (Exception var7) { // L: 126 - this.close(); // L: 127 - this.field280 = 2000L + var1; // L: 128 + this.field292 = var3; + } catch (Exception var7) { + this.close(); + this.field280 = 2000L + var1; } try { - if (var1 > this.timeMs + 500000L) { // L: 131 + if (var1 > this.timeMs + 500000L) { var1 = this.timeMs; } - while (var1 > 5000L + this.timeMs) { // L: 132 - this.skip(256); // L: 133 - this.timeMs += (long)(256000 / class339.field4058); // L: 134 + while (var1 > 5000L + this.timeMs) { + this.skip(256); + this.timeMs += (long)(256000 / class339.field4058); } - } catch (Exception var6) { // L: 137 - this.timeMs = var1; // L: 138 + } catch (Exception var6) { + this.timeMs = var1; } } - } // L: 140 + } @ObfuscatedName("ah") @ObfuscatedSignature( @@ -276,8 +276,8 @@ public class PcmPlayer { garbageValue = "1599335992" ) public final void method747() { - this.field294 = true; // L: 143 - } // L: 144 + this.field294 = true; + } @ObfuscatedName("ao") @ObfuscatedSignature( @@ -286,16 +286,16 @@ public class PcmPlayer { ) @Export("tryDiscard") public final synchronized void tryDiscard() { - this.field294 = true; // L: 147 + this.field294 = true; try { - this.discard(); // L: 149 - } catch (Exception var2) { // L: 151 - this.close(); // L: 152 - this.field280 = Ignored.method6459() + 2000L; // L: 153 + this.discard(); + } catch (Exception var2) { + this.close(); + this.field280 = Ignored.method6459() + 2000L; } - } // L: 155 + } @ObfuscatedName("ab") @ObfuscatedSignature( @@ -304,29 +304,29 @@ public class PcmPlayer { ) @Export("shutdown") public final synchronized void shutdown() { - if (soundSystem != null) { // L: 158 - boolean var1 = true; // L: 159 + if (soundSystem != null) { + boolean var1 = true; - for (int var2 = 0; var2 < 2; ++var2) { // L: 160 - if (this == soundSystem.players[var2]) { // L: 161 + for (int var2 = 0; var2 < 2; ++var2) { + if (this == soundSystem.players[var2]) { soundSystem.players[var2] = null; } - if (soundSystem.players[var2] != null) { // L: 162 + if (soundSystem.players[var2] != null) { var1 = false; } } - if (var1) { // L: 164 - soundSystemExecutor.shutdownNow(); // L: 165 - soundSystemExecutor = null; // L: 166 - soundSystem = null; // L: 167 + if (var1) { + soundSystemExecutor.shutdownNow(); + soundSystemExecutor = null; + soundSystem = null; } } - this.close(); // L: 170 - this.samples = null; // L: 171 - } // L: 172 + this.close(); + this.samples = null; + } @ObfuscatedName("an") @ObfuscatedSignature( @@ -335,130 +335,130 @@ public class PcmPlayer { ) @Export("skip") final void skip(int var1) { - this.field295 -= var1; // L: 175 + this.field295 -= var1; if (this.field295 < 0) { - this.field295 = 0; // L: 176 + this.field295 = 0; } if (this.stream != null) { - this.stream.skip(var1); // L: 177 + this.stream.skip(var1); } - } // L: 178 + } @ObfuscatedName("ax") @Export("fill") final void fill(int[] var1, int var2) { - int var3 = var2; // L: 182 - if (SpriteMask.PcmPlayer_stereo) { // L: 183 + int var3 = var2; + if (SpriteMask.PcmPlayer_stereo) { var3 = var2 << 1; } - class333.clearIntArray(var1, 0, var3); // L: 184 - this.field295 -= var2; // L: 185 - if (this.stream != null && this.field295 <= 0) { // L: 186 - this.field295 += class339.field4058 >> 4; // L: 187 - class10.PcmStream_disable(this.stream); // L: 188 - this.method751(this.stream, this.stream.vmethod991()); // L: 189 - int var4 = 0; // L: 190 - int var5 = 255; // L: 191 + class333.clearIntArray(var1, 0, var3); + this.field295 -= var2; + if (this.stream != null && this.field295 <= 0) { + this.field295 += class339.field4058 >> 4; + class10.PcmStream_disable(this.stream); + this.method751(this.stream, this.stream.vmethod991()); + int var4 = 0; + int var5 = 255; int var6; PcmStream var10; label108: - for (var6 = 7; var5 != 0; --var6) { // L: 192 + for (var6 = 7; var5 != 0; --var6) { int var7; int var8; - if (var6 < 0) { // L: 195 - var7 = var6 & 3; // L: 196 - var8 = -(var6 >> 2); // L: 197 + if (var6 < 0) { + var7 = var6 & 3; + var8 = -(var6 >> 2); } else { - var7 = var6; // L: 200 - var8 = 0; // L: 201 + var7 = var6; + var8 = 0; } - for (int var9 = var5 >>> var7 & 286331153; var9 != 0; var9 >>>= 4) { // L: 203 205 - if ((var9 & 1) != 0) { // L: 208 - var5 &= ~(1 << var7); // L: 211 - var10 = null; // L: 212 - PcmStream var11 = this.field296[var7]; // L: 213 + for (int var9 = var5 >>> var7 & 286331153; var9 != 0; var9 >>>= 4) { + if ((var9 & 1) != 0) { + var5 &= ~(1 << var7); + var10 = null; + PcmStream var11 = this.field296[var7]; label102: while (true) { while (true) { - if (var11 == null) { // L: 214 + if (var11 == null) { break label102; } - AbstractSound var12 = var11.sound; // L: 215 - if (var12 != null && var12.position > var8) { // L: 216 - var5 |= 1 << var7; // L: 217 - var10 = var11; // L: 218 - var11 = var11.after; // L: 219 + AbstractSound var12 = var11.sound; + if (var12 != null && var12.position > var8) { + var5 |= 1 << var7; + var10 = var11; + var11 = var11.after; } else { - var11.active = true; // L: 222 - int var13 = var11.vmethod5260(); // L: 223 - var4 += var13; // L: 224 + var11.active = true; + int var13 = var11.vmethod5260(); + var4 += var13; if (var12 != null) { - var12.position += var13; // L: 225 + var12.position += var13; } - if (var4 >= this.field284) { // L: 226 + if (var4 >= this.field284) { break label108; } - PcmStream var14 = var11.firstSubStream(); // L: 227 - if (var14 != null) { // L: 228 - for (int var15 = var11.field346; var14 != null; var14 = var11.nextSubStream()) { // L: 229 230 232 - this.method751(var14, var15 * var14.vmethod991() >> 8); // L: 231 + PcmStream var14 = var11.firstSubStream(); + if (var14 != null) { + for (int var15 = var11.field346; var14 != null; var14 = var11.nextSubStream()) { + this.method751(var14, var15 * var14.vmethod991() >> 8); } } - PcmStream var18 = var11.after; // L: 235 - var11.after = null; // L: 236 - if (var10 == null) { // L: 237 + PcmStream var18 = var11.after; + var11.after = null; + if (var10 == null) { this.field296[var7] = var18; } else { - var10.after = var18; // L: 238 + var10.after = var18; } - if (var18 == null) { // L: 239 + if (var18 == null) { this.field285[var7] = var10; } - var11 = var18; // L: 240 + var11 = var18; } } } } - var7 += 4; // L: 204 + var7 += 4; ++var8; } } - for (var6 = 0; var6 < 8; ++var6) { // L: 244 - PcmStream var16 = this.field296[var6]; // L: 245 - PcmStream[] var17 = this.field296; // L: 246 - this.field285[var6] = null; // L: 248 + for (var6 = 0; var6 < 8; ++var6) { + PcmStream var16 = this.field296[var6]; + PcmStream[] var17 = this.field296; + this.field285[var6] = null; - for (var17[var6] = null; var16 != null; var16 = var10) { // L: 249 250 253 - var10 = var16.after; // L: 251 - var16.after = null; // L: 252 + for (var17[var6] = null; var16 != null; var16 = var10) { + var10 = var16.after; + var16.after = null; } } } - if (this.field295 < 0) { // L: 257 + if (this.field295 < 0) { this.field295 = 0; } - if (this.stream != null) { // L: 258 + if (this.stream != null) { this.stream.fill(var1, 0, var2); } - this.timeMs = Ignored.method6459(); // L: 259 - } // L: 260 + this.timeMs = Ignored.method6459(); + } @ObfuscatedName("az") @ObfuscatedSignature( @@ -466,15 +466,15 @@ public class PcmPlayer { garbageValue = "-65" ) final void method751(PcmStream var1, int var2) { - int var3 = var2 >> 5; // L: 269 - PcmStream var4 = this.field285[var3]; // L: 270 - if (var4 == null) { // L: 271 + int var3 = var2 >> 5; + PcmStream var4 = this.field285[var3]; + if (var4 == null) { this.field296[var3] = var1; } else { - var4.after = var1; // L: 272 + var4.after = var1; } - this.field285[var3] = var1; // L: 273 - var1.field346 = var2; // L: 274 - } // L: 275 + this.field285[var3] = var1; + var1.field346 = var2; + } } diff --git a/runescape-client/src/main/java/PcmStream.java b/runescape-client/src/main/java/PcmStream.java index 9057fa0ea4..0287371e56 100644 --- a/runescape-client/src/main/java/PcmStream.java +++ b/runescape-client/src/main/java/PcmStream.java @@ -25,8 +25,8 @@ public abstract class PcmStream extends Node { AbstractSound sound; protected PcmStream() { - this.active = true; // L: 11 - } // L: 13 + this.active = true; + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -55,17 +55,17 @@ public abstract class PcmStream extends Node { @ObfuscatedName("ac") int vmethod991() { - return 255; // L: 16 + return 255; } @ObfuscatedName("fv") @Export("update") final void update(int[] var1, int var2, int var3) { - if (this.active) { // L: 24 + if (this.active) { this.fill(var1, var2, var3); } else { - this.skip(var3); // L: 25 + this.skip(var3); } - } // L: 26 + } } diff --git a/runescape-client/src/main/java/PcmStreamMixer.java b/runescape-client/src/main/java/PcmStreamMixer.java index 199278a87b..460daf70df 100644 --- a/runescape-client/src/main/java/PcmStreamMixer.java +++ b/runescape-client/src/main/java/PcmStreamMixer.java @@ -23,10 +23,10 @@ public class PcmStreamMixer extends PcmStream { int field255; public PcmStreamMixer() { - this.subStreams = new NodeDeque(); // L: 9 - this.field256 = new NodeDeque(); // L: 10 - this.field257 = 0; // L: 11 - this.field255 = -1; // L: 12 + this.subStreams = new NodeDeque(); + this.field256 = new NodeDeque(); + this.field257 = 0; + this.field255 = -1; } @ObfuscatedName("c") @@ -35,8 +35,8 @@ public class PcmStreamMixer extends PcmStream { ) @Export("addSubStream") public final synchronized void addSubStream(PcmStream var1) { - this.subStreams.addLast(var1); // L: 15 - } // L: 16 + this.subStreams.addLast(var1); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -44,50 +44,50 @@ public class PcmStreamMixer extends PcmStream { ) @Export("removeSubStream") public final synchronized void removeSubStream(PcmStream var1) { - var1.remove(); // L: 19 - } // L: 20 + var1.remove(); + } @ObfuscatedName("p") void method691() { - if (this.field257 > 0) { // L: 23 - for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field256.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field256.previous()) { // L: 24 - var1.field393 -= this.field257; // L: 25 + if (this.field257 > 0) { + for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field256.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field256.previous()) { + var1.field393 -= this.field257; } - this.field255 -= this.field257; // L: 27 - this.field257 = 0; // L: 28 + this.field255 -= this.field257; + this.field257 = 0; } - } // L: 30 + } @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(Lnw;Lad;)V" ) void method670(Node var1, PcmStreamMixerListener var2) { - while (this.field256.sentinel != var1 && ((PcmStreamMixerListener)var1).field393 <= var2.field393) { // L: 33 + while (this.field256.sentinel != var1 && ((PcmStreamMixerListener)var1).field393 <= var2.field393) { var1 = var1.previous; } - NodeDeque.NodeDeque_addBefore(var2, var1); // L: 34 - this.field255 = ((PcmStreamMixerListener)this.field256.sentinel.previous).field393; // L: 35 - } // L: 36 + NodeDeque.NodeDeque_addBefore(var2, var1); + this.field255 = ((PcmStreamMixerListener)this.field256.sentinel.previous).field393; + } @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(Lad;)V" ) void method671(PcmStreamMixerListener var1) { - var1.remove(); // L: 39 - var1.remove2(); // L: 40 - Node var2 = this.field256.sentinel.previous; // L: 41 + var1.remove(); + var1.remove2(); + Node var2 = this.field256.sentinel.previous; if (var2 == this.field256.sentinel) { - this.field255 = -1; // L: 42 + this.field255 = -1; } else { - this.field255 = ((PcmStreamMixerListener)var2).field393; // L: 43 + this.field255 = ((PcmStreamMixerListener)var2).field393; } - } // L: 44 + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -95,7 +95,7 @@ public class PcmStreamMixer extends PcmStream { ) @Export("firstSubStream") protected PcmStream firstSubStream() { - return (PcmStream)this.subStreams.last(); // L: 47 + return (PcmStream)this.subStreams.last(); } @ObfuscatedName("j") @@ -104,100 +104,100 @@ public class PcmStreamMixer extends PcmStream { ) @Export("nextSubStream") protected PcmStream nextSubStream() { - return (PcmStream)this.subStreams.previous(); // L: 51 + return (PcmStream)this.subStreams.previous(); } @ObfuscatedName("w") protected int vmethod5260() { - return 0; // L: 55 + return 0; } @ObfuscatedName("n") @Export("fill") public final synchronized void fill(int[] var1, int var2, int var3) { do { - if (this.field255 < 0) { // L: 60 - this.updateSubStreams(var1, var2, var3); // L: 61 - return; // L: 62 + if (this.field255 < 0) { + this.updateSubStreams(var1, var2, var3); + return; } - if (var3 + this.field257 < this.field255) { // L: 64 - this.field257 += var3; // L: 65 - this.updateSubStreams(var1, var2, var3); // L: 66 - return; // L: 67 + if (var3 + this.field257 < this.field255) { + this.field257 += var3; + this.updateSubStreams(var1, var2, var3); + return; } - int var4 = this.field255 - this.field257; // L: 69 - this.updateSubStreams(var1, var2, var4); // L: 70 - var2 += var4; // L: 71 - var3 -= var4; // L: 72 - this.field257 += var4; // L: 73 - this.method691(); // L: 74 - PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field256.last(); // L: 75 - synchronized(var5) { // L: 76 - int var7 = var5.update(); // L: 77 - if (var7 < 0) { // L: 78 - var5.field393 = 0; // L: 79 - this.method671(var5); // L: 80 + int var4 = this.field255 - this.field257; + this.updateSubStreams(var1, var2, var4); + var2 += var4; + var3 -= var4; + this.field257 += var4; + this.method691(); + PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field256.last(); + synchronized(var5) { + int var7 = var5.update(); + if (var7 < 0) { + var5.field393 = 0; + this.method671(var5); } else { - var5.field393 = var7; // L: 83 - this.method670(var5.previous, var5); // L: 84 + var5.field393 = var7; + this.method670(var5.previous, var5); } } - } while(var3 != 0); // L: 87 + } while(var3 != 0); } @ObfuscatedName("r") @Export("updateSubStreams") void updateSubStreams(int[] var1, int var2, int var3) { - for (PcmStream var4 = (PcmStream)this.subStreams.last(); var4 != null; var4 = (PcmStream)this.subStreams.previous()) { // L: 92 - var4.update(var1, var2, var3); // L: 93 + for (PcmStream var4 = (PcmStream)this.subStreams.last(); var4 != null; var4 = (PcmStream)this.subStreams.previous()) { + var4.update(var1, var2, var3); } - } // L: 95 + } @ObfuscatedName("o") @Export("skip") public final synchronized void skip(int var1) { do { - if (this.field255 < 0) { // L: 99 - this.skipSubStreams(var1); // L: 100 - return; // L: 101 + if (this.field255 < 0) { + this.skipSubStreams(var1); + return; } - if (this.field257 + var1 < this.field255) { // L: 103 - this.field257 += var1; // L: 104 - this.skipSubStreams(var1); // L: 105 - return; // L: 106 + if (this.field257 + var1 < this.field255) { + this.field257 += var1; + this.skipSubStreams(var1); + return; } - int var2 = this.field255 - this.field257; // L: 108 - this.skipSubStreams(var2); // L: 109 - var1 -= var2; // L: 110 - this.field257 += var2; // L: 111 - this.method691(); // L: 112 - PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field256.last(); // L: 113 - synchronized(var3) { // L: 114 - int var5 = var3.update(); // L: 115 - if (var5 < 0) { // L: 116 - var3.field393 = 0; // L: 117 - this.method671(var3); // L: 118 + int var2 = this.field255 - this.field257; + this.skipSubStreams(var2); + var1 -= var2; + this.field257 += var2; + this.method691(); + PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field256.last(); + synchronized(var3) { + int var5 = var3.update(); + if (var5 < 0) { + var3.field393 = 0; + this.method671(var3); } else { - var3.field393 = var5; // L: 121 - this.method670(var3.previous, var3); // L: 122 + var3.field393 = var5; + this.method670(var3.previous, var3); } } - } while(var1 != 0); // L: 125 + } while(var1 != 0); } @ObfuscatedName("v") @Export("skipSubStreams") void skipSubStreams(int var1) { - for (PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) { // L: 130 - var2.skip(var1); // L: 131 + for (PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) { + var2.skip(var1); } - } // L: 133 + } } diff --git a/runescape-client/src/main/java/PendingSpawn.java b/runescape-client/src/main/java/PendingSpawn.java index 3ad5dc6203..ac4aa6e440 100644 --- a/runescape-client/src/main/java/PendingSpawn.java +++ b/runescape-client/src/main/java/PendingSpawn.java @@ -78,9 +78,9 @@ public final class PendingSpawn extends Node { int hitpoints; PendingSpawn() { - this.delay = 0; // L: 16 - this.hitpoints = -1; // L: 17 - } // L: 19 + this.delay = 0; + this.hitpoints = -1; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -88,26 +88,26 @@ public final class PendingSpawn extends Node { garbageValue = "-94" ) public static String method2224(byte[] var0, int var1, int var2) { - StringBuilder var3 = new StringBuilder(); // L: 58 + StringBuilder var3 = new StringBuilder(); - for (int var4 = var1; var4 < var2 + var1; var4 += 3) { // L: 59 - int var5 = var0[var4] & 255; // L: 60 - var3.append(class329.field4005[var5 >>> 2]); // L: 61 - if (var4 < var2 - 1) { // L: 62 - int var6 = var0[var4 + 1] & 255; // L: 63 - var3.append(class329.field4005[(var5 & 3) << 4 | var6 >>> 4]); // L: 64 - if (var4 < var2 - 2) { // L: 65 - int var7 = var0[var4 + 2] & 255; // L: 66 - var3.append(class329.field4005[(var6 & 15) << 2 | var7 >>> 6]).append(class329.field4005[var7 & 63]); // L: 67 + for (int var4 = var1; var4 < var2 + var1; var4 += 3) { + int var5 = var0[var4] & 255; + var3.append(class329.field4005[var5 >>> 2]); + if (var4 < var2 - 1) { + int var6 = var0[var4 + 1] & 255; + var3.append(class329.field4005[(var5 & 3) << 4 | var6 >>> 4]); + if (var4 < var2 - 2) { + int var7 = var0[var4 + 2] & 255; + var3.append(class329.field4005[(var6 & 15) << 2 | var7 >>> 6]).append(class329.field4005[var7 & 63]); } else { - var3.append(class329.field4005[(var6 & 15) << 2]).append("="); // L: 69 + var3.append(class329.field4005[(var6 & 15) << 2]).append("="); } } else { - var3.append(class329.field4005[(var5 & 3) << 4]).append("=="); // L: 71 + var3.append(class329.field4005[(var5 & 3) << 4]).append("=="); } } - return var3.toString(); // L: 73 + return var3.toString(); } @ObfuscatedName("m") @@ -116,12 +116,12 @@ public final class PendingSpawn extends Node { garbageValue = "-2136768167" ) static void method2225(int var0, int var1) { - long var2 = (long)((var0 << 16) + var1); // L: 246 - NetFileRequest var4 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var2); // L: 247 - if (var4 != null) { // L: 248 - NetCache.NetCache_pendingWritesQueue.addLast(var4); // L: 249 + long var2 = (long)((var0 << 16) + var1); + NetFileRequest var4 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var2); + if (var4 != null) { + NetCache.NetCache_pendingWritesQueue.addLast(var4); } - } // L: 250 + } @ObfuscatedName("j") @ObfuscatedSignature( @@ -130,26 +130,26 @@ public final class PendingSpawn extends Node { ) @Export("decodeStringCp1252") public static String decodeStringCp1252(byte[] var0, int var1, int var2) { - char[] var3 = new char[var2]; // L: 152 - int var4 = 0; // L: 153 + char[] var3 = new char[var2]; + int var4 = 0; - for (int var5 = 0; var5 < var2; ++var5) { // L: 154 - int var6 = var0[var5 + var1] & 255; // L: 155 - if (var6 != 0) { // L: 156 - if (var6 >= 128 && var6 < 160) { // L: 157 - char var7 = class328.cp1252AsciiExtension[var6 - 128]; // L: 158 - if (var7 == 0) { // L: 159 + for (int var5 = 0; var5 < var2; ++var5) { + int var6 = var0[var5 + var1] & 255; + if (var6 != 0) { + if (var6 >= 128 && var6 < 160) { + char var7 = class328.cp1252AsciiExtension[var6 - 128]; + if (var7 == 0) { var7 = '?'; } - var6 = var7; // L: 160 + var6 = var7; } - var3[var4++] = (char)var6; // L: 162 + var3[var4++] = (char)var6; } } - return new String(var3, 0, var4); // L: 164 + return new String(var3, 0, var4); } @ObfuscatedName("h") @@ -158,25 +158,25 @@ public final class PendingSpawn extends Node { garbageValue = "2133440883" ) static final int method2223(int var0, int var1) { - if (var0 == -2) { // L: 503 + if (var0 == -2) { return 12345678; - } else if (var0 == -1) { // L: 504 - if (var1 < 2) { // L: 505 + } else if (var0 == -1) { + if (var1 < 2) { var1 = 2; - } else if (var1 > 126) { // L: 506 + } else if (var1 > 126) { var1 = 126; } - return var1; // L: 507 + return var1; } else { - var1 = (var0 & 127) * var1 / 128; // L: 509 - if (var1 < 2) { // L: 510 + var1 = (var0 & 127) * var1 / 128; + if (var1 < 2) { var1 = 2; - } else if (var1 > 126) { // L: 511 + } else if (var1 > 126) { var1 = 126; } - return (var0 & 65408) + var1; // L: 512 + return (var0 & 65408) + var1; } } } diff --git a/runescape-client/src/main/java/PlatformInfo.java b/runescape-client/src/main/java/PlatformInfo.java index 9ec79b6701..7b448595f8 100644 --- a/runescape-client/src/main/java/PlatformInfo.java +++ b/runescape-client/src/main/java/PlatformInfo.java @@ -104,33 +104,33 @@ public class PlatformInfo extends Node { String field4298; 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.field4296 = new int[3]; // L: 62 - this.field4276 = var1; // L: 67 - this.field4272 = var2; // L: 68 - this.field4297 = var3; // L: 69 - this.field4277 = var4; // L: 70 - this.field4278 = var5; // L: 71 - this.field4295 = var6; // L: 72 - this.field4280 = var7; // L: 73 - this.field4281 = var8; // L: 74 - this.field4265 = var9; // L: 75 - this.field4283 = var10; // L: 76 - this.field4284 = var11; // L: 77 - this.field4268 = var12; // L: 78 - this.field4286 = var13; // L: 79 - this.field4287 = var14; // L: 80 - this.field4294 = var15; // L: 81 - this.field4289 = var16; // L: 82 - this.field4274 = var17; // L: 83 - this.field4275 = var18; // L: 84 - this.field4292 = var19; // L: 85 - this.field4293 = var20; // L: 86 - this.field4290 = var21; // L: 87 - this.field4291 = var22; // L: 88 - this.field4296 = var23; // L: 89 - this.field4285 = var24; // L: 90 - this.field4298 = var25; // L: 91 - } // L: 92 + this.field4296 = new int[3]; + this.field4276 = var1; + this.field4272 = var2; + this.field4297 = var3; + this.field4277 = var4; + this.field4278 = var5; + this.field4295 = var6; + this.field4280 = var7; + this.field4281 = var8; + this.field4265 = var9; + this.field4283 = var10; + this.field4284 = var11; + this.field4268 = var12; + this.field4286 = var13; + this.field4287 = var14; + this.field4294 = var15; + this.field4289 = var16; + this.field4274 = var17; + this.field4275 = var18; + this.field4292 = var19; + this.field4293 = var20; + this.field4290 = var21; + this.field4291 = var22; + this.field4296 = var23; + this.field4285 = var24; + this.field4298 = var25; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -139,37 +139,37 @@ public class PlatformInfo extends Node { ) @Export("write") public void write(Buffer var1) { - var1.writeByte(8); // L: 95 - var1.writeByte(this.field4276); // L: 96 - var1.writeByte(this.field4272 ? 1 : 0); // L: 97 - var1.writeShort(this.field4297); // L: 98 - var1.writeByte(this.field4277); // L: 99 - var1.writeByte(this.field4278); // L: 100 - var1.writeByte(this.field4295); // L: 101 - var1.writeByte(this.field4280); // L: 102 - var1.writeByte(this.field4281 ? 1 : 0); // L: 103 - var1.writeShort(this.field4265); // L: 104 - var1.writeByte(this.field4283); // L: 105 - var1.writeMedium(this.field4284); // L: 106 - var1.writeShort(this.field4268); // L: 107 - var1.writeStringCp1252NullCircumfixed(this.field4286); // L: 108 - var1.writeStringCp1252NullCircumfixed(this.field4287); // L: 109 - var1.writeStringCp1252NullCircumfixed(this.field4294); // L: 110 - var1.writeStringCp1252NullCircumfixed(this.field4289); // L: 111 - var1.writeByte(this.field4275); // L: 112 - var1.writeShort(this.field4274); // L: 113 - var1.writeStringCp1252NullCircumfixed(this.field4290); // L: 114 - var1.writeStringCp1252NullCircumfixed(this.field4291); // L: 115 - var1.writeByte(this.field4292); // L: 116 - var1.writeByte(this.field4293); // L: 117 + var1.writeByte(8); + var1.writeByte(this.field4276); + var1.writeByte(this.field4272 ? 1 : 0); + var1.writeShort(this.field4297); + var1.writeByte(this.field4277); + var1.writeByte(this.field4278); + var1.writeByte(this.field4295); + var1.writeByte(this.field4280); + var1.writeByte(this.field4281 ? 1 : 0); + var1.writeShort(this.field4265); + var1.writeByte(this.field4283); + var1.writeMedium(this.field4284); + var1.writeShort(this.field4268); + var1.writeStringCp1252NullCircumfixed(this.field4286); + var1.writeStringCp1252NullCircumfixed(this.field4287); + var1.writeStringCp1252NullCircumfixed(this.field4294); + var1.writeStringCp1252NullCircumfixed(this.field4289); + var1.writeByte(this.field4275); + var1.writeShort(this.field4274); + var1.writeStringCp1252NullCircumfixed(this.field4290); + var1.writeStringCp1252NullCircumfixed(this.field4291); + var1.writeByte(this.field4292); + var1.writeByte(this.field4293); - for (int var2 = 0; var2 < this.field4296.length; ++var2) { // L: 118 + for (int var2 = 0; var2 < this.field4296.length; ++var2) { var1.writeInt(this.field4296[var2]); } - var1.writeInt(this.field4285); // L: 119 - var1.writeStringCp1252NullCircumfixed(this.field4298); // L: 120 - } // L: 121 + var1.writeInt(this.field4285); + var1.writeStringCp1252NullCircumfixed(this.field4298); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -178,28 +178,28 @@ public class PlatformInfo extends Node { ) @Export("size") public int size() { - byte var1 = 39; // L: 124 - String var4 = this.field4286; // L: 127 - int var3 = var4.length() + 2; // L: 129 - int var23 = var3 + var1; // L: 131 - String var7 = this.field4287; // L: 134 - int var6 = var7.length() + 2; // L: 136 - var23 += var6; // L: 138 - String var10 = this.field4294; // L: 141 - int var9 = var10.length() + 2; // L: 143 - var23 += var9; // L: 145 - String var13 = this.field4289; // L: 148 - int var12 = var13.length() + 2; // L: 150 - var23 += var12; // L: 152 - String var16 = this.field4290; // L: 155 - int var15 = var16.length() + 2; // L: 157 - var23 += var15; // L: 159 - String var19 = this.field4291; // L: 162 - int var18 = var19.length() + 2; // L: 164 - var23 += var18; // L: 166 - String var22 = this.field4298; // L: 169 - int var21 = var22.length() + 2; // L: 171 - var23 += var21; // L: 173 - return var23; // L: 174 + byte var1 = 39; + String var4 = this.field4286; + int var3 = var4.length() + 2; + int var23 = var3 + var1; + String var7 = this.field4287; + int var6 = var7.length() + 2; + var23 += var6; + String var10 = this.field4294; + int var9 = var10.length() + 2; + var23 += var9; + String var13 = this.field4289; + int var12 = var13.length() + 2; + var23 += var12; + String var16 = this.field4290; + int var15 = var16.length() + 2; + var23 += var15; + String var19 = this.field4291; + int var18 = var19.length() + 2; + var23 += var18; + String var22 = this.field4298; + int var21 = var22.length() + 2; + var23 += var21; + return var23; } } diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index e16f57faec..d35c3b9262 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -168,26 +168,26 @@ public final class Player extends Actor { int tileY; Player() { - this.headIconPk = -1; // L: 20 - this.headIconPrayer = -1; // L: 21 - this.actions = new String[3]; // L: 23 + this.headIconPk = -1; + this.headIconPrayer = -1; + this.actions = new String[3]; - for (int var1 = 0; var1 < 3; ++var1) { // L: 26 + for (int var1 = 0; var1 < 3; ++var1) { this.actions[var1] = ""; } - this.combatLevel = 0; // L: 29 - 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.field1055 = false; // L: 50 - } // L: 54 + this.combatLevel = 0; + this.skillLevel = 0; + this.animationCycleStart = 0; + this.animationCycleEnd = 0; + 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.field1055 = false; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -196,123 +196,123 @@ public final class Player extends Actor { ) @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 - if (var6 == 0) { // L: 66 - var4[var5] = 0; // L: 67 + for (int var5 = 0; var5 < 12; ++var5) { + var6 = var1.readUnsignedByte(); + if (var6 == 0) { + var4[var5] = 0; } else { - var7 = var1.readUnsignedByte(); // L: 70 - var4[var5] = var7 + (var6 << 8); // L: 71 - if (var5 == 0 && var4[0] == 65535) { // L: 72 - var3 = var1.readUnsignedShort(); // L: 73 + var7 = var1.readUnsignedByte(); + var4[var5] = var7 + (var6 << 8); + if (var5 == 0 && var4[0] == 65535) { + var3 = var1.readUnsignedShort(); break; } - if (var4[var5] >= 512) { // L: 76 - var8 = UserComparator6.ItemDefinition_get(var4[var5] - 512).team; // L: 77 - if (var8 != 0) { // L: 78 + if (var4[var5] >= 512) { + var8 = UserComparator6.ItemDefinition_get(var4[var5] - 512).team; + if (var8 != 0) { this.team = var8; } } } } - int[] var11 = new int[5]; // L: 81 + int[] var11 = new int[5]; - for (var6 = 0; var6 < 5; ++var6) { // L: 82 - var7 = var1.readUnsignedByte(); // L: 83 - if (var7 < 0 || var7 >= class114.field1382[var6].length) { // L: 84 + for (var6 = 0; var6 < 5; ++var6) { + var7 = var1.readUnsignedByte(); + if (var7 < 0 || var7 >= class114.field1382[var6].length) { var7 = 0; } - var11[var6] = var7; // L: 85 + var11[var6] = var7; } - super.idleSequence = var1.readUnsignedShort(); // L: 87 - if (super.idleSequence == 65535) { // L: 88 + super.idleSequence = var1.readUnsignedShort(); + if (super.idleSequence == 65535) { super.idleSequence = -1; } - super.turnLeftSequence = var1.readUnsignedShort(); // L: 89 - if (super.turnLeftSequence == 65535) { // L: 90 + super.turnLeftSequence = var1.readUnsignedShort(); + if (super.turnLeftSequence == 65535) { super.turnLeftSequence = -1; } - super.turnRightSequence = super.turnLeftSequence; // L: 91 - super.walkSequence = var1.readUnsignedShort(); // L: 92 - if (super.walkSequence == 65535) { // L: 93 + super.turnRightSequence = super.turnLeftSequence; + super.walkSequence = var1.readUnsignedShort(); + if (super.walkSequence == 65535) { super.walkSequence = -1; } - super.walkBackSequence = var1.readUnsignedShort(); // L: 94 - if (super.walkBackSequence == 65535) { // L: 95 + super.walkBackSequence = var1.readUnsignedShort(); + if (super.walkBackSequence == 65535) { super.walkBackSequence = -1; } - super.walkLeftSequence = var1.readUnsignedShort(); // L: 96 - if (super.walkLeftSequence == 65535) { // L: 97 + super.walkLeftSequence = var1.readUnsignedShort(); + if (super.walkLeftSequence == 65535) { super.walkLeftSequence = -1; } - super.walkRightSequence = var1.readUnsignedShort(); // L: 98 - if (super.walkRightSequence == 65535) { // L: 99 + super.walkRightSequence = var1.readUnsignedShort(); + if (super.walkRightSequence == 65535) { super.walkRightSequence = -1; } - super.runSequence = var1.readUnsignedShort(); // L: 100 - if (super.runSequence == 65535) { // L: 101 + super.runSequence = var1.readUnsignedShort(); + if (super.runSequence == 65535) { super.runSequence = -1; } - this.username = new Username(var1.readStringCp1252NullTerminated(), class194.loginType); // L: 102 - this.clearIsFriend(); // L: 103 - this.clearIsInFriendsChat(); // L: 104 - this.method2186(); // L: 105 - if (this == class340.localPlayer) { // L: 106 + this.username = new Username(var1.readStringCp1252NullTerminated(), class194.loginType); + this.clearIsFriend(); + this.clearIsInFriendsChat(); + this.method2186(); + if (this == class340.localPlayer) { RunException.localPlayerName = this.username.getName(); } - this.combatLevel = var1.readUnsignedByte(); // L: 107 - this.skillLevel = var1.readUnsignedShort(); // L: 108 - this.isHidden = var1.readUnsignedByte() == 1; // L: 109 - if (Client.gameBuild == 0 && Client.staffModLevel >= 2) { // L: 110 + this.combatLevel = var1.readUnsignedByte(); + this.skillLevel = var1.readUnsignedShort(); + this.isHidden = var1.readUnsignedByte() == 1; + if (Client.gameBuild == 0 && Client.staffModLevel >= 2) { this.isHidden = false; } - class160[] 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 class160[12]; // L: 117 + class160[] var12 = null; + boolean var13 = false; + if (var1.offset < var1.array.length) { + var8 = var1.readUnsignedShort(); + var13 = (var8 >> 15 & 1) == 1; + if (var8 > 0 && var8 != 32768) { + var12 = new class160[12]; - for (int var9 = 0; var9 < 12; ++var9) { // L: 118 - int var10 = var8 >> 12 - var9 & 1; // L: 119 - if (var10 == 1) { // L: 120 - var12[var9] = ClanChannelMember.method2777(var4[var9] - 512, var1); // L: 121 + for (int var9 = 0; var9 < 12; ++var9) { + int var10 = var8 >> 12 - var9 & 1; + if (var10 == 1) { + var12[var9] = ClanChannelMember.method2777(var4[var9] - 512, var1); } } } } - if (this.appearance == null) { // L: 126 + if (this.appearance == null) { this.appearance = new PlayerComposition(); } - this.appearance.method5368(var4, var12, var13, var11, var2 == 1, var3); // L: 127 - } // L: 128 + this.appearance.method5368(var4, var12, var13, var11, var2 == 1, var3); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -321,75 +321,75 @@ public final class Player extends Actor { ) @Export("getModel") protected final Model getModel() { - if (this.appearance == null) { // L: 189 + if (this.appearance == null) { return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? UserComparator5.SequenceDefinition_get(super.sequence) : null; // L: 190 - SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.idleSequence == super.movementSequence && var1 != null ? null : UserComparator5.SequenceDefinition_get(super.movementSequence); // L: 191 - Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 192 - if (var3 == null) { // L: 193 + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? UserComparator5.SequenceDefinition_get(super.sequence) : null; + SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.idleSequence == super.movementSequence && var1 != null ? null : UserComparator5.SequenceDefinition_get(super.movementSequence); + Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); + if (var3 == null) { return null; } else { - var3.calculateBoundsCylinder(); // L: 194 - super.defaultHeight = var3.height; // L: 195 + var3.calculateBoundsCylinder(); + super.defaultHeight = var3.height; Model var4; Model[] var5; - if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 196 - var4 = AccessFile.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 197 - if (var4 != null) { // L: 198 - var4.offsetBy(0, -super.field1131, 0); // L: 199 - var5 = new Model[]{var3, var4}; // L: 200 - var3 = new Model(var5, 2); // L: 201 + if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { + var4 = AccessFile.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); + if (var4 != null) { + var4.offsetBy(0, -super.field1131, 0); + var5 = new Model[]{var3, var4}; + var3 = new Model(var5, 2); } } - if (!this.isUnanimated && this.model0 != null) { // L: 204 - if (Client.cycle >= this.animationCycleEnd) { // L: 205 + if (!this.isUnanimated && this.model0 != null) { + if (Client.cycle >= this.animationCycleEnd) { this.model0 = null; } - if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { // L: 206 - var4 = this.model0; // L: 207 - var4.offsetBy(this.field1056 - super.x, this.tileHeight2 - this.tileHeight, this.field1058 - super.y); // L: 208 - if (super.orientation == 512) { // L: 209 - var4.rotateY90Ccw(); // L: 210 - var4.rotateY90Ccw(); // L: 211 - var4.rotateY90Ccw(); // L: 212 - } else if (super.orientation == 1024) { // L: 214 - var4.rotateY90Ccw(); // L: 215 - var4.rotateY90Ccw(); // L: 216 - } else if (super.orientation == 1536) { // L: 218 + if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { + var4 = this.model0; + var4.offsetBy(this.field1056 - super.x, this.tileHeight2 - this.tileHeight, this.field1058 - super.y); + if (super.orientation == 512) { + var4.rotateY90Ccw(); + var4.rotateY90Ccw(); + var4.rotateY90Ccw(); + } else if (super.orientation == 1024) { + var4.rotateY90Ccw(); + var4.rotateY90Ccw(); + } else if (super.orientation == 1536) { var4.rotateY90Ccw(); } - var5 = new Model[]{var3, var4}; // L: 219 - var3 = new Model(var5, 2); // L: 220 - if (super.orientation == 512) { // L: 221 + var5 = new Model[]{var3, var4}; + var3 = new Model(var5, 2); + if (super.orientation == 512) { + var4.rotateY90Ccw(); + } else if (super.orientation == 1024) { + var4.rotateY90Ccw(); + var4.rotateY90Ccw(); + } else if (super.orientation == 1536) { + var4.rotateY90Ccw(); + var4.rotateY90Ccw(); var4.rotateY90Ccw(); - } else if (super.orientation == 1024) { // L: 222 - var4.rotateY90Ccw(); // L: 223 - var4.rotateY90Ccw(); // L: 224 - } else if (super.orientation == 1536) { // L: 226 - var4.rotateY90Ccw(); // L: 227 - var4.rotateY90Ccw(); // L: 228 - var4.rotateY90Ccw(); // L: 229 } - var4.offsetBy(super.x - this.field1056, this.tileHeight - this.tileHeight2, super.y - this.field1058); // L: 231 + var4.offsetBy(super.x - this.field1056, this.tileHeight - this.tileHeight2, super.y - this.field1058); } } - var3.isSingleTile = true; // L: 234 - if (super.field1146 != 0 && Client.cycle >= super.field1141 && Client.cycle < super.field1140) { // L: 235 - var3.field2494 = super.field1143; // L: 236 - var3.field2495 = super.field1144; // L: 237 - var3.field2479 = super.field1095; // L: 238 - var3.field2474 = super.field1146; // L: 239 + var3.isSingleTile = true; + if (super.field1146 != 0 && Client.cycle >= super.field1141 && Client.cycle < super.field1140) { + var3.field2494 = super.field1143; + var3.field2495 = super.field1144; + var3.field2479 = super.field1095; + var3.field2474 = super.field1146; } else { - var3.field2474 = 0; // L: 242 + var3.field2474 = 0; } - return var3; // L: 244 + return var3; } } } @@ -401,11 +401,11 @@ public final class Player extends Actor { ) @Export("isFriend") boolean isFriend() { - if (this.isFriendTriBool == TriBool.TriBool_unknown) { // L: 131 - this.checkIsFriend(); // L: 132 + if (this.isFriendTriBool == TriBool.TriBool_unknown) { + this.checkIsFriend(); } - return this.isFriendTriBool == TriBool.TriBool_true; // L: 134 + return this.isFriendTriBool == TriBool.TriBool_true; } @ObfuscatedName("m") @@ -415,8 +415,8 @@ public final class Player extends Actor { ) @Export("clearIsFriend") void clearIsFriend() { - this.isFriendTriBool = TriBool.TriBool_unknown; // L: 138 - } // L: 139 + this.isFriendTriBool = TriBool.TriBool_unknown; + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -425,8 +425,8 @@ public final class Player extends Actor { ) @Export("checkIsFriend") void checkIsFriend() { - this.isFriendTriBool = GameEngine.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 142 - } // L: 143 + this.isFriendTriBool = GameEngine.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + } @ObfuscatedName("r") @ObfuscatedSignature( @@ -435,11 +435,11 @@ public final class Player extends Actor { ) @Export("isFriendsChatMember") boolean isFriendsChatMember() { - if (this.isInFriendsChat == TriBool.TriBool_unknown) { // L: 146 - this.updateIsInFriendsChat(); // L: 147 + if (this.isInFriendsChat == TriBool.TriBool_unknown) { + this.updateIsInFriendsChat(); } - return this.isInFriendsChat == TriBool.TriBool_true; // L: 149 + return this.isInFriendsChat == TriBool.TriBool_true; } @ObfuscatedName("o") @@ -449,8 +449,8 @@ public final class Player extends Actor { ) @Export("clearIsInFriendsChat") void clearIsInFriendsChat() { - this.isInFriendsChat = TriBool.TriBool_unknown; // L: 153 - } // L: 154 + this.isInFriendsChat = TriBool.TriBool_unknown; + } @ObfuscatedName("v") @ObfuscatedSignature( @@ -459,8 +459,8 @@ public final class Player extends Actor { ) @Export("updateIsInFriendsChat") void updateIsInFriendsChat() { - this.isInFriendsChat = Players.friendsChat != null && Players.friendsChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 157 - } // L: 158 + this.isInFriendsChat = Players.friendsChat != null && Players.friendsChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + } @ObfuscatedName("d") @ObfuscatedSignature( @@ -469,15 +469,15 @@ public final class Player extends Actor { ) @Export("updateIsInClanChat") void updateIsInClanChat() { - for (int var1 = 0; var1 < 2; ++var1) { // L: 161 - if (Client.currentClanSettings[var1] != null && Client.currentClanSettings[var1].method2881(this.username.getName()) != -1) { // L: 162 - this.isInClanChat = TriBool.TriBool_true; // L: 163 - return; // L: 164 + for (int var1 = 0; var1 < 2; ++var1) { + if (Client.currentClanSettings[var1] != null && Client.currentClanSettings[var1].method2881(this.username.getName()) != -1) { + this.isInClanChat = TriBool.TriBool_true; + return; } } - this.isInClanChat = TriBool.TriBool_false; // L: 167 - } // L: 168 + this.isInClanChat = TriBool.TriBool_false; + } @ObfuscatedName("h") @ObfuscatedSignature( @@ -485,8 +485,8 @@ public final class Player extends Actor { garbageValue = "-782154637" ) void method2186() { - this.isInClanChat = TriBool.TriBool_unknown; // L: 171 - } // L: 172 + this.isInClanChat = TriBool.TriBool_unknown; + } @ObfuscatedName("g") @ObfuscatedSignature( @@ -495,11 +495,11 @@ public final class Player extends Actor { ) @Export("isClanMember") boolean isClanMember() { - if (this.isInClanChat == TriBool.TriBool_unknown) { // L: 175 - this.updateIsInClanChat(); // L: 176 + if (this.isInClanChat == TriBool.TriBool_unknown) { + this.updateIsInClanChat(); } - return this.isInClanChat == TriBool.TriBool_true; // L: 178 + return this.isInClanChat == TriBool.TriBool_true; } @ObfuscatedName("e") @@ -509,7 +509,7 @@ public final class Player extends Actor { ) @Export("transformedSize") int transformedSize() { - return this.appearance != null && this.appearance.npcTransformId != -1 ? WorldMapLabelSize.getNpcDefinition(this.appearance.npcTransformId).size : 1; // L: 182 183 185 + return this.appearance != null && this.appearance.npcTransformId != -1 ? WorldMapLabelSize.getNpcDefinition(this.appearance.npcTransformId).size : 1; } @ObfuscatedName("a") @@ -518,18 +518,18 @@ public final class Player extends Actor { garbageValue = "-1031926598" ) final void method2175(int var1, int var2, class185 var3) { - if (super.sequence != -1 && UserComparator5.SequenceDefinition_get(super.sequence).field2097 == 1) { // L: 248 + if (super.sequence != -1 && UserComparator5.SequenceDefinition_get(super.sequence).field2097 == 1) { super.sequence = -1; } - super.field1122 = -1; // L: 249 - if (var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) { // L: 250 - if (super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) { // L: 251 + super.field1122 = -1; + if (var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) { + if (super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) { if (var3 == class185.field2122) { - Archive.method5586(this, var1, var2, class185.field2122); // L: 253 + Archive.method5586(this, var1, var2, class185.field2122); } - this.method2177(var1, var2, var3); // L: 254 + this.method2177(var1, var2, var3); } else { this.resetPath(var1, var2); } @@ -537,7 +537,7 @@ public final class Player extends Actor { this.resetPath(var1, var2); } - } // L: 256 + } @ObfuscatedName("u") @ObfuscatedSignature( @@ -546,15 +546,15 @@ public final class Player extends Actor { ) @Export("resetPath") void resetPath(int var1, int var2) { - super.pathLength = 0; // L: 259 - super.field1098 = 0; // L: 260 - super.field1117 = 0; // L: 261 - super.pathX[0] = var1; // L: 262 - super.pathY[0] = var2; // L: 263 - int var3 = this.transformedSize(); // L: 264 - super.x = super.pathX[0] * 128 + var3 * 64; // L: 265 - super.y = var3 * 64 + super.pathY[0] * 128; // L: 266 - } // L: 267 + super.pathLength = 0; + super.field1098 = 0; + super.field1117 = 0; + super.pathX[0] = var1; + super.pathY[0] = var2; + int var3 = this.transformedSize(); + super.x = super.pathX[0] * 128 + var3 * 64; + super.y = var3 * 64 + super.pathY[0] * 128; + } @ObfuscatedName("k") @ObfuscatedSignature( @@ -562,20 +562,20 @@ public final class Player extends Actor { garbageValue = "1075045053" ) final void method2177(int var1, int var2, class185 var3) { - if (super.pathLength < 9) { // L: 270 + if (super.pathLength < 9) { ++super.pathLength; } - for (int var4 = super.pathLength; var4 > 0; --var4) { // L: 271 - super.pathX[var4] = super.pathX[var4 - 1]; // L: 272 - super.pathY[var4] = super.pathY[var4 - 1]; // L: 273 - super.field1153[var4] = super.field1153[var4 - 1]; // L: 274 + for (int var4 = super.pathLength; var4 > 0; --var4) { + super.pathX[var4] = super.pathX[var4 - 1]; + super.pathY[var4] = super.pathY[var4 - 1]; + super.field1153[var4] = super.field1153[var4 - 1]; } - super.pathX[0] = var1; // L: 276 - super.pathY[0] = var2; // L: 277 - super.field1153[0] = var3; // L: 278 - } // L: 279 + super.pathX[0] = var1; + super.pathY[0] = var2; + super.field1153[0] = var3; + } @ObfuscatedName("f") @ObfuscatedSignature( @@ -584,6 +584,6 @@ public final class Player extends Actor { ) @Export("isVisible") final boolean isVisible() { - return this.appearance != null; // L: 282 + return this.appearance != null; } } diff --git a/runescape-client/src/main/java/PlayerComposition.java b/runescape-client/src/main/java/PlayerComposition.java index e163aba60a..e586ae85dc 100644 --- a/runescape-client/src/main/java/PlayerComposition.java +++ b/runescape-client/src/main/java/PlayerComposition.java @@ -67,12 +67,12 @@ public class PlayerComposition { boolean field3200; static { - equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10}; // L: 26 - Widget_cachedSprites = new EvictingDualNodeHashTable(260); // L: 27 + equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10}; + Widget_cachedSprites = new EvictingDualNodeHashTable(260); } public PlayerComposition() { - this.field3200 = false; // L: 21 + this.field3200 = false; } @ObfuscatedName("c") @@ -81,9 +81,9 @@ public class PlayerComposition { garbageValue = "1940992993" ) public void method5368(int[] var1, class160[] var2, boolean var3, int[] var4, boolean var5, int var6) { - this.field3199 = var2; // L: 30 + this.field3199 = var2; this.field3200 = var3; - this.update(var1, var4, var5, var6); // L: 32 + this.update(var1, var4, var5, var6); } @ObfuscatedName("b") @@ -107,12 +107,12 @@ public class PlayerComposition { } } - this.equipment = var1; // L: 48 + this.equipment = var1; this.bodyColors = var2; this.isFemale = var3; this.npcTransformId = var4; - this.setHash(); // L: 52 - } // L: 53 + this.setHash(); + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -123,31 +123,31 @@ public class PlayerComposition { public void changeAppearance(int var1, boolean var2) { if (var1 != 1 || !this.isFemale) { int var3 = this.equipment[equipmentIndices[var1]]; - if (var3 != 0) { // L: 58 + if (var3 != 0) { var3 -= 256; KitDefinition var4; do { - if (!var2) { // L: 61 - --var3; // L: 62 - if (var3 < 0) { // L: 63 + if (!var2) { + --var3; + if (var3 < 0) { var3 = KitDefinition.KitDefinition_fileCount - 1; } } else { - ++var3; // L: 66 - if (var3 >= KitDefinition.KitDefinition_fileCount) { // L: 67 + ++var3; + if (var3 >= KitDefinition.KitDefinition_fileCount) { var3 = 0; } } - var4 = ArchiveDisk.KitDefinition_get(var3); // L: 69 - } while(var4 == null || var4.nonSelectable || var4.bodypartID != (this.isFemale ? 7 : 0) + var1); // L: 70 + var4 = ArchiveDisk.KitDefinition_get(var3); + } while(var4 == null || var4.nonSelectable || var4.bodypartID != (this.isFemale ? 7 : 0) + var1); - this.equipment[equipmentIndices[var1]] = var3 + 256; // L: 72 - this.setHash(); // L: 73 + this.equipment[equipmentIndices[var1]] = var3 + 256; + this.setHash(); } } - } // L: 74 + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -155,39 +155,39 @@ public class PlayerComposition { garbageValue = "1596195653" ) public void method5391(int var1, boolean var2) { - int var3 = this.bodyColors[var1]; // L: 77 + int var3 = this.bodyColors[var1]; boolean var4; - if (!var2) { // L: 78 + if (!var2) { do { - --var3; // L: 80 - if (var3 < 0) { // L: 81 - var3 = class114.field1382[var1].length - 1; // L: 82 + --var3; + if (var3 < 0) { + var3 = class114.field1382[var1].length - 1; } - if (var1 == 4 && var3 >= 8) { // L: 86 - var4 = false; // L: 87 + if (var1 == 4 && var3 >= 8) { + var4 = false; } else { - var4 = true; // L: 90 + var4 = true; } - } while(!var4); // L: 92 + } while(!var4); } else { do { - ++var3; // L: 97 - if (var3 >= class114.field1382[var1].length) { // L: 98 + ++var3; + if (var3 >= class114.field1382[var1].length) { var3 = 0; } - if (var1 == 4 && var3 >= 8) { // L: 101 - var4 = false; // L: 102 + if (var1 == 4 && var3 >= 8) { + var4 = false; } else { - var4 = true; // L: 105 + var4 = true; } - } while(!var4); // L: 107 + } while(!var4); } - this.bodyColors[var1] = var3; // L: 110 - this.setHash(); // L: 111 - } // L: 112 + this.bodyColors[var1] = var3; + this.setHash(); + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -196,10 +196,10 @@ public class PlayerComposition { ) @Export("changeSex") public void changeSex(boolean var1) { - if (this.isFemale != var1) { // L: 115 - this.update((int[])null, this.bodyColors, var1, -1); // L: 116 + if (this.isFemale != var1) { + this.update((int[])null, this.bodyColors, var1, -1); } - } // L: 117 + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -208,23 +208,23 @@ public class PlayerComposition { ) @Export("write") public void write(Buffer var1) { - var1.writeByte(this.isFemale ? 1 : 0); // L: 120 + var1.writeByte(this.isFemale ? 1 : 0); int var2; - for (var2 = 0; var2 < 7; ++var2) { // L: 121 - int var3 = this.equipment[equipmentIndices[var2]]; // L: 122 - if (var3 == 0) { // L: 123 + for (var2 = 0; var2 < 7; ++var2) { + int var3 = this.equipment[equipmentIndices[var2]]; + if (var3 == 0) { var1.writeByte(-1); } else { - var1.writeByte(var3 - 256); // L: 124 + var1.writeByte(var3 - 256); } } - for (var2 = 0; var2 < 5; ++var2) { // L: 126 + for (var2 = 0; var2 < 5; ++var2) { var1.writeByte(this.bodyColors[var2]); } - } // L: 127 + } @ObfuscatedName("j") @ObfuscatedSignature( @@ -233,43 +233,43 @@ public class PlayerComposition { ) @Export("setHash") void setHash() { - long var1 = this.hash; // L: 130 - int var3 = this.equipment[5]; // L: 131 - int var4 = this.equipment[9]; // L: 132 - this.equipment[5] = var4; // L: 133 - this.equipment[9] = var3; // L: 134 - this.hash = 0L; // L: 135 + long var1 = this.hash; + int var3 = this.equipment[5]; + int var4 = this.equipment[9]; + this.equipment[5] = var4; + this.equipment[9] = var3; + this.hash = 0L; int var5; - for (var5 = 0; var5 < 12; ++var5) { // L: 136 - this.hash <<= 4; // L: 137 - if (this.equipment[var5] >= 256) { // L: 138 + for (var5 = 0; var5 < 12; ++var5) { + this.hash <<= 4; + if (this.equipment[var5] >= 256) { this.hash += (long)(this.equipment[var5] - 256); } } - if (this.equipment[0] >= 256) { // L: 140 + if (this.equipment[0] >= 256) { this.hash += (long)(this.equipment[0] - 256 >> 4); } - if (this.equipment[1] >= 256) { // L: 141 + if (this.equipment[1] >= 256) { this.hash += (long)(this.equipment[1] - 256 >> 8); } - for (var5 = 0; var5 < 5; ++var5) { // L: 142 - this.hash <<= 3; // L: 143 - this.hash += (long)this.bodyColors[var5]; // L: 144 + for (var5 = 0; var5 < 5; ++var5) { + this.hash <<= 3; + this.hash += (long)this.bodyColors[var5]; } - this.hash <<= 1; // L: 146 - this.hash += (long)(this.isFemale ? 1 : 0); // L: 147 - this.equipment[5] = var3; // L: 148 - this.equipment[9] = var4; // L: 149 - if (var1 != 0L && var1 != this.hash || this.field3200) { // L: 150 + this.hash <<= 1; + this.hash += (long)(this.isFemale ? 1 : 0); + this.equipment[5] = var3; + this.equipment[9] = var4; + if (var1 != 0L && var1 != this.hash || this.field3200) { Widget_cachedSprites.remove(var1); } - } // L: 151 + } @ObfuscatedName("w") @ObfuscatedSignature( @@ -278,127 +278,127 @@ public class PlayerComposition { ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { - if (this.npcTransformId != -1) { // L: 154 - return WorldMapLabelSize.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); // L: 155 + if (this.npcTransformId != -1) { + return WorldMapLabelSize.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); } else { - long var5 = this.hash; // L: 157 - int[] var7 = this.equipment; // L: 158 - if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) { // L: 159 - var7 = new int[12]; // L: 160 + long var5 = this.hash; + int[] var7 = this.equipment; + if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) { + var7 = new int[12]; - for (int var8 = 0; var8 < 12; ++var8) { // L: 161 + for (int var8 = 0; var8 < 12; ++var8) { var7[var8] = this.equipment[var8]; } - if (var1.shield >= 0) { // L: 162 - var5 += (long)(var1.shield - this.equipment[5] << 40); // L: 163 - var7[5] = var1.shield; // L: 164 + if (var1.shield >= 0) { + var5 += (long)(var1.shield - this.equipment[5] << 40); + var7[5] = var1.shield; } - if (var1.weapon >= 0) { // L: 166 - var5 += (long)(var1.weapon - this.equipment[3] << 48); // L: 167 - var7[3] = var1.weapon; // L: 168 + if (var1.weapon >= 0) { + var5 += (long)(var1.weapon - this.equipment[3] << 48); + var7[3] = var1.weapon; } } - Model var18 = (Model)Widget_cachedSprites.get(var5); // L: 171 - if (var18 == null) { // L: 172 - boolean var9 = false; // L: 173 + Model var18 = (Model)Widget_cachedSprites.get(var5); + if (var18 == null) { + boolean var9 = false; int var11; - for (int var10 = 0; var10 < 12; ++var10) { // L: 174 - var11 = var7[var10]; // L: 175 - if (var11 >= 256 && var11 < 512 && !ArchiveDisk.KitDefinition_get(var11 - 256).ready()) { // L: 176 177 + for (int var10 = 0; var10 < 12; ++var10) { + var11 = var7[var10]; + if (var11 >= 256 && var11 < 512 && !ArchiveDisk.KitDefinition_get(var11 - 256).ready()) { var9 = true; } - if (var11 >= 512 && !UserComparator6.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { // L: 179 180 + if (var11 >= 512 && !UserComparator6.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { var9 = true; } } - if (var9) { // L: 183 - if (this.field3201 != -1L) { // L: 184 + if (var9) { + if (this.field3201 != -1L) { var18 = (Model)Widget_cachedSprites.get(this.field3201); } - if (var18 == null) { // L: 185 + if (var18 == null) { return null; } } - if (var18 == null) { // L: 187 - ModelData[] var19 = new ModelData[12]; // L: 188 - var11 = 0; // L: 189 + if (var18 == null) { + ModelData[] var19 = new ModelData[12]; + var11 = 0; int var13; - for (int var12 = 0; var12 < 12; ++var12) { // L: 190 - var13 = var7[var12]; // L: 191 - if (var13 >= 256 && var13 < 512) { // L: 192 - ModelData var14 = ArchiveDisk.KitDefinition_get(var13 - 256).getModelData(); // L: 193 - if (var14 != null) { // L: 194 + for (int var12 = 0; var12 < 12; ++var12) { + var13 = var7[var12]; + if (var13 >= 256 && var13 < 512) { + ModelData var14 = ArchiveDisk.KitDefinition_get(var13 - 256).getModelData(); + if (var14 != null) { var19[var11++] = var14; } } - if (var13 >= 512) { // L: 196 - ItemComposition var22 = UserComparator6.ItemDefinition_get(var13 - 512); // L: 197 - ModelData var15 = var22.method3554(this.isFemale); // L: 198 - if (var15 != null) { // L: 199 - if (this.field3199 != null) { // L: 200 - class160 var16 = this.field3199[var12]; // L: 201 - if (var16 != null) { // L: 202 + if (var13 >= 512) { + ItemComposition var22 = UserComparator6.ItemDefinition_get(var13 - 512); + ModelData var15 = var22.method3554(this.isFemale); + if (var15 != null) { + if (this.field3199 != null) { + class160 var16 = this.field3199[var12]; + if (var16 != null) { int var17; - if (var16.field1732 != null && var22.recolorFrom != null && var22.recolorTo.length == var16.field1732.length) { // L: 203 - for (var17 = 0; var17 < var22.recolorFrom.length; ++var17) { // L: 204 - var15.recolor(var22.recolorTo[var17], var16.field1732[var17]); // L: 205 + if (var16.field1732 != null && var22.recolorFrom != null && var22.recolorTo.length == var16.field1732.length) { + for (var17 = 0; var17 < var22.recolorFrom.length; ++var17) { + var15.recolor(var22.recolorTo[var17], var16.field1732[var17]); } } - if (var16.field1738 != null && var22.retextureFrom != null && var22.retextureTo.length == var16.field1738.length) { // L: 208 - for (var17 = 0; var17 < var22.retextureFrom.length; ++var17) { // L: 209 - var15.retexture(var22.retextureTo[var17], var16.field1738[var17]); // L: 210 + if (var16.field1738 != null && var22.retextureFrom != null && var22.retextureTo.length == var16.field1738.length) { + for (var17 = 0; var17 < var22.retextureFrom.length; ++var17) { + var15.retexture(var22.retextureTo[var17], var16.field1738[var17]); } } } } - var19[var11++] = var15; // L: 215 + var19[var11++] = var15; } } } - ModelData var20 = new ModelData(var19, var11); // L: 219 + ModelData var20 = new ModelData(var19, var11); - for (var13 = 0; var13 < 5; ++var13) { // L: 220 - if (this.bodyColors[var13] < class114.field1382[var13].length) { // L: 221 + for (var13 = 0; var13 < 5; ++var13) { + if (this.bodyColors[var13] < class114.field1382[var13].length) { var20.recolor(field3197[var13], class114.field1382[var13][this.bodyColors[var13]]); } - if (this.bodyColors[var13] < field3203[var13].length) { // L: 222 + if (this.bodyColors[var13] < field3203[var13].length) { var20.recolor(class132.field1540[var13], field3203[var13][this.bodyColors[var13]]); } } - var18 = var20.toModel(64, 850, -30, -50, -30); // L: 224 - Widget_cachedSprites.put(var18, var5); // L: 225 - this.field3201 = var5; // L: 226 + var18 = var20.toModel(64, 850, -30, -50, -30); + Widget_cachedSprites.put(var18, var5); + this.field3201 = var5; } } - if (var1 == null && var3 == null) { // L: 230 + if (var1 == null && var3 == null) { return var18; } else { Model var21; - if (var1 != null && var3 != null) { // L: 231 + if (var1 != null && var3 != null) { var21 = var1.applyTransformations(var18, var2, var3, var4); - } else if (var1 != null) { // L: 232 + } else if (var1 != null) { var21 = var1.transformActorModel(var18, var2); } else { - var21 = var3.transformActorModel(var18, var4); // L: 233 + var21 = var3.transformActorModel(var18, var4); } - return var21; // L: 234 + return var21; } } } @@ -410,61 +410,61 @@ public class PlayerComposition { ) @Export("getModelData") ModelData getModelData() { - if (this.npcTransformId != -1) { // L: 238 - return WorldMapLabelSize.getNpcDefinition(this.npcTransformId).getModelData(); // L: 239 + if (this.npcTransformId != -1) { + return WorldMapLabelSize.getNpcDefinition(this.npcTransformId).getModelData(); } else { - boolean var1 = false; // L: 241 + boolean var1 = false; int var3; - for (int var2 = 0; var2 < 12; ++var2) { // L: 242 - var3 = this.equipment[var2]; // L: 243 - if (var3 >= 256 && var3 < 512 && !ArchiveDisk.KitDefinition_get(var3 - 256).method3210()) { // L: 244 245 + for (int var2 = 0; var2 < 12; ++var2) { + var3 = this.equipment[var2]; + if (var3 >= 256 && var3 < 512 && !ArchiveDisk.KitDefinition_get(var3 - 256).method3210()) { var1 = true; } - if (var3 >= 512 && !UserComparator6.ItemDefinition_get(var3 - 512).method3555(this.isFemale)) { // L: 247 248 + if (var3 >= 512 && !UserComparator6.ItemDefinition_get(var3 - 512).method3555(this.isFemale)) { var1 = true; } } - if (var1) { // L: 251 + if (var1) { return null; } else { - ModelData[] var7 = new ModelData[12]; // L: 252 - var3 = 0; // L: 253 + ModelData[] var7 = new ModelData[12]; + var3 = 0; int var5; - for (int var4 = 0; var4 < 12; ++var4) { // L: 254 - var5 = this.equipment[var4]; // L: 255 + for (int var4 = 0; var4 < 12; ++var4) { + var5 = this.equipment[var4]; ModelData var6; - if (var5 >= 256 && var5 < 512) { // L: 256 - var6 = ArchiveDisk.KitDefinition_get(var5 - 256).getKitDefinitionModels(); // L: 257 - if (var6 != null) { // L: 258 + if (var5 >= 256 && var5 < 512) { + var6 = ArchiveDisk.KitDefinition_get(var5 - 256).getKitDefinitionModels(); + if (var6 != null) { var7[var3++] = var6; } } - if (var5 >= 512) { // L: 260 - var6 = UserComparator6.ItemDefinition_get(var5 - 512).method3601(this.isFemale); // L: 261 - if (var6 != null) { // L: 262 + if (var5 >= 512) { + var6 = UserComparator6.ItemDefinition_get(var5 - 512).method3601(this.isFemale); + if (var6 != null) { var7[var3++] = var6; } } } - ModelData var8 = new ModelData(var7, var3); // L: 265 + ModelData var8 = new ModelData(var7, var3); - for (var5 = 0; var5 < 5; ++var5) { // L: 266 - if (this.bodyColors[var5] < class114.field1382[var5].length) { // L: 267 + for (var5 = 0; var5 < 5; ++var5) { + if (this.bodyColors[var5] < class114.field1382[var5].length) { var8.recolor(field3197[var5], class114.field1382[var5][this.bodyColors[var5]]); } - if (this.bodyColors[var5] < field3203[var5].length) { // L: 268 + if (this.bodyColors[var5] < field3203[var5].length) { var8.recolor(class132.field1540[var5], field3203[var5][this.bodyColors[var5]]); } } - return var8; // L: 270 + return var8; } } } @@ -476,7 +476,7 @@ public class PlayerComposition { ) @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 + WorldMapLabelSize.getNpcDefinition(this.npcTransformId).id; // L: 274 275 + 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 + WorldMapLabelSize.getNpcDefinition(this.npcTransformId).id; } @ObfuscatedName("c") @@ -487,36 +487,36 @@ public class PlayerComposition { @Export("loadWorlds") static boolean loadWorlds() { try { - if (HorizontalAlignment.World_request == null) { // L: 31 + if (HorizontalAlignment.World_request == null) { HorizontalAlignment.World_request = WorldMapData_1.urlRequester.request(new URL(AbstractWorldMapIcon.field2761)); - } else if (HorizontalAlignment.World_request.isDone()) { // L: 33 - byte[] var0 = HorizontalAlignment.World_request.getResponse(); // L: 34 - Buffer var1 = new Buffer(var0); // L: 35 - var1.readInt(); // L: 36 - World.World_count = var1.readUnsignedShort(); // L: 37 - class334.World_worlds = new World[World.World_count]; // L: 38 + } else if (HorizontalAlignment.World_request.isDone()) { + byte[] var0 = HorizontalAlignment.World_request.getResponse(); + Buffer var1 = new Buffer(var0); + var1.readInt(); + World.World_count = var1.readUnsignedShort(); + class334.World_worlds = new World[World.World_count]; World var3; - for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { // L: 39 47 - var3 = class334.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 + for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { + var3 = class334.World_worlds[var2] = new World(); + var3.id = var1.readUnsignedShort(); + var3.properties = var1.readInt(); + var3.host = var1.readStringCp1252NullTerminated(); var3.activity = var1.readStringCp1252NullTerminated(); var3.location = var1.readUnsignedByte(); var3.population = var1.readShort(); } - UserComparator4.sortWorlds(class334.World_worlds, 0, class334.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 49 - HorizontalAlignment.World_request = null; // L: 50 - return true; // L: 51 + UserComparator4.sortWorlds(class334.World_worlds, 0, class334.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); + HorizontalAlignment.World_request = null; + return true; } - } catch (Exception var4) { // L: 55 - var4.printStackTrace(); // L: 56 - HorizontalAlignment.World_request = null; // L: 57 + } catch (Exception var4) { + var4.printStackTrace(); + HorizontalAlignment.World_request = null; } - return false; // L: 59 + return false; } @ObfuscatedName("t") @@ -526,7 +526,7 @@ public class PlayerComposition { ) @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 + ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); + return var1 == null ? 0 : var1.size(); } } diff --git a/runescape-client/src/main/java/PlayerType.java b/runescape-client/src/main/java/PlayerType.java index 30ffa2650a..47923dc53e 100644 --- a/runescape-client/src/main/java/PlayerType.java +++ b/runescape-client/src/main/java/PlayerType.java @@ -79,11 +79,11 @@ public enum PlayerType implements MouseWheel { public final boolean isUser; PlayerType(int var3, int var4, boolean var5, boolean var6, boolean var7) { - this.id = var3; // L: 26 - this.modIcon = var4; // L: 27 - this.isPrivileged = var6; // L: 28 - this.isUser = var7; // L: 29 - } // L: 30 + this.id = var3; + this.modIcon = var4; + this.isPrivileged = var6; + this.isUser = var7; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -92,7 +92,7 @@ public enum PlayerType implements MouseWheel { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 34 + return this.id; } @ObfuscatedName("h") @@ -101,8 +101,8 @@ public enum PlayerType implements MouseWheel { garbageValue = "1177241334" ) static void method5521(int var0) { - if (var0 != Login.loginIndex) { // L: 1986 - Login.loginIndex = var0; // L: 1987 + if (var0 != Login.loginIndex) { + Login.loginIndex = var0; } - } // L: 1988 + } } diff --git a/runescape-client/src/main/java/Players.java b/runescape-client/src/main/java/Players.java index 3307023710..aae70b0f48 100644 --- a/runescape-client/src/main/java/Players.java +++ b/runescape-client/src/main/java/Players.java @@ -79,19 +79,19 @@ public class Players { static Archive archive11; static { - field1243 = new byte[2048]; // L: 18 - field1246 = new class185[2048]; // L: 19 - field1248 = new Buffer[2048]; // L: 20 - Players_count = 0; // L: 21 - Players_indices = new int[2048]; // L: 22 - Players_emptyIdxCount = 0; // L: 23 - Players_emptyIndices = new int[2048]; // L: 24 - Players_regions = new int[2048]; // L: 25 + field1243 = new byte[2048]; + field1246 = new class185[2048]; + field1248 = new Buffer[2048]; + Players_count = 0; + Players_indices = new int[2048]; + Players_emptyIdxCount = 0; + Players_emptyIndices = new int[2048]; + Players_regions = new int[2048]; Players_orientations = new int[2048]; Players_targetIndices = new int[2048]; Players_pendingUpdateCount = 0; Players_pendingUpdateIndices = new int[2048]; - field1257 = new Buffer(new byte[5000]); // L: 30 + field1257 = new Buffer(new byte[5000]); } @ObfuscatedName("c") @@ -100,10 +100,10 @@ public class Players { garbageValue = "2062230724" ) public static void method2382(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 - NetSocket.method3118(var0, var5, var6, var3, var4); // L: 28 - } // L: 29 + int var5 = var0.getGroupId(var1); + int var6 = var0.getFileId(var5, var2); + NetSocket.method3118(var0, var5, var6, var3, var4); + } @ObfuscatedName("kz") @ObfuscatedSignature( @@ -111,8 +111,8 @@ public class Players { garbageValue = "-733179789" ) static final void method2383(int var0) { - var0 = Math.min(Math.max(var0, 0), 127); // L: 12155 - SecureRandomFuture.clientPreferences.areaSoundEffectsVolume = var0; // L: 12156 - class127.savePreferences(); // L: 12157 - } // L: 12158 + var0 = Math.min(Math.max(var0, 0), 127); + SecureRandomFuture.clientPreferences.areaSoundEffectsVolume = var0; + class127.savePreferences(); + } } diff --git a/runescape-client/src/main/java/PrivateChatMode.java b/runescape-client/src/main/java/PrivateChatMode.java index 8673776d0e..95a17193b7 100644 --- a/runescape-client/src/main/java/PrivateChatMode.java +++ b/runescape-client/src/main/java/PrivateChatMode.java @@ -28,12 +28,12 @@ public class PrivateChatMode { public final int field4597; static { - field4595 = new PrivateChatMode(0); // L: 5 - field4596 = new PrivateChatMode(1); // L: 6 + field4595 = new PrivateChatMode(0); + field4596 = new PrivateChatMode(1); field4594 = new PrivateChatMode(2); - } // L: 7 + } PrivateChatMode(int var1) { - this.field4597 = var1; // L: 15 - } // L: 16 + this.field4597 = var1; + } } diff --git a/runescape-client/src/main/java/Projectile.java b/runescape-client/src/main/java/Projectile.java index 2d5bdc031a..ed05e6da09 100644 --- a/runescape-client/src/main/java/Projectile.java +++ b/runescape-client/src/main/java/Projectile.java @@ -139,28 +139,28 @@ public final class Projectile extends Renderable { Projectile(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { this.isMoving = false; - this.frame = 0; // L: 32 + this.frame = 0; this.field904 = 0; this.id = var1; this.plane = var2; this.sourceX = var3; - this.sourceY = var4; // L: 39 + this.sourceY = var4; this.sourceZ = var5; - this.cycleStart = var6; // L: 41 - this.cycleEnd = var7; // L: 42 - this.slope = var8; // L: 43 - this.startHeight = var9; // L: 44 - this.targetIndex = var10; // L: 45 - this.endHeight = var11; // L: 46 - this.isMoving = false; // L: 47 - int var12 = AccessFile.SpotAnimationDefinition_get(this.id).sequence; // L: 48 - if (var12 != -1) { // L: 49 + this.cycleStart = var6; + this.cycleEnd = var7; + this.slope = var8; + this.startHeight = var9; + this.targetIndex = var10; + this.endHeight = var11; + this.isMoving = false; + int var12 = AccessFile.SpotAnimationDefinition_get(this.id).sequence; + if (var12 != -1) { this.sequenceDefinition = UserComparator5.SequenceDefinition_get(var12); } else { - this.sequenceDefinition = null; // L: 50 + this.sequenceDefinition = null; } - } // L: 51 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -170,25 +170,25 @@ public final class Projectile extends Renderable { @Export("setDestination") final void setDestination(int var1, int var2, int var3, int var4) { double var5; - if (!this.isMoving) { // L: 54 - var5 = (double)(var1 - this.sourceX); // L: 55 - double var7 = (double)(var2 - this.sourceY); // L: 56 - double var9 = Math.sqrt(var5 * var5 + var7 * var7); // L: 57 - this.x = (double)this.sourceX + (double)this.startHeight * var5 / var9; // L: 58 - this.y = (double)this.sourceY + var7 * (double)this.startHeight / var9; // L: 59 - this.z = (double)this.sourceZ; // L: 60 + if (!this.isMoving) { + var5 = (double)(var1 - this.sourceX); + double var7 = (double)(var2 - this.sourceY); + double var9 = Math.sqrt(var5 * var5 + var7 * var7); + this.x = (double)this.sourceX + (double)this.startHeight * var5 / var9; + this.y = (double)this.sourceY + var7 * (double)this.startHeight / var9; + this.z = (double)this.sourceZ; } var5 = (double)(this.cycleEnd + 1 - var4); this.speedX = ((double)var1 - this.x) / var5; - this.speedY = ((double)var2 - this.y) / var5; // L: 64 - this.speed = Math.sqrt(this.speedX * this.speedX + this.speedY * this.speedY); // L: 65 - if (!this.isMoving) { // L: 66 + this.speedY = ((double)var2 - this.y) / var5; + this.speed = Math.sqrt(this.speedX * this.speedX + this.speedY * this.speedY); + if (!this.isMoving) { this.speedZ = -this.speed * Math.tan(0.02454369D * (double)this.slope); } - this.accelerationZ = ((double)var3 - this.z - this.speedZ * var5) * 2.0D / (var5 * var5); // L: 67 - } // L: 68 + this.accelerationZ = ((double)var3 - this.z - this.speedZ * var5) * 2.0D / (var5 * var5); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -197,13 +197,13 @@ public final class Projectile extends Renderable { ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = AccessFile.SpotAnimationDefinition_get(this.id); // L: 101 - Model var2 = var1.getModel(this.frame); // L: 102 - if (var2 == null) { // L: 103 + SpotAnimationDefinition var1 = AccessFile.SpotAnimationDefinition_get(this.id); + Model var2 = var1.getModel(this.frame); + if (var2 == null) { return null; } else { - var2.rotateZ(this.pitch); // L: 104 - return var2; // L: 105 + var2.rotateZ(this.pitch); + return var2; } } @@ -214,38 +214,38 @@ public final class Projectile extends Renderable { ) @Export("advance") final void advance(int var1) { - this.isMoving = true; // L: 71 - this.x += this.speedX * (double)var1; // L: 72 - this.y += this.speedY * (double)var1; // L: 73 - this.z += (double)var1 * this.speedZ + (double)var1 * 0.5D * this.accelerationZ * (double)var1; // L: 74 - this.speedZ += (double)var1 * this.accelerationZ; // 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.method3690()) { // L: 79 - this.field904 += var1; // L: 80 + this.isMoving = true; + this.x += this.speedX * (double)var1; + this.y += this.speedY * (double)var1; + this.z += (double)var1 * this.speedZ + (double)var1 * 0.5D * this.accelerationZ * (double)var1; + this.speedZ += (double)var1 * this.accelerationZ; + this.yaw = (int)(Math.atan2(this.speedX, this.speedY) * 325.949D) + 1024 & 2047; + this.pitch = (int)(Math.atan2(this.speedZ, this.speed) * 325.949D) & 2047; + if (this.sequenceDefinition != null) { + if (!this.sequenceDefinition.method3690()) { + this.field904 += var1; while (true) { do { do { - if (this.field904 <= this.sequenceDefinition.frameLengths[this.frame]) { // L: 81 - return; // L: 98 + if (this.field904 <= this.sequenceDefinition.frameLengths[this.frame]) { + return; } - this.field904 -= this.sequenceDefinition.frameLengths[this.frame]; // L: 82 - ++this.frame; // L: 83 - } while(this.frame < this.sequenceDefinition.frameIds.length); // L: 84 + this.field904 -= this.sequenceDefinition.frameLengths[this.frame]; + ++this.frame; + } while(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 -= this.sequenceDefinition.frameCount; + } while(this.frame >= 0 && this.frame < this.sequenceDefinition.frameIds.length); this.frame = 0; } } else { - this.frame += var1; // L: 91 - int var2 = this.sequenceDefinition.method3647(); // L: 92 - if (this.frame >= var2) { // L: 93 - this.frame = var2 - this.sequenceDefinition.frameCount; // L: 94 + this.frame += var1; + int var2 = this.sequenceDefinition.method3647(); + if (this.frame >= var2) { + this.frame = var2 - this.sequenceDefinition.frameCount; } } } @@ -259,36 +259,36 @@ public final class Projectile extends Renderable { ) @Export("sortItemsByName") static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) { - if (var2 < var3) { // L: 13 - int var4 = (var3 + var2) / 2; // L: 14 - int var5 = var2; // L: 15 - String var6 = var0[var4]; // L: 16 - var0[var4] = var0[var3]; // L: 17 - var0[var3] = var6; // L: 18 - short var7 = var1[var4]; // L: 19 - var1[var4] = var1[var3]; // L: 20 - var1[var3] = var7; // L: 21 + if (var2 < var3) { + int var4 = (var3 + var2) / 2; + int var5 = var2; + String var6 = var0[var4]; + var0[var4] = var0[var3]; + var0[var3] = var6; + short var7 = var1[var4]; + var1[var4] = var1[var3]; + var1[var3] = var7; - for (int var8 = var2; var8 < var3; ++var8) { // L: 22 - if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { // L: 23 - String var9 = var0[var8]; // L: 24 - var0[var8] = var0[var5]; // L: 25 - var0[var5] = var9; // L: 26 - short var10 = var1[var8]; // L: 27 - var1[var8] = var1[var5]; // L: 28 - var1[var5++] = var10; // L: 29 + for (int var8 = var2; var8 < var3; ++var8) { + if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { + String var9 = var0[var8]; + var0[var8] = var0[var5]; + var0[var5] = var9; + short var10 = var1[var8]; + var1[var8] = var1[var5]; + var1[var5++] = var10; } } - var0[var3] = var0[var5]; // L: 33 - var0[var5] = var6; // L: 34 - var1[var3] = var1[var5]; // L: 35 - var1[var5] = var7; // L: 36 - sortItemsByName(var0, var1, var2, var5 - 1); // L: 37 - sortItemsByName(var0, var1, var5 + 1, var3); // L: 38 + var0[var3] = var0[var5]; + var0[var5] = var6; + var1[var3] = var1[var5]; + var1[var5] = var7; + sortItemsByName(var0, var1, var2, var5 - 1); + sortItemsByName(var0, var1, var5 + 1, var3); } - } // L: 40 + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -296,7 +296,7 @@ public final class Projectile extends Renderable { garbageValue = "1237382938" ) public static boolean method2008() { - return class260.musicPlayerStatus != 0 ? true : class260.midiPcmStream.isReady(); // L: 62 63 + return class260.musicPlayerStatus != 0 ? true : class260.midiPcmStream.isReady(); } @ObfuscatedName("f") @@ -306,34 +306,34 @@ public final class Projectile extends Renderable { ) static int method2010(int var0, Script var1, boolean var2) { Widget var5; - if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { // L: 1362 - var5 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 1363 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.itemId; // L: 1364 - return 1; // L: 1365 - } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { // L: 1367 - var5 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 1368 - if (var5.itemId != -1) { // L: 1369 + if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { + var5 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.itemId; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { + var5 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); + if (var5.itemId != -1) { Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.itemQuantity; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1370 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; } - return 1; // L: 1371 - } else if (var0 == ScriptOpcodes.IF_HASSUB) { // L: 1373 - int var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1374 - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3); // L: 1375 - if (var4 != null) { // L: 1376 + return 1; + } else if (var0 == ScriptOpcodes.IF_HASSUB) { + int var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3); + if (var4 != null) { Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1377 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; } - return 1; // L: 1378 - } else if (var0 == ScriptOpcodes.IF_GETTOP) { // L: 1380 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.rootInterface; // L: 1381 - return 1; // L: 1382 + return 1; + } else if (var0 == ScriptOpcodes.IF_GETTOP) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.rootInterface; + return 1; } else { - return 2; // L: 1384 + return 2; } } } diff --git a/runescape-client/src/main/java/RasterProvider.java b/runescape-client/src/main/java/RasterProvider.java index cc426cb4cb..d5056830f2 100644 --- a/runescape-client/src/main/java/RasterProvider.java +++ b/runescape-client/src/main/java/RasterProvider.java @@ -25,16 +25,16 @@ public final class RasterProvider extends AbstractRasterProvider { Image image; RasterProvider(int var1, int var2, Component var3) { - super.width = var1; // L: 23 - super.height = var2; // L: 24 - super.pixels = new int[var2 * var1 + 1]; // L: 25 - DataBufferInt var4 = new DataBufferInt(super.pixels, super.pixels.length); // L: 26 - DirectColorModel var5 = new DirectColorModel(32, 16711680, 65280, 255); // L: 27 - WritableRaster var6 = Raster.createWritableRaster(var5.createCompatibleSampleModel(super.width, super.height), var4, (Point)null); // L: 28 - this.image = new BufferedImage(var5, var6, false, new Hashtable()); // L: 29 - this.setComponent(var3); // L: 30 - this.apply(); // L: 31 - } // L: 32 + super.width = var1; + super.height = var2; + super.pixels = new int[var2 * var1 + 1]; + DataBufferInt var4 = new DataBufferInt(super.pixels, super.pixels.length); + DirectColorModel var5 = new DirectColorModel(32, 16711680, 65280, 255); + WritableRaster var6 = Raster.createWritableRaster(var5.createCompatibleSampleModel(super.width, super.height), var4, (Point)null); + this.image = new BufferedImage(var5, var6, false, new Hashtable()); + this.setComponent(var3); + this.apply(); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -43,8 +43,8 @@ public final class RasterProvider extends AbstractRasterProvider { ) @Export("setComponent") final void setComponent(Component var1) { - this.component = var1; // L: 35 - } // L: 36 + this.component = var1; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -53,8 +53,8 @@ public final class RasterProvider extends AbstractRasterProvider { ) @Export("drawFull") public final void drawFull(int var1, int var2) { - this.drawFull0(this.component.getGraphics(), var1, var2); // L: 40 - } // L: 41 + this.drawFull0(this.component.getGraphics(), var1, var2); + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -63,8 +63,8 @@ public final class RasterProvider extends AbstractRasterProvider { ) @Export("draw") public final void draw(int var1, int var2, int var3, int var4) { - this.draw0(this.component.getGraphics(), var1, var2, var3, var4); // L: 45 - } // L: 46 + this.draw0(this.component.getGraphics(), var1, var2, var3, var4); + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -74,12 +74,12 @@ public final class RasterProvider extends AbstractRasterProvider { @Export("drawFull0") final void drawFull0(Graphics var1, int var2, int var3) { try { - var1.drawImage(this.image, var2, var3, this.component); // L: 50 - } catch (Exception var5) { // L: 52 - this.component.repaint(); // L: 53 + var1.drawImage(this.image, var2, var3, this.component); + } catch (Exception var5) { + this.component.repaint(); } - } // L: 55 + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -89,13 +89,13 @@ public final class RasterProvider extends AbstractRasterProvider { @Export("draw0") final void draw0(Graphics var1, int var2, int var3, int var4, int var5) { try { - 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 + Shape var6 = var1.getClip(); + var1.clipRect(var2, var3, var4, var5); + var1.drawImage(this.image, 0, 0, this.component); + var1.setClip(var6); + } catch (Exception var7) { + this.component.repaint(); } - } // L: 67 + } } diff --git a/runescape-client/src/main/java/Rasterizer2D.java b/runescape-client/src/main/java/Rasterizer2D.java index 9013a76db4..93ed6ecf2b 100644 --- a/runescape-client/src/main/java/Rasterizer2D.java +++ b/runescape-client/src/main/java/Rasterizer2D.java @@ -29,145 +29,145 @@ public class Rasterizer2D extends DualNode { public static int Rasterizer2D_xClipEnd; static { - Rasterizer2D_yClipStart = 0; // L: 11 - Rasterizer2D_yClipEnd = 0; // L: 12 - Rasterizer2D_xClipStart = 0; // L: 13 - Rasterizer2D_xClipEnd = 0; // L: 14 + Rasterizer2D_yClipStart = 0; + Rasterizer2D_yClipEnd = 0; + Rasterizer2D_xClipStart = 0; + Rasterizer2D_xClipEnd = 0; } protected Rasterizer2D() { - } // L: 16 + } @ObfuscatedName("cq") @Export("Rasterizer2D_replace") public static void Rasterizer2D_replace(int[] var0, int var1, int var2) { - Rasterizer2D_pixels = var0; // L: 19 - Rasterizer2D_width = var1; // L: 20 - Rasterizer2D_height = var2; // L: 21 - Rasterizer2D_setClip(0, 0, var1, var2); // L: 22 - } // L: 23 + Rasterizer2D_pixels = var0; + Rasterizer2D_width = var1; + Rasterizer2D_height = var2; + Rasterizer2D_setClip(0, 0, var1, var2); + } @ObfuscatedName("cf") @Export("Rasterizer2D_resetClip") public static void Rasterizer2D_resetClip() { - Rasterizer2D_xClipStart = 0; // L: 26 - Rasterizer2D_yClipStart = 0; // L: 27 - Rasterizer2D_xClipEnd = Rasterizer2D_width; // L: 28 - Rasterizer2D_yClipEnd = Rasterizer2D_height; // L: 29 - } // L: 30 + Rasterizer2D_xClipStart = 0; + Rasterizer2D_yClipStart = 0; + Rasterizer2D_xClipEnd = Rasterizer2D_width; + Rasterizer2D_yClipEnd = Rasterizer2D_height; + } @ObfuscatedName("cu") @Export("Rasterizer2D_setClip") public static void Rasterizer2D_setClip(int var0, int var1, int var2, int var3) { - if (var0 < 0) { // L: 33 + if (var0 < 0) { var0 = 0; } - if (var1 < 0) { // L: 34 + if (var1 < 0) { var1 = 0; } - if (var2 > Rasterizer2D_width) { // L: 35 + if (var2 > Rasterizer2D_width) { var2 = Rasterizer2D_width; } if (var3 > Rasterizer2D_height) { - var3 = Rasterizer2D_height; // L: 36 + var3 = Rasterizer2D_height; } - Rasterizer2D_xClipStart = var0; // L: 37 - Rasterizer2D_yClipStart = var1; // L: 38 - Rasterizer2D_xClipEnd = var2; // L: 39 - Rasterizer2D_yClipEnd = var3; // L: 40 - } // L: 41 + Rasterizer2D_xClipStart = var0; + Rasterizer2D_yClipStart = var1; + Rasterizer2D_xClipEnd = var2; + Rasterizer2D_yClipEnd = var3; + } @ObfuscatedName("cx") @Export("Rasterizer2D_expandClip") public static void Rasterizer2D_expandClip(int var0, int var1, int var2, int var3) { - if (Rasterizer2D_xClipStart < var0) { // L: 44 + if (Rasterizer2D_xClipStart < var0) { Rasterizer2D_xClipStart = var0; } - if (Rasterizer2D_yClipStart < var1) { // L: 45 + if (Rasterizer2D_yClipStart < var1) { Rasterizer2D_yClipStart = var1; } - if (Rasterizer2D_xClipEnd > var2) { // L: 46 + if (Rasterizer2D_xClipEnd > var2) { Rasterizer2D_xClipEnd = var2; } - if (Rasterizer2D_yClipEnd > var3) { // L: 47 + if (Rasterizer2D_yClipEnd > var3) { Rasterizer2D_yClipEnd = var3; } - } // L: 48 + } @ObfuscatedName("cm") @Export("Rasterizer2D_getClipArray") public static void Rasterizer2D_getClipArray(int[] var0) { - var0[0] = Rasterizer2D_xClipStart; // L: 51 - var0[1] = Rasterizer2D_yClipStart; // L: 52 - var0[2] = Rasterizer2D_xClipEnd; // L: 53 - var0[3] = Rasterizer2D_yClipEnd; // L: 54 - } // L: 55 + var0[0] = Rasterizer2D_xClipStart; + var0[1] = Rasterizer2D_yClipStart; + var0[2] = Rasterizer2D_xClipEnd; + var0[3] = Rasterizer2D_yClipEnd; + } @ObfuscatedName("dm") @Export("Rasterizer2D_setClipArray") public static void Rasterizer2D_setClipArray(int[] var0) { - Rasterizer2D_xClipStart = var0[0]; // L: 58 - Rasterizer2D_yClipStart = var0[1]; // L: 59 - Rasterizer2D_xClipEnd = var0[2]; // L: 60 - Rasterizer2D_yClipEnd = var0[3]; // L: 61 - } // L: 62 + Rasterizer2D_xClipStart = var0[0]; + Rasterizer2D_yClipStart = var0[1]; + Rasterizer2D_xClipEnd = var0[2]; + Rasterizer2D_yClipEnd = var0[3]; + } @ObfuscatedName("dr") @Export("Rasterizer2D_clear") public static void Rasterizer2D_clear() { - int var0 = 0; // L: 65 + int var0 = 0; int var1; - for (var1 = Rasterizer2D_width * Rasterizer2D_height - 7; var0 < var1; Rasterizer2D_pixels[var0++] = 0) { // L: 66 67 75 - Rasterizer2D_pixels[var0++] = 0; // L: 68 - Rasterizer2D_pixels[var0++] = 0; // L: 69 - Rasterizer2D_pixels[var0++] = 0; // L: 70 - Rasterizer2D_pixels[var0++] = 0; // L: 71 - Rasterizer2D_pixels[var0++] = 0; // L: 72 - Rasterizer2D_pixels[var0++] = 0; // L: 73 - Rasterizer2D_pixels[var0++] = 0; // L: 74 + for (var1 = Rasterizer2D_width * Rasterizer2D_height - 7; var0 < var1; Rasterizer2D_pixels[var0++] = 0) { + Rasterizer2D_pixels[var0++] = 0; + Rasterizer2D_pixels[var0++] = 0; + Rasterizer2D_pixels[var0++] = 0; + Rasterizer2D_pixels[var0++] = 0; + Rasterizer2D_pixels[var0++] = 0; + Rasterizer2D_pixels[var0++] = 0; + Rasterizer2D_pixels[var0++] = 0; } - for (var1 += 7; var0 < var1; Rasterizer2D_pixels[var0++] = 0) { // L: 77 78 + for (var1 += 7; var0 < var1; Rasterizer2D_pixels[var0++] = 0) { } - } // L: 79 + } @ObfuscatedName("ds") @Export("drawCircle") static void drawCircle(int var0, int var1, int var2, int var3) { - if (var2 == 0) { // L: 82 - Rasterizer2D_setPixel(var0, var1, var3); // L: 83 + if (var2 == 0) { + Rasterizer2D_setPixel(var0, var1, var3); } else { - if (var2 < 0) { // L: 86 + if (var2 < 0) { var2 = -var2; } - int var4 = var1 - var2; // L: 87 - if (var4 < Rasterizer2D_yClipStart) { // L: 88 + int var4 = var1 - var2; + if (var4 < Rasterizer2D_yClipStart) { var4 = Rasterizer2D_yClipStart; } - int var5 = var2 + var1 + 1; // L: 89 - if (var5 > Rasterizer2D_yClipEnd) { // L: 90 + int var5 = var2 + var1 + 1; + if (var5 > Rasterizer2D_yClipEnd) { var5 = Rasterizer2D_yClipEnd; } - int var6 = var4; // L: 91 - int var7 = var2 * var2; // L: 92 - int var8 = 0; // L: 93 - int var9 = var1 - var4; // L: 94 - int var10 = var9 * var9; // L: 95 - int var11 = var10 - var9; // L: 96 - if (var1 > var5) { // L: 97 + int var6 = var4; + int var7 = var2 * var2; + int var8 = 0; + int var9 = var1 - var4; + int var10 = var9 * var9; + int var11 = var10 - var9; + if (var1 > var5) { var1 = var5; } @@ -175,99 +175,99 @@ public class Rasterizer2D extends DualNode { int var13; int var14; int var15; - while (var6 < var1) { // L: 98 - while (var11 <= var7 || var10 <= var7) { // L: 99 - var10 = var10 + var8 + var8; // L: 100 - var11 += var8++ + var8; // L: 101 + while (var6 < var1) { + while (var11 <= var7 || var10 <= var7) { + var10 = var10 + var8 + var8; + var11 += var8++ + var8; } - var12 = var0 - var8 + 1; // L: 103 - if (var12 < Rasterizer2D_xClipStart) { // L: 104 + var12 = var0 - var8 + 1; + if (var12 < Rasterizer2D_xClipStart) { var12 = Rasterizer2D_xClipStart; } - var13 = var0 + var8; // L: 105 - if (var13 > Rasterizer2D_xClipEnd) { // L: 106 + var13 = var0 + var8; + if (var13 > Rasterizer2D_xClipEnd) { var13 = Rasterizer2D_xClipEnd; } - var14 = var12 + var6 * Rasterizer2D_width; // L: 107 + var14 = var12 + var6 * Rasterizer2D_width; - for (var15 = var12; var15 < var13; ++var15) { // L: 108 + for (var15 = var12; var15 < var13; ++var15) { Rasterizer2D_pixels[var14++] = var3; } - ++var6; // L: 109 - var10 -= var9-- + var9; // L: 110 - var11 -= var9 + var9; // L: 111 + ++var6; + var10 -= var9-- + var9; + var11 -= var9 + var9; } - var8 = var2; // L: 113 - var9 = var6 - var1; // L: 114 - var11 = var7 + var9 * var9; // L: 115 - var10 = var11 - var2; // L: 116 + var8 = var2; + var9 = var6 - var1; + var11 = var7 + var9 * var9; + var10 = var11 - var2; - for (var11 -= var9; var6 < var5; var10 += var9++ + var9) { // L: 117 118 131 - while (var11 > var7 && var10 > var7) { // L: 119 - var11 -= var8-- + var8; // L: 120 - var10 -= var8 + var8; // L: 121 + for (var11 -= var9; var6 < var5; var10 += var9++ + var9) { + while (var11 > var7 && var10 > var7) { + var11 -= var8-- + var8; + var10 -= var8 + var8; } - var12 = var0 - var8; // L: 123 - if (var12 < Rasterizer2D_xClipStart) { // L: 124 + var12 = var0 - var8; + if (var12 < Rasterizer2D_xClipStart) { var12 = Rasterizer2D_xClipStart; } - var13 = var0 + var8; // L: 125 - if (var13 > Rasterizer2D_xClipEnd - 1) { // L: 126 + var13 = var0 + var8; + if (var13 > Rasterizer2D_xClipEnd - 1) { var13 = Rasterizer2D_xClipEnd - 1; } - var14 = var12 + var6 * Rasterizer2D_width; // L: 127 + var14 = var12 + var6 * Rasterizer2D_width; - for (var15 = var12; var15 <= var13; ++var15) { // L: 128 + for (var15 = var12; var15 <= var13; ++var15) { Rasterizer2D_pixels[var14++] = var3; } - ++var6; // L: 129 - var11 = var11 + var9 + var9; // L: 130 + ++var6; + var11 = var11 + var9 + var9; } } - } // L: 84 133 + } @ObfuscatedName("dv") @Export("Rasterizer2D_drawCircleAlpha") public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, int var3, int var4) { - if (var4 != 0) { // L: 136 - if (var4 == 256) { // L: 137 - drawCircle(var0, var1, var2, var3); // L: 138 + if (var4 != 0) { + if (var4 == 256) { + drawCircle(var0, var1, var2, var3); } else { - if (var2 < 0) { // L: 141 + if (var2 < 0) { var2 = -var2; } - int var5 = 256 - var4; // L: 142 - int var6 = (var3 >> 16 & 255) * var4; // L: 143 - int var7 = (var3 >> 8 & 255) * var4; // L: 144 - int var8 = var4 * (var3 & 255); // L: 145 - int var12 = var1 - var2; // L: 149 - if (var12 < Rasterizer2D_yClipStart) { // L: 150 + int var5 = 256 - var4; + int var6 = (var3 >> 16 & 255) * var4; + int var7 = (var3 >> 8 & 255) * var4; + int var8 = var4 * (var3 & 255); + int var12 = var1 - var2; + if (var12 < Rasterizer2D_yClipStart) { var12 = Rasterizer2D_yClipStart; } - int var13 = var2 + var1 + 1; // L: 151 - if (var13 > Rasterizer2D_yClipEnd) { // L: 152 + int var13 = var2 + var1 + 1; + if (var13 > Rasterizer2D_yClipEnd) { var13 = Rasterizer2D_yClipEnd; } - int var14 = var12; // L: 153 - int var15 = var2 * var2; // L: 154 - int var16 = 0; // L: 155 - int var17 = var1 - var12; // L: 156 - int var18 = var17 * var17; // L: 157 - int var19 = var18 - var17; // L: 158 - if (var1 > var13) { // L: 159 + int var14 = var12; + int var15 = var2 * var2; + int var16 = 0; + int var17 = var1 - var12; + int var18 = var17 * var17; + int var19 = var18 - var17; + if (var1 > var13) { var1 = var13; } @@ -279,249 +279,249 @@ public class Rasterizer2D extends DualNode { int var22; int var23; int var24; - while (var14 < var1) { // L: 160 - while (var19 <= var15 || var18 <= var15) { // L: 161 - var18 = var18 + var16 + var16; // L: 162 - var19 += var16++ + var16; // L: 163 + while (var14 < var1) { + while (var19 <= var15 || var18 <= var15) { + var18 = var18 + var16 + var16; + var19 += var16++ + var16; } - var20 = var0 - var16 + 1; // L: 165 - if (var20 < Rasterizer2D_xClipStart) { // L: 166 + var20 = var0 - var16 + 1; + if (var20 < Rasterizer2D_xClipStart) { var20 = Rasterizer2D_xClipStart; } - var21 = var0 + var16; // L: 167 - if (var21 > Rasterizer2D_xClipEnd) { // L: 168 + var21 = var0 + var16; + if (var21 > Rasterizer2D_xClipEnd) { var21 = Rasterizer2D_xClipEnd; } - var22 = var20 + var14 * Rasterizer2D_width; // L: 169 + var22 = var20 + var14 * Rasterizer2D_width; - for (var23 = var20; var23 < var21; ++var23) { // L: 170 - var9 = var5 * (Rasterizer2D_pixels[var22] >> 16 & 255); // L: 171 - var10 = (Rasterizer2D_pixels[var22] >> 8 & 255) * var5; // L: 172 - var11 = var5 * (Rasterizer2D_pixels[var22] & 255); // L: 173 - var24 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8); // L: 174 - Rasterizer2D_pixels[var22++] = var24; // L: 175 + for (var23 = var20; var23 < var21; ++var23) { + var9 = var5 * (Rasterizer2D_pixels[var22] >> 16 & 255); + var10 = (Rasterizer2D_pixels[var22] >> 8 & 255) * var5; + var11 = var5 * (Rasterizer2D_pixels[var22] & 255); + var24 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8); + Rasterizer2D_pixels[var22++] = var24; } - ++var14; // L: 177 - var18 -= var17-- + var17; // L: 178 - var19 -= var17 + var17; // L: 179 + ++var14; + var18 -= var17-- + var17; + var19 -= var17 + var17; } - var16 = var2; // L: 181 - var17 = -var17; // L: 182 - var19 = var15 + var17 * var17; // L: 183 - var18 = var19 - var2; // L: 184 + var16 = var2; + var17 = -var17; + var19 = var15 + var17 * var17; + var18 = var19 - var2; - for (var19 -= var17; var14 < var13; var18 += var17++ + var17) { // L: 185 186 205 - while (var19 > var15 && var18 > var15) { // L: 187 - var19 -= var16-- + var16; // L: 188 - var18 -= var16 + var16; // L: 189 + for (var19 -= var17; var14 < var13; var18 += var17++ + var17) { + while (var19 > var15 && var18 > var15) { + var19 -= var16-- + var16; + var18 -= var16 + var16; } - var20 = var0 - var16; // L: 191 - if (var20 < Rasterizer2D_xClipStart) { // L: 192 + var20 = var0 - var16; + if (var20 < Rasterizer2D_xClipStart) { var20 = Rasterizer2D_xClipStart; } - var21 = var0 + var16; // L: 193 - if (var21 > Rasterizer2D_xClipEnd - 1) { // L: 194 + var21 = var0 + var16; + if (var21 > Rasterizer2D_xClipEnd - 1) { var21 = Rasterizer2D_xClipEnd - 1; } - var22 = var20 + var14 * Rasterizer2D_width; // L: 195 + var22 = var20 + var14 * Rasterizer2D_width; - for (var23 = var20; var23 <= var21; ++var23) { // L: 196 - var9 = var5 * (Rasterizer2D_pixels[var22] >> 16 & 255); // L: 197 - var10 = (Rasterizer2D_pixels[var22] >> 8 & 255) * var5; // L: 198 - var11 = var5 * (Rasterizer2D_pixels[var22] & 255); // L: 199 - var24 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8); // L: 200 - Rasterizer2D_pixels[var22++] = var24; // L: 201 + for (var23 = var20; var23 <= var21; ++var23) { + var9 = var5 * (Rasterizer2D_pixels[var22] >> 16 & 255); + var10 = (Rasterizer2D_pixels[var22] >> 8 & 255) * var5; + var11 = var5 * (Rasterizer2D_pixels[var22] & 255); + var24 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8); + Rasterizer2D_pixels[var22++] = var24; } - ++var14; // L: 203 - var19 = var19 + var17 + var17; // L: 204 + ++var14; + var19 = var19 + var17 + var17; } } } - } // L: 139 207 + } @ObfuscatedName("df") @Export("Rasterizer2D_fillRectangleAlpha") public static void Rasterizer2D_fillRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { - if (var0 < Rasterizer2D_xClipStart) { // L: 210 - var2 -= Rasterizer2D_xClipStart - var0; // L: 211 - var0 = Rasterizer2D_xClipStart; // L: 212 + if (var0 < Rasterizer2D_xClipStart) { + var2 -= Rasterizer2D_xClipStart - var0; + var0 = Rasterizer2D_xClipStart; } - if (var1 < Rasterizer2D_yClipStart) { // L: 214 - var3 -= Rasterizer2D_yClipStart - var1; // L: 215 - var1 = Rasterizer2D_yClipStart; // L: 216 + if (var1 < Rasterizer2D_yClipStart) { + var3 -= Rasterizer2D_yClipStart - var1; + var1 = Rasterizer2D_yClipStart; } - if (var0 + var2 > Rasterizer2D_xClipEnd) { // L: 218 - var2 = Rasterizer2D_xClipEnd - var0; - } - - if (var3 + var1 > Rasterizer2D_yClipEnd) { // L: 219 - var3 = Rasterizer2D_yClipEnd - var1; - } - - var4 = (var5 * (var4 & 16711935) >> 8 & 16711935) + (var5 * (var4 & 65280) >> 8 & 65280); // L: 220 - int var6 = 256 - var5; // L: 221 - int var7 = Rasterizer2D_width - var2; // L: 222 - int var8 = var0 + Rasterizer2D_width * var1; // L: 223 - - for (int var9 = 0; var9 < var3; ++var9) { // L: 224 - for (int var10 = -var2; var10 < 0; ++var10) { // L: 225 - int var11 = Rasterizer2D_pixels[var8]; // L: 226 - var11 = ((var11 & 16711935) * var6 >> 8 & 16711935) + (var6 * (var11 & 65280) >> 8 & 65280); // L: 227 - Rasterizer2D_pixels[var8++] = var11 + var4; // L: 228 - } - - var8 += var7; // L: 230 - } - - } // L: 232 - - @ObfuscatedName("dh") - @Export("Rasterizer2D_fillRectangle") - public static void Rasterizer2D_fillRectangle(int var0, int var1, int var2, int var3, int var4) { - if (var0 < Rasterizer2D_xClipStart) { // L: 235 - var2 -= Rasterizer2D_xClipStart - var0; // L: 236 - var0 = Rasterizer2D_xClipStart; // L: 237 - } - - if (var1 < Rasterizer2D_yClipStart) { // L: 239 - var3 -= Rasterizer2D_yClipStart - var1; // L: 240 - var1 = Rasterizer2D_yClipStart; // L: 241 - } - - if (var0 + var2 > Rasterizer2D_xClipEnd) { // L: 243 + if (var0 + var2 > Rasterizer2D_xClipEnd) { var2 = Rasterizer2D_xClipEnd - var0; } if (var3 + var1 > Rasterizer2D_yClipEnd) { - var3 = Rasterizer2D_yClipEnd - var1; // L: 244 + var3 = Rasterizer2D_yClipEnd - var1; } - int var5 = Rasterizer2D_width - var2; // L: 245 - int var6 = var0 + Rasterizer2D_width * var1; // L: 246 + var4 = (var5 * (var4 & 16711935) >> 8 & 16711935) + (var5 * (var4 & 65280) >> 8 & 65280); + int var6 = 256 - var5; + int var7 = Rasterizer2D_width - var2; + int var8 = var0 + Rasterizer2D_width * var1; - for (int var7 = -var3; var7 < 0; ++var7) { // L: 247 - for (int var8 = -var2; var8 < 0; ++var8) { // L: 248 - Rasterizer2D_pixels[var6++] = var4; // L: 249 + for (int var9 = 0; var9 < var3; ++var9) { + for (int var10 = -var2; var10 < 0; ++var10) { + int var11 = Rasterizer2D_pixels[var8]; + var11 = ((var11 & 16711935) * var6 >> 8 & 16711935) + (var6 * (var11 & 65280) >> 8 & 65280); + Rasterizer2D_pixels[var8++] = var11 + var4; } - var6 += var5; // L: 251 + var8 += var7; } - } // L: 253 + } + + @ObfuscatedName("dh") + @Export("Rasterizer2D_fillRectangle") + public static void Rasterizer2D_fillRectangle(int var0, int var1, int var2, int var3, int var4) { + if (var0 < Rasterizer2D_xClipStart) { + var2 -= Rasterizer2D_xClipStart - var0; + var0 = Rasterizer2D_xClipStart; + } + + if (var1 < Rasterizer2D_yClipStart) { + var3 -= Rasterizer2D_yClipStart - var1; + var1 = Rasterizer2D_yClipStart; + } + + if (var0 + var2 > Rasterizer2D_xClipEnd) { + var2 = Rasterizer2D_xClipEnd - var0; + } + + if (var3 + var1 > Rasterizer2D_yClipEnd) { + var3 = Rasterizer2D_yClipEnd - var1; + } + + int var5 = Rasterizer2D_width - var2; + int var6 = var0 + Rasterizer2D_width * var1; + + for (int var7 = -var3; var7 < 0; ++var7) { + for (int var8 = -var2; var8 < 0; ++var8) { + Rasterizer2D_pixels[var6++] = var4; + } + + var6 += var5; + } + + } @ObfuscatedName("dn") @Export("Rasterizer2D_fillRectangleGradient") public static void Rasterizer2D_fillRectangleGradient(int var0, int var1, int var2, int var3, int var4, int var5) { - if (var2 > 0 && var3 > 0) { // L: 256 - int var6 = 0; // L: 257 - int var7 = 65536 / var3; // L: 258 - if (var0 < Rasterizer2D_xClipStart) { // L: 259 - var2 -= Rasterizer2D_xClipStart - var0; // L: 260 - var0 = Rasterizer2D_xClipStart; // L: 261 + if (var2 > 0 && var3 > 0) { + int var6 = 0; + int var7 = 65536 / var3; + if (var0 < Rasterizer2D_xClipStart) { + var2 -= Rasterizer2D_xClipStart - var0; + var0 = Rasterizer2D_xClipStart; } - if (var1 < Rasterizer2D_yClipStart) { // L: 263 - var6 += (Rasterizer2D_yClipStart - var1) * var7; // L: 264 - var3 -= Rasterizer2D_yClipStart - var1; // L: 265 - var1 = Rasterizer2D_yClipStart; // L: 266 + if (var1 < Rasterizer2D_yClipStart) { + var6 += (Rasterizer2D_yClipStart - var1) * var7; + var3 -= Rasterizer2D_yClipStart - var1; + var1 = Rasterizer2D_yClipStart; } - if (var0 + var2 > Rasterizer2D_xClipEnd) { // L: 268 + if (var0 + var2 > Rasterizer2D_xClipEnd) { var2 = Rasterizer2D_xClipEnd - var0; } - if (var3 + var1 > Rasterizer2D_yClipEnd) { // L: 269 + if (var3 + var1 > Rasterizer2D_yClipEnd) { var3 = Rasterizer2D_yClipEnd - var1; } - int var8 = Rasterizer2D_width - var2; // L: 270 - int var9 = var0 + Rasterizer2D_width * var1; // L: 271 + int var8 = Rasterizer2D_width - var2; + int var9 = var0 + Rasterizer2D_width * var1; - for (int var10 = -var3; var10 < 0; ++var10) { // L: 272 - int var11 = 65536 - var6 >> 8; // L: 273 - int var12 = var6 >> 8; // L: 274 - int var13 = (var12 * (var5 & 16711935) + var11 * (var4 & 16711935) & -16711936) + (var12 * (var5 & 65280) + var11 * (var4 & 65280) & 16711680) >>> 8; // L: 275 + for (int var10 = -var3; var10 < 0; ++var10) { + int var11 = 65536 - var6 >> 8; + int var12 = var6 >> 8; + int var13 = (var12 * (var5 & 16711935) + var11 * (var4 & 16711935) & -16711936) + (var12 * (var5 & 65280) + var11 * (var4 & 65280) & 16711680) >>> 8; - for (int var14 = -var2; var14 < 0; ++var14) { // L: 276 - Rasterizer2D_pixels[var9++] = var13; // L: 277 + for (int var14 = -var2; var14 < 0; ++var14) { + Rasterizer2D_pixels[var9++] = var13; } - var9 += var8; // L: 279 - var6 += var7; // L: 280 + var9 += var8; + var6 += var7; } } - } // L: 282 + } @ObfuscatedName("dx") @Export("Rasterizer2D_fillRectangleGradientAlpha") public static void Rasterizer2D_fillRectangleGradientAlpha(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (var2 > 0 && var3 > 0) { // L: 285 - int var8 = 0; // L: 286 - int var9 = 65536 / var3; // L: 287 - if (var0 < Rasterizer2D_xClipStart) { // L: 288 - var2 -= Rasterizer2D_xClipStart - var0; // L: 289 - var0 = Rasterizer2D_xClipStart; // L: 290 + if (var2 > 0 && var3 > 0) { + int var8 = 0; + int var9 = 65536 / var3; + if (var0 < Rasterizer2D_xClipStart) { + var2 -= Rasterizer2D_xClipStart - var0; + var0 = Rasterizer2D_xClipStart; } - if (var1 < Rasterizer2D_yClipStart) { // L: 292 - var8 += (Rasterizer2D_yClipStart - var1) * var9; // L: 293 - var3 -= Rasterizer2D_yClipStart - var1; // L: 294 - var1 = Rasterizer2D_yClipStart; // L: 295 + if (var1 < Rasterizer2D_yClipStart) { + var8 += (Rasterizer2D_yClipStart - var1) * var9; + var3 -= Rasterizer2D_yClipStart - var1; + var1 = Rasterizer2D_yClipStart; } - if (var0 + var2 > Rasterizer2D_xClipEnd) { // L: 297 + if (var0 + var2 > Rasterizer2D_xClipEnd) { var2 = Rasterizer2D_xClipEnd - var0; } - if (var3 + var1 > Rasterizer2D_yClipEnd) { // L: 298 + if (var3 + var1 > Rasterizer2D_yClipEnd) { var3 = Rasterizer2D_yClipEnd - var1; } - int var10 = Rasterizer2D_width - var2; // L: 299 - int var11 = var0 + Rasterizer2D_width * var1; // L: 300 + int var10 = Rasterizer2D_width - var2; + int var11 = var0 + Rasterizer2D_width * var1; - for (int var12 = -var3; var12 < 0; ++var12) { // L: 301 - int var13 = 65536 - var8 >> 8; // L: 302 - int var14 = var8 >> 8; // L: 303 - int var15 = (var13 * var6 + var14 * var7 & 65280) >>> 8; // L: 304 - if (var15 == 0) { // L: 305 - var11 += Rasterizer2D_width; // L: 306 - var8 += var9; // L: 307 + for (int var12 = -var3; var12 < 0; ++var12) { + int var13 = 65536 - var8 >> 8; + int var14 = var8 >> 8; + int var15 = (var13 * var6 + var14 * var7 & 65280) >>> 8; + if (var15 == 0) { + var11 += Rasterizer2D_width; + var8 += var9; } else { - int var16 = (var14 * (var5 & 16711935) + var13 * (var4 & 16711935) & -16711936) + (var14 * (var5 & 65280) + var13 * (var4 & 65280) & 16711680) >>> 8; // L: 310 - int var17 = 255 - var15; // L: 311 - int var18 = ((var16 & 16711935) * var15 >> 8 & 16711935) + (var15 * (var16 & 65280) >> 8 & 65280); // L: 312 + int var16 = (var14 * (var5 & 16711935) + var13 * (var4 & 16711935) & -16711936) + (var14 * (var5 & 65280) + var13 * (var4 & 65280) & 16711680) >>> 8; + int var17 = 255 - var15; + int var18 = ((var16 & 16711935) * var15 >> 8 & 16711935) + (var15 * (var16 & 65280) >> 8 & 65280); - for (int var19 = -var2; var19 < 0; ++var19) { // L: 313 - int var20 = Rasterizer2D_pixels[var11]; // L: 314 - if (var20 == 0) { // L: 315 - Rasterizer2D_pixels[var11++] = var18; // L: 316 + for (int var19 = -var2; var19 < 0; ++var19) { + int var20 = Rasterizer2D_pixels[var11]; + if (var20 == 0) { + Rasterizer2D_pixels[var11++] = var18; } else { - var20 = ((var20 & 16711935) * var17 >> 8 & 16711935) + (var17 * (var20 & 65280) >> 8 & 65280); // L: 319 - Rasterizer2D_pixels[var11++] = var18 + var20; // L: 320 + var20 = ((var20 & 16711935) * var17 >> 8 & 16711935) + (var17 * (var20 & 65280) >> 8 & 65280); + Rasterizer2D_pixels[var11++] = var18 + var20; } } - var11 += var10; // L: 323 - var8 += var9; // L: 324 + var11 += var10; + var8 += var9; } } } - } // L: 326 + } @ObfuscatedName("dp") @ObfuscatedSignature( @@ -530,310 +530,308 @@ public class Rasterizer2D extends DualNode { ) @Export("Rasterizer2D_drawGradientPixels") public static void Rasterizer2D_drawGradientPixels(int var0, int var1, int var2, int var3, int var4, int var5, byte[] var6, int var7) { - if (var0 + var2 >= 0 && var3 + var1 >= 0) { // L: 329 - if (var0 < Rasterizer2D_width && var1 < Rasterizer2D_height) { // L: 330 - int var8 = 0; // L: 331 - int var9 = 0; // L: 332 - if (var0 < 0) { // L: 333 - var8 -= var0; // L: 334 - var2 += var0; // L: 335 + if (var0 + var2 >= 0 && var3 + var1 >= 0) { + if (var0 < Rasterizer2D_width && var1 < Rasterizer2D_height) { + int var8 = 0; + int var9 = 0; + if (var0 < 0) { + var8 -= var0; + var2 += var0; } - if (var1 < 0) { // L: 337 - var9 -= var1; // L: 338 - var3 += var1; // L: 339 + if (var1 < 0) { + var9 -= var1; + var3 += var1; } - if (var0 + var2 > Rasterizer2D_width) { // L: 341 - var2 = Rasterizer2D_width - var0; // L: 342 + if (var0 + var2 > Rasterizer2D_width) { + var2 = Rasterizer2D_width - var0; } - if (var3 + var1 > Rasterizer2D_height) { // L: 344 - var3 = Rasterizer2D_height - var1; // L: 345 + if (var3 + var1 > Rasterizer2D_height) { + var3 = Rasterizer2D_height - var1; } - int var10 = var6.length / var7; // L: 347 - int var11 = Rasterizer2D_width - var2; // L: 348 - int var12 = var4 >>> 24; // L: 349 - int var13 = var5 >>> 24; // L: 350 + int var10 = var6.length / var7; + int var11 = Rasterizer2D_width - var2; + int var12 = var4 >>> 24; + int var13 = var5 >>> 24; int var14; int var15; int var16; int var17; int var18; - if (var12 == 255 && var13 == 255) { // L: 351 - var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width; // L: 352 + if (var12 == 255 && var13 == 255) { + var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width; - for (var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) { // L: 353 - for (var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) { // L: 354 - var17 = (var15 - var1) % var10; // L: 355 - var18 = (var16 - var0) % var7; // L: 356 - if (var6[var18 + var17 * var7] != 0) { // L: 357 + for (var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) { + for (var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) { + var17 = (var15 - var1) % var10; + var18 = (var16 - var0) % var7; + if (var6[var18 + var17 * var7] != 0) { Rasterizer2D_pixels[var14++] = var5; } else { - Rasterizer2D_pixels[var14++] = var4; // L: 358 + Rasterizer2D_pixels[var14++] = var4; } } - var14 += var11; // L: 360 + var14 += var11; } } else { - var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width; // L: 364 + var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width; - for (var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) { // L: 365 - for (var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) { // L: 366 - var17 = (var15 - var1) % var10; // L: 367 - var18 = (var16 - var0) % var7; // L: 368 - int var19 = var4; // L: 369 - if (var6[var18 + var17 * var7] != 0) { // L: 370 + for (var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) { + for (var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) { + var17 = (var15 - var1) % var10; + var18 = (var16 - var0) % var7; + int var19 = var4; + if (var6[var18 + var17 * var7] != 0) { var19 = var5; } - int var20 = var19 >>> 24; // L: 371 - int var21 = 255 - var20; // L: 372 - int var22 = Rasterizer2D_pixels[var14]; // L: 373 - int var23 = ((var19 & 16711935) * var20 + (var22 & 16711935) * var21 & -16711936) + (var20 * (var19 & 65280) + var21 * (var22 & 65280) & 16711680) >> 8; // L: 374 - Rasterizer2D_pixels[var14++] = var23; // L: 375 + int var20 = var19 >>> 24; + int var21 = 255 - var20; + int var22 = Rasterizer2D_pixels[var14]; + int var23 = ((var19 & 16711935) * var20 + (var22 & 16711935) * var21 & -16711936) + (var20 * (var19 & 65280) + var21 * (var22 & 65280) & 16711680) >> 8; + Rasterizer2D_pixels[var14++] = var23; } - var14 += var11; // L: 377 + var14 += var11; } } } } - } // L: 380 + } @ObfuscatedName("dc") @Export("Rasterizer2D_drawRectangle") public static void Rasterizer2D_drawRectangle(int var0, int var1, int var2, int var3, int var4) { - Rasterizer2D_drawHorizontalLine(var0, var1, var2, var4); // L: 383 - Rasterizer2D_drawHorizontalLine(var0, var3 + var1 - 1, var2, var4); // L: 384 - Rasterizer2D_drawVerticalLine(var0, var1, var3, var4); // L: 385 - Rasterizer2D_drawVerticalLine(var0 + var2 - 1, var1, var3, var4); // L: 386 - } // L: 387 + method7649(var0, var1, var2, var4); + method7649(var0, var3 + var1 - 1, var2, var4); + method7709(var0, var1, var3, var4); + method7709(var0 + var2 - 1, var1, var3, var4); + } @ObfuscatedName("dq") @Export("Rasterizer2D_drawRectangleAlpha") public static void Rasterizer2D_drawRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { - Rasterizer2D_drawHorizontalLineAlpha(var0, var1, var2, var4, var5); // L: 390 - Rasterizer2D_drawHorizontalLineAlpha(var0, var3 + var1 - 1, var2, var4, var5); // L: 391 - if (var3 >= 3) { // L: 392 - Rasterizer2D_drawVerticalLineAlpha(var0, var1 + 1, var3 - 2, var4, var5); // L: 393 - Rasterizer2D_drawVerticalLineAlpha(var0 + var2 - 1, var1 + 1, var3 - 2, var4, var5); // L: 394 + Rasterizer2D_drawHorizontalLineAlpha(var0, var1, var2, var4, var5); + Rasterizer2D_drawHorizontalLineAlpha(var0, var3 + var1 - 1, var2, var4, var5); + if (var3 >= 3) { + Rasterizer2D_drawVerticalLineAlpha(var0, var1 + 1, var3 - 2, var4, var5); + Rasterizer2D_drawVerticalLineAlpha(var0 + var2 - 1, var1 + 1, var3 - 2, var4, var5); } - } // L: 396 + } @ObfuscatedName("db") - @Export("Rasterizer2D_drawHorizontalLine") - public static void Rasterizer2D_drawHorizontalLine(int var0, int var1, int var2, int var3) { - if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { // L: 399 - if (var0 < Rasterizer2D_xClipStart) { // L: 400 - var2 -= Rasterizer2D_xClipStart - var0; // L: 401 - var0 = Rasterizer2D_xClipStart; // L: 402 + public static void method7649(int var0, int var1, int var2, int var3) { + if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { + if (var0 < Rasterizer2D_xClipStart) { + var2 -= Rasterizer2D_xClipStart - var0; + var0 = Rasterizer2D_xClipStart; } - if (var0 + var2 > Rasterizer2D_xClipEnd) { // L: 404 + if (var0 + var2 > Rasterizer2D_xClipEnd) { var2 = Rasterizer2D_xClipEnd - var0; } - int var4 = var0 + Rasterizer2D_width * var1; // L: 405 + int var4 = var0 + Rasterizer2D_width * var1; - for (int var5 = 0; var5 < var2; ++var5) { // L: 406 + for (int var5 = 0; var5 < var2; ++var5) { Rasterizer2D_pixels[var4 + var5] = var3; } } - } // L: 407 + } @ObfuscatedName("dj") @Export("Rasterizer2D_drawHorizontalLineAlpha") static void Rasterizer2D_drawHorizontalLineAlpha(int var0, int var1, int var2, int var3, int var4) { - if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { // L: 410 - if (var0 < Rasterizer2D_xClipStart) { // L: 411 - var2 -= Rasterizer2D_xClipStart - var0; // L: 412 - var0 = Rasterizer2D_xClipStart; // L: 413 + if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { + if (var0 < Rasterizer2D_xClipStart) { + var2 -= Rasterizer2D_xClipStart - var0; + var0 = Rasterizer2D_xClipStart; } - if (var0 + var2 > Rasterizer2D_xClipEnd) { // L: 415 + if (var0 + var2 > Rasterizer2D_xClipEnd) { var2 = Rasterizer2D_xClipEnd - var0; } - int var5 = 256 - var4; // L: 416 - int var6 = (var3 >> 16 & 255) * var4; // L: 417 - int var7 = (var3 >> 8 & 255) * var4; // L: 418 - int var8 = var4 * (var3 & 255); // L: 419 - int var12 = var0 + Rasterizer2D_width * var1; // L: 423 + int var5 = 256 - var4; + int var6 = (var3 >> 16 & 255) * var4; + int var7 = (var3 >> 8 & 255) * var4; + int var8 = var4 * (var3 & 255); + int var12 = var0 + Rasterizer2D_width * var1; - for (int var13 = 0; var13 < var2; ++var13) { // L: 424 - int var9 = var5 * (Rasterizer2D_pixels[var12] >> 16 & 255); // L: 425 - int var10 = (Rasterizer2D_pixels[var12] >> 8 & 255) * var5; // L: 426 - int var11 = var5 * (Rasterizer2D_pixels[var12] & 255); // L: 427 - int var14 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8); // L: 428 - Rasterizer2D_pixels[var12++] = var14; // L: 429 + for (int var13 = 0; var13 < var2; ++var13) { + int var9 = var5 * (Rasterizer2D_pixels[var12] >> 16 & 255); + int var10 = (Rasterizer2D_pixels[var12] >> 8 & 255) * var5; + int var11 = var5 * (Rasterizer2D_pixels[var12] & 255); + int var14 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8); + Rasterizer2D_pixels[var12++] = var14; } } - } // L: 431 + } @ObfuscatedName("dd") - @Export("Rasterizer2D_drawVerticalLine") - public static void Rasterizer2D_drawVerticalLine(int var0, int var1, int var2, int var3) { - if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { // L: 434 - if (var1 < Rasterizer2D_yClipStart) { // L: 435 - var2 -= Rasterizer2D_yClipStart - var1; // L: 436 - var1 = Rasterizer2D_yClipStart; // L: 437 + public static void method7709(int var0, int var1, int var2, int var3) { + if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { + if (var1 < Rasterizer2D_yClipStart) { + var2 -= Rasterizer2D_yClipStart - var1; + var1 = Rasterizer2D_yClipStart; } - if (var2 + var1 > Rasterizer2D_yClipEnd) { // L: 439 + if (var2 + var1 > Rasterizer2D_yClipEnd) { var2 = Rasterizer2D_yClipEnd - var1; } - int var4 = var0 + Rasterizer2D_width * var1; // L: 440 + int var4 = var0 + Rasterizer2D_width * var1; - for (int var5 = 0; var5 < var2; ++var5) { // L: 441 + for (int var5 = 0; var5 < var2; ++var5) { Rasterizer2D_pixels[var4 + var5 * Rasterizer2D_width] = var3; } } - } // L: 442 + } @ObfuscatedName("du") @Export("Rasterizer2D_drawVerticalLineAlpha") static void Rasterizer2D_drawVerticalLineAlpha(int var0, int var1, int var2, int var3, int var4) { - if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { // L: 445 - if (var1 < Rasterizer2D_yClipStart) { // L: 446 - var2 -= Rasterizer2D_yClipStart - var1; // L: 447 - var1 = Rasterizer2D_yClipStart; // L: 448 + if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { + if (var1 < Rasterizer2D_yClipStart) { + var2 -= Rasterizer2D_yClipStart - var1; + var1 = Rasterizer2D_yClipStart; } - if (var2 + var1 > Rasterizer2D_yClipEnd) { // L: 450 + if (var2 + var1 > Rasterizer2D_yClipEnd) { var2 = Rasterizer2D_yClipEnd - var1; } - int var5 = 256 - var4; // L: 451 - int var6 = (var3 >> 16 & 255) * var4; // L: 452 - int var7 = (var3 >> 8 & 255) * var4; // L: 453 - int var8 = var4 * (var3 & 255); // L: 454 - int var12 = var0 + Rasterizer2D_width * var1; // L: 458 + int var5 = 256 - var4; + int var6 = (var3 >> 16 & 255) * var4; + int var7 = (var3 >> 8 & 255) * var4; + int var8 = var4 * (var3 & 255); + int var12 = var0 + Rasterizer2D_width * var1; - for (int var13 = 0; var13 < var2; ++var13) { // L: 459 - int var9 = var5 * (Rasterizer2D_pixels[var12] >> 16 & 255); // L: 460 - int var10 = (Rasterizer2D_pixels[var12] >> 8 & 255) * var5; // L: 461 - int var11 = var5 * (Rasterizer2D_pixels[var12] & 255); // L: 462 - int var14 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8); // L: 463 - Rasterizer2D_pixels[var12] = var14; // L: 464 - var12 += Rasterizer2D_width; // L: 465 + for (int var13 = 0; var13 < var2; ++var13) { + int var9 = var5 * (Rasterizer2D_pixels[var12] >> 16 & 255); + int var10 = (Rasterizer2D_pixels[var12] >> 8 & 255) * var5; + int var11 = var5 * (Rasterizer2D_pixels[var12] & 255); + int var14 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8); + Rasterizer2D_pixels[var12] = var14; + var12 += Rasterizer2D_width; } } - } // L: 467 + } @ObfuscatedName("dl") @Export("Rasterizer2D_drawLine") public static void Rasterizer2D_drawLine(int var0, int var1, int var2, int var3, int var4) { - var2 -= var0; // L: 470 - var3 -= var1; // L: 471 - if (var3 == 0) { // L: 472 - if (var2 >= 0) { // L: 473 - Rasterizer2D_drawHorizontalLine(var0, var1, var2 + 1, var4); + var2 -= var0; + var3 -= var1; + if (var3 == 0) { + if (var2 >= 0) { + method7649(var0, var1, var2 + 1, var4); } else { - Rasterizer2D_drawHorizontalLine(var0 + var2, var1, -var2 + 1, var4); // L: 474 + method7649(var0 + var2, var1, -var2 + 1, var4); } - } else if (var2 == 0) { // L: 477 - if (var3 >= 0) { // L: 478 - Rasterizer2D_drawVerticalLine(var0, var1, var3 + 1, var4); + } else if (var2 == 0) { + if (var3 >= 0) { + method7709(var0, var1, var3 + 1, var4); } else { - Rasterizer2D_drawVerticalLine(var0, var3 + var1, -var3 + 1, var4); // L: 479 + method7709(var0, var3 + var1, -var3 + 1, var4); } } else { - if (var3 + var2 < 0) { // L: 482 - var0 += var2; // L: 483 - var2 = -var2; // L: 484 - var1 += var3; // L: 485 - var3 = -var3; // L: 486 + if (var3 + var2 < 0) { + var0 += var2; + var2 = -var2; + var1 += var3; + var3 = -var3; } int var5; int var6; - if (var2 > var3) { // L: 488 - var1 <<= 16; // L: 489 - var1 += 32768; // L: 490 - var3 <<= 16; // L: 491 - var5 = (int)Math.floor((double)var3 / (double)var2 + 0.5D); // L: 492 - var2 += var0; // L: 493 - if (var0 < Rasterizer2D_xClipStart) { // L: 494 - var1 += var5 * (Rasterizer2D_xClipStart - var0); // L: 495 - var0 = Rasterizer2D_xClipStart; // L: 496 + if (var2 > var3) { + var1 <<= 16; + var1 += 32768; + var3 <<= 16; + var5 = (int)Math.floor((double)var3 / (double)var2 + 0.5D); + var2 += var0; + if (var0 < Rasterizer2D_xClipStart) { + var1 += var5 * (Rasterizer2D_xClipStart - var0); + var0 = Rasterizer2D_xClipStart; } - if (var2 >= Rasterizer2D_xClipEnd) { // L: 498 + if (var2 >= Rasterizer2D_xClipEnd) { var2 = Rasterizer2D_xClipEnd - 1; } - while (var0 <= var2) { // L: 499 - var6 = var1 >> 16; // L: 500 - if (var6 >= Rasterizer2D_yClipStart && var6 < Rasterizer2D_yClipEnd) { // L: 501 + while (var0 <= var2) { + var6 = var1 >> 16; + if (var6 >= Rasterizer2D_yClipStart && var6 < Rasterizer2D_yClipEnd) { Rasterizer2D_pixels[var0 + var6 * Rasterizer2D_width] = var4; } - var1 += var5; // L: 502 - ++var0; // L: 503 + var1 += var5; + ++var0; } } else { - var0 <<= 16; // L: 507 - var0 += 32768; // L: 508 - var2 <<= 16; // L: 509 - var5 = (int)Math.floor((double)var2 / (double)var3 + 0.5D); // L: 510 - var3 += var1; // L: 511 - if (var1 < Rasterizer2D_yClipStart) { // L: 512 - var0 += (Rasterizer2D_yClipStart - var1) * var5; // L: 513 - var1 = Rasterizer2D_yClipStart; // L: 514 + var0 <<= 16; + var0 += 32768; + var2 <<= 16; + var5 = (int)Math.floor((double)var2 / (double)var3 + 0.5D); + var3 += var1; + if (var1 < Rasterizer2D_yClipStart) { + var0 += (Rasterizer2D_yClipStart - var1) * var5; + var1 = Rasterizer2D_yClipStart; } - if (var3 >= Rasterizer2D_yClipEnd) { // L: 516 + if (var3 >= Rasterizer2D_yClipEnd) { var3 = Rasterizer2D_yClipEnd - 1; } - while (var1 <= var3) { // L: 517 - var6 = var0 >> 16; // L: 518 - if (var6 >= Rasterizer2D_xClipStart && var6 < Rasterizer2D_xClipEnd) { // L: 519 + while (var1 <= var3) { + var6 = var0 >> 16; + if (var6 >= Rasterizer2D_xClipStart && var6 < Rasterizer2D_xClipEnd) { Rasterizer2D_pixels[var6 + Rasterizer2D_width * var1] = var4; } - var0 += var5; // L: 520 - ++var1; // L: 521 + var0 += var5; + ++var1; } } } - } // L: 475 480 524 + } @ObfuscatedName("dw") @Export("Rasterizer2D_setPixel") static void Rasterizer2D_setPixel(int var0, int var1, int var2) { - if (var0 >= Rasterizer2D_xClipStart && var1 >= Rasterizer2D_yClipStart && var0 < Rasterizer2D_xClipEnd && var1 < Rasterizer2D_yClipEnd) { // L: 527 - Rasterizer2D_pixels[var0 + Rasterizer2D_width * var1] = var2; // L: 528 + if (var0 >= Rasterizer2D_xClipStart && var1 >= Rasterizer2D_yClipStart && var0 < Rasterizer2D_xClipEnd && var1 < Rasterizer2D_yClipEnd) { + Rasterizer2D_pixels[var0 + Rasterizer2D_width * var1] = var2; } - } // L: 529 + } @ObfuscatedName("dg") @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 + int var5 = var0 + Rasterizer2D_width * var1; - for (var1 = 0; var1 < var3.length; ++var1) { // L: 533 - int var6 = var5 + var3[var1]; // L: 534 + for (var1 = 0; var1 < var3.length; ++var1) { + int var6 = var5 + var3[var1]; - for (var0 = -var4[var1]; var0 < 0; ++var0) { // L: 535 + for (var0 = -var4[var1]; var0 < 0; ++var0) { Rasterizer2D_pixels[var6++] = var2; } - var5 += Rasterizer2D_width; // L: 536 + var5 += Rasterizer2D_width; } - } // L: 538 + } } diff --git a/runescape-client/src/main/java/Rasterizer3D.java b/runescape-client/src/main/java/Rasterizer3D.java index 513daf1d20..1a266af266 100644 --- a/runescape-client/src/main/java/Rasterizer3D.java +++ b/runescape-client/src/main/java/Rasterizer3D.java @@ -69,83 +69,83 @@ public class Rasterizer3D extends Rasterizer2D { public static int[] Rasterizer3D_cosine; static { - field2253 = false; // L: 8 - field2251 = false; // L: 9 - Rasterizer3D_isLowDetailTexture = false; // L: 10 - field2276 = 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 - field2273 = new int[512]; // L: 31 - field2271 = new int[2048]; // L: 32 - Rasterizer3D_sine = new int[2048]; // L: 33 - Rasterizer3D_cosine = new int[2048]; // L: 34 + field2253 = false; + field2251 = false; + Rasterizer3D_isLowDetailTexture = false; + field2276 = true; + Rasterizer3D_alpha = 0; + Rasterizer3D_zoom = 512; + Rasterizer3D_rowOffsets = new int[1024]; + Rasterizer3D_colorPalette = new int[65536]; + field2273 = new int[512]; + field2271 = new int[2048]; + Rasterizer3D_sine = new int[2048]; + Rasterizer3D_cosine = new int[2048]; int var0; - for (var0 = 1; var0 < 512; ++var0) { // L: 37 - field2273[var0] = 32768 / var0; // L: 38 + for (var0 = 1; var0 < 512; ++var0) { + field2273[var0] = 32768 / var0; } - for (var0 = 1; var0 < 2048; ++var0) { // L: 40 - field2271[var0] = 65536 / var0; // L: 41 + for (var0 = 1; var0 < 2048; ++var0) { + field2271[var0] = 65536 / var0; } - for (var0 = 0; var0 < 2048; ++var0) { // L: 43 - Rasterizer3D_sine[var0] = (int)(65536.0D * Math.sin((double)var0 * 0.0030679615D)); // L: 44 - Rasterizer3D_cosine[var0] = (int)(65536.0D * Math.cos((double)var0 * 0.0030679615D)); // L: 45 + for (var0 = 0; var0 < 2048; ++var0) { + Rasterizer3D_sine[var0] = (int)(65536.0D * Math.sin((double)var0 * 0.0030679615D)); + Rasterizer3D_cosine[var0] = (int)(65536.0D * Math.cos((double)var0 * 0.0030679615D)); } - } // L: 47 + } @ObfuscatedName("c") @Export("Rasterizer3D_setClipFromRasterizer2D") public static final void Rasterizer3D_setClipFromRasterizer2D() { - Rasterizer3D_setClip(Rasterizer2D.Rasterizer2D_xClipStart, Rasterizer2D.Rasterizer2D_yClipStart, Rasterizer2D.Rasterizer2D_xClipEnd, Rasterizer2D.Rasterizer2D_yClipEnd); // L: 54 - } // L: 55 + Rasterizer3D_setClip(Rasterizer2D.Rasterizer2D_xClipStart, Rasterizer2D.Rasterizer2D_yClipStart, Rasterizer2D.Rasterizer2D_xClipEnd, Rasterizer2D.Rasterizer2D_yClipEnd); + } @ObfuscatedName("b") @Export("Rasterizer3D_setClip") static final void Rasterizer3D_setClip(int var0, int var1, int var2, int var3) { - Rasterizer3D_clipWidth = var2 - var0; // L: 58 - Rasterizer3D_clipHeight = var3 - var1; // L: 59 - Rasterizer3D_method3(); // L: 60 - if (Rasterizer3D_rowOffsets.length < Rasterizer3D_clipHeight) { // L: 61 + Rasterizer3D_clipWidth = var2 - var0; + Rasterizer3D_clipHeight = var3 - var1; + Rasterizer3D_method3(); + if (Rasterizer3D_rowOffsets.length < Rasterizer3D_clipHeight) { Rasterizer3D_rowOffsets = new int[SpotAnimationDefinition.method3362(Rasterizer3D_clipHeight)]; } - int var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; // L: 62 + int var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; - for (int var5 = 0; var5 < Rasterizer3D_clipHeight; ++var5) { // L: 63 - Rasterizer3D_rowOffsets[var5] = var4; // L: 64 - var4 += Rasterizer2D.Rasterizer2D_width; // L: 65 + for (int var5 = 0; var5 < Rasterizer3D_clipHeight; ++var5) { + Rasterizer3D_rowOffsets[var5] = var4; + var4 += Rasterizer2D.Rasterizer2D_width; } - } // L: 67 + } @ObfuscatedName("p") @Export("Rasterizer3D_method3") public static final void Rasterizer3D_method3() { - Rasterizer3D_clipMidX = Rasterizer3D_clipWidth / 2; // L: 70 - Rasterizer3D_clipMidY = Rasterizer3D_clipHeight / 2; // L: 71 - Rasterizer3D_clipNegativeMidX = -Rasterizer3D_clipMidX; // L: 72 - Rasterizer3D_clipMidX2 = Rasterizer3D_clipWidth - Rasterizer3D_clipMidX; // L: 73 - Rasterizer3D_clipNegativeMidY = -Rasterizer3D_clipMidY; // L: 74 - Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; // L: 75 - } // L: 76 + Rasterizer3D_clipMidX = Rasterizer3D_clipWidth / 2; + Rasterizer3D_clipMidY = Rasterizer3D_clipHeight / 2; + Rasterizer3D_clipNegativeMidX = -Rasterizer3D_clipMidX; + Rasterizer3D_clipMidX2 = Rasterizer3D_clipWidth - Rasterizer3D_clipMidX; + Rasterizer3D_clipNegativeMidY = -Rasterizer3D_clipMidY; + Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; + } @ObfuscatedName("m") public static final void method3913(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 - Rasterizer3D_clipMidX = var0 - var4; // L: 82 - Rasterizer3D_clipMidY = var1 - var3; // L: 83 - Rasterizer3D_clipNegativeMidX = -Rasterizer3D_clipMidX; // L: 84 - Rasterizer3D_clipMidX2 = Rasterizer3D_clipWidth - Rasterizer3D_clipMidX; // L: 85 - Rasterizer3D_clipNegativeMidY = -Rasterizer3D_clipMidY; // L: 86 - Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; // L: 87 - } // L: 88 + int var2 = Rasterizer3D_rowOffsets[0]; + int var3 = var2 / Rasterizer2D.Rasterizer2D_width; + int var4 = var2 - var3 * Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_clipMidX = var0 - var4; + Rasterizer3D_clipMidY = var1 - var3; + Rasterizer3D_clipNegativeMidX = -Rasterizer3D_clipMidX; + Rasterizer3D_clipMidX2 = Rasterizer3D_clipWidth - Rasterizer3D_clipMidX; + Rasterizer3D_clipNegativeMidY = -Rasterizer3D_clipMidY; + Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -153,613 +153,613 @@ public class Rasterizer3D extends Rasterizer2D { ) @Export("Rasterizer3D_setTextureLoader") public static final void Rasterizer3D_setTextureLoader(TextureLoader var0) { - Rasterizer3D_textureLoader = var0; // L: 91 - } // L: 92 + Rasterizer3D_textureLoader = var0; + } @ObfuscatedName("s") @Export("Rasterizer3D_setBrightness") public static final void Rasterizer3D_setBrightness(double var0) { - Rasterizer3D_buildPalette(var0, 0, 512); // L: 95 - } // L: 96 + Rasterizer3D_buildPalette(var0, 0, 512); + } @ObfuscatedName("j") @Export("Rasterizer3D_buildPalette") static final void Rasterizer3D_buildPalette(double var0, int var2, int var3) { - int var4 = var2 * 128; // L: 99 + int var4 = var2 * 128; - for (int var5 = var2; var5 < var3; ++var5) { // L: 100 - double var6 = (double)(var5 >> 3) / 64.0D + 0.0078125D; // L: 101 - double var8 = (double)(var5 & 7) / 8.0D + 0.0625D; // L: 102 + for (int var5 = var2; var5 < var3; ++var5) { + double var6 = (double)(var5 >> 3) / 64.0D + 0.0078125D; + double var8 = (double)(var5 & 7) / 8.0D + 0.0625D; - for (int var10 = 0; var10 < 128; ++var10) { // L: 103 - double var11 = (double)var10 / 128.0D; // L: 104 - double var13 = var11; // L: 105 - double var15 = var11; // L: 106 - double var17 = var11; // L: 107 - if (var8 != 0.0D) { // L: 108 + for (int var10 = 0; var10 < 128; ++var10) { + double var11 = (double)var10 / 128.0D; + double var13 = var11; + double var15 = var11; + double var17 = var11; + if (var8 != 0.0D) { double var19; - if (var11 < 0.5D) { // L: 110 + if (var11 < 0.5D) { var19 = var11 * (1.0D + var8); } else { - var19 = var11 + var8 - var11 * var8; // L: 111 + var19 = var11 + var8 - var11 * var8; } - double var21 = 2.0D * var11 - var19; // L: 112 - double var23 = var6 + 0.3333333333333333D; // L: 113 - if (var23 > 1.0D) { // L: 114 + double var21 = 2.0D * var11 - var19; + double var23 = var6 + 0.3333333333333333D; + if (var23 > 1.0D) { --var23; } - double var27 = var6 - 0.3333333333333333D; // L: 116 - if (var27 < 0.0D) { // L: 117 + double var27 = var6 - 0.3333333333333333D; + if (var27 < 0.0D) { ++var27; } - if (6.0D * var23 < 1.0D) { // L: 118 + if (6.0D * var23 < 1.0D) { var13 = var21 + (var19 - var21) * 6.0D * var23; - } else if (2.0D * var23 < 1.0D) { // L: 119 + } else if (2.0D * var23 < 1.0D) { var13 = var19; - } else if (3.0D * var23 < 2.0D) { // L: 120 + } else if (3.0D * var23 < 2.0D) { var13 = var21 + (var19 - var21) * (0.6666666666666666D - var23) * 6.0D; } else { - var13 = var21; // L: 121 + var13 = var21; } - if (6.0D * var6 < 1.0D) { // L: 122 + if (6.0D * var6 < 1.0D) { var15 = var21 + (var19 - var21) * 6.0D * var6; - } else if (2.0D * var6 < 1.0D) { // L: 123 + } else if (2.0D * var6 < 1.0D) { var15 = var19; - } else if (3.0D * var6 < 2.0D) { // L: 124 + } else if (3.0D * var6 < 2.0D) { var15 = var21 + (var19 - var21) * (0.6666666666666666D - var6) * 6.0D; } else { - var15 = var21; // L: 125 + var15 = var21; } - if (6.0D * var27 < 1.0D) { // L: 126 + if (6.0D * var27 < 1.0D) { var17 = var21 + (var19 - var21) * 6.0D * var27; - } else if (2.0D * var27 < 1.0D) { // L: 127 + } else if (2.0D * var27 < 1.0D) { var17 = var19; - } else if (3.0D * var27 < 2.0D) { // L: 128 + } else if (3.0D * var27 < 2.0D) { var17 = var21 + (var19 - var21) * (0.6666666666666666D - var27) * 6.0D; } else { - var17 = var21; // L: 129 + var17 = var21; } } - int var29 = (int)(var13 * 256.0D); // L: 131 - int var20 = (int)(var15 * 256.0D); // L: 132 - int var30 = (int)(var17 * 256.0D); // L: 133 - int var22 = var30 + (var20 << 8) + (var29 << 16); // L: 134 - var22 = Rasterizer3D_brighten(var22, var0); // L: 135 - if (var22 == 0) { // L: 136 + int var29 = (int)(var13 * 256.0D); + int var20 = (int)(var15 * 256.0D); + int var30 = (int)(var17 * 256.0D); + int var22 = var30 + (var20 << 8) + (var29 << 16); + var22 = Rasterizer3D_brighten(var22, var0); + if (var22 == 0) { var22 = 1; } - Rasterizer3D_colorPalette[var4++] = var22; // L: 137 + Rasterizer3D_colorPalette[var4++] = var22; } } - } // L: 140 + } @ObfuscatedName("w") @Export("Rasterizer3D_brighten") static int Rasterizer3D_brighten(int var0, double var1) { - double var3 = (double)(var0 >> 16) / 256.0D; // L: 143 - double var5 = (double)(var0 >> 8 & 255) / 256.0D; // L: 144 - double var7 = (double)(var0 & 255) / 256.0D; // L: 145 - var3 = Math.pow(var3, var1); // L: 146 - var5 = Math.pow(var5, var1); // L: 147 - var7 = Math.pow(var7, var1); // L: 148 - int var9 = (int)(var3 * 256.0D); // L: 149 - int var10 = (int)(var5 * 256.0D); // L: 150 - int var11 = (int)(var7 * 256.0D); // L: 151 - return var11 + (var10 << 8) + (var9 << 16); // L: 152 + double var3 = (double)(var0 >> 16) / 256.0D; + double var5 = (double)(var0 >> 8 & 255) / 256.0D; + double var7 = (double)(var0 & 255) / 256.0D; + var3 = Math.pow(var3, var1); + var5 = Math.pow(var5, var1); + var7 = Math.pow(var7, var1); + int var9 = (int)(var3 * 256.0D); + int var10 = (int)(var5 * 256.0D); + int var11 = (int)(var7 * 256.0D); + return var11 + (var10 << 8) + (var9 << 16); } @ObfuscatedName("n") public static void method3853(int var0, int var1, int var2) { - field2253 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; // L: 156 - } // L: 157 + field2253 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; + } @ObfuscatedName("r") static final void method3854(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 - int var12 = var2 - var0; // L: 163 - int var13 = var7 - var6; // L: 164 - int var14 = var8 - var6; // L: 165 + int var9 = var4 - var3; + int var10 = var1 - var0; + int var11 = var5 - var3; + int var12 = var2 - var0; + int var13 = var7 - var6; + int var14 = var8 - var6; int var15; - if (var2 != var1) { // L: 167 + if (var2 != var1) { var15 = (var5 - var4 << 14) / (var2 - var1); } else { - var15 = 0; // L: 168 + var15 = 0; } int var16; - if (var0 != var1) { // L: 170 + if (var0 != var1) { var16 = (var9 << 14) / var10; } else { - var16 = 0; // L: 171 + var16 = 0; } int var17; - if (var0 != var2) { // L: 173 + if (var0 != var2) { var17 = (var11 << 14) / var12; } else { - var17 = 0; // L: 174 + var17 = 0; } - int var18 = var9 * var12 - var11 * var10; // L: 175 - if (var18 != 0) { // L: 176 - int var19 = (var13 * var12 - var14 * var10 << 8) / var18; // L: 177 - int var20 = (var14 * var9 - var13 * var11 << 8) / var18; // L: 178 - if (var0 <= var1 && var0 <= var2) { // L: 179 - if (var0 < Rasterizer3D_clipHeight) { // L: 180 - if (var1 > Rasterizer3D_clipHeight) { // L: 181 + int var18 = var9 * var12 - var11 * var10; + if (var18 != 0) { + int var19 = (var13 * var12 - var14 * var10 << 8) / var18; + int var20 = (var14 * var9 - var13 * var11 << 8) / var18; + if (var0 <= var1 && var0 <= var2) { + if (var0 < Rasterizer3D_clipHeight) { + if (var1 > Rasterizer3D_clipHeight) { var1 = Rasterizer3D_clipHeight; } - if (var2 > Rasterizer3D_clipHeight) { // L: 182 + if (var2 > Rasterizer3D_clipHeight) { var2 = Rasterizer3D_clipHeight; } - var6 = var19 + ((var6 << 8) - var3 * var19); // L: 183 - if (var1 < var2) { // L: 184 - var5 = var3 <<= 14; // L: 185 - if (var0 < 0) { // L: 186 - var5 -= var0 * var17; // L: 187 - var3 -= var0 * var16; // L: 188 - var6 -= var0 * var20; // L: 189 - var0 = 0; // L: 190 + var6 = var19 + ((var6 << 8) - var3 * var19); + if (var1 < var2) { + var5 = var3 <<= 14; + if (var0 < 0) { + var5 -= var0 * var17; + var3 -= var0 * var16; + var6 -= var0 * var20; + var0 = 0; } - var4 <<= 14; // L: 192 - if (var1 < 0) { // L: 193 - var4 -= var15 * var1; // L: 194 - var1 = 0; // L: 195 + var4 <<= 14; + if (var1 < 0) { + var4 -= var15 * var1; + var1 = 0; } - if ((var0 == var1 || var17 >= var16) && (var0 != var1 || var17 <= var15)) { // L: 197 - var2 -= var1; // L: 218 - var1 -= var0; // L: 219 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 220 + if ((var0 == var1 || var17 >= var16) && (var0 != var1 || var17 <= var15)) { + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; while (true) { - --var1; // L: 221 + --var1; if (var1 < 0) { while (true) { - --var2; // L: 228 + --var2; if (var2 < 0) { - return; // L: 235 + return; } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var5 >> 14, var6, var19); // L: 229 - var5 += var17; // L: 230 - var4 += var15; // L: 231 - var6 += var20; // L: 232 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 233 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var5 >> 14, var6, var19); + var5 += var17; + var4 += var15; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19); // L: 222 - var5 += var17; // L: 223 - var3 += var16; // L: 224 - var6 += var20; // L: 225 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 226 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19); + var5 += var17; + var3 += var16; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; } } else { - var2 -= var1; // L: 198 - var1 -= var0; // L: 199 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 200 + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; while (true) { - --var1; // L: 201 + --var1; if (var1 < 0) { while (true) { - --var2; // L: 208 + --var2; if (var2 < 0) { - return; // L: 215 + return; } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var4 >> 14, var6, var19); // L: 209 - var5 += var17; // L: 210 - var4 += var15; // L: 211 - var6 += var20; // L: 212 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 213 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var4 >> 14, var6, var19); + var5 += var17; + var4 += var15; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); // L: 202 - var5 += var17; // L: 203 - var3 += var16; // L: 204 - var6 += var20; // L: 205 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 206 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); + var5 += var17; + var3 += var16; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; } } } else { - var4 = var3 <<= 14; // L: 239 - if (var0 < 0) { // L: 240 - var4 -= var0 * var17; // L: 241 - var3 -= var0 * var16; // L: 242 - var6 -= var0 * var20; // L: 243 - var0 = 0; // L: 244 + var4 = var3 <<= 14; + if (var0 < 0) { + var4 -= var0 * var17; + var3 -= var0 * var16; + var6 -= var0 * var20; + var0 = 0; } - var5 <<= 14; // L: 246 - if (var2 < 0) { // L: 247 - var5 -= var15 * var2; // L: 248 - var2 = 0; // L: 249 + var5 <<= 14; + if (var2 < 0) { + var5 -= var15 * var2; + var2 = 0; } - if (var0 != var2 && var17 < var16 || var0 == var2 && var15 > var16) { // L: 251 - var1 -= var2; // L: 252 - var2 -= var0; // L: 253 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 254 + if (var0 != var2 && var17 < var16 || var0 == var2 && var15 > var16) { + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; while (true) { - --var2; // L: 255 + --var2; if (var2 < 0) { while (true) { - --var1; // L: 262 + --var1; if (var1 < 0) { - return; // L: 269 + return; } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); // L: 263 - var5 += var15; // L: 264 - var3 += var16; // L: 265 - var6 += var20; // L: 266 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 267 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); + var5 += var15; + var3 += var16; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var3 >> 14, var6, var19); // L: 256 - var4 += var17; // L: 257 - var3 += var16; // L: 258 - var6 += var20; // L: 259 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 260 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var3 >> 14, var6, var19); + var4 += var17; + var3 += var16; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; } } else { - var1 -= var2; // L: 272 - var2 -= var0; // L: 273 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 274 + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; while (true) { - --var2; // L: 275 + --var2; if (var2 < 0) { while (true) { - --var1; // L: 282 + --var1; if (var1 < 0) { - return; // L: 289 + return; } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19); // L: 283 - var5 += var15; // L: 284 - var3 += var16; // L: 285 - var6 += var20; // L: 286 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 287 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19); + var5 += var15; + var3 += var16; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var4 >> 14, var6, var19); // L: 276 - var4 += var17; // L: 277 - var3 += var16; // L: 278 - var6 += var20; // L: 279 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 280 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var4 >> 14, var6, var19); + var4 += var17; + var3 += var16; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; } } } } - } else if (var1 <= var2) { // L: 293 - if (var1 < Rasterizer3D_clipHeight) { // L: 294 - if (var2 > Rasterizer3D_clipHeight) { // L: 295 + } else if (var1 <= var2) { + if (var1 < Rasterizer3D_clipHeight) { + if (var2 > Rasterizer3D_clipHeight) { var2 = Rasterizer3D_clipHeight; } - if (var0 > Rasterizer3D_clipHeight) { // L: 296 + if (var0 > Rasterizer3D_clipHeight) { var0 = Rasterizer3D_clipHeight; } - var7 = var19 + ((var7 << 8) - var19 * var4); // L: 297 - if (var2 < var0) { // L: 298 - var3 = var4 <<= 14; // L: 299 - if (var1 < 0) { // L: 300 - var3 -= var16 * var1; // L: 301 - var4 -= var15 * var1; // L: 302 - var7 -= var20 * var1; // L: 303 - var1 = 0; // L: 304 + var7 = var19 + ((var7 << 8) - var19 * var4); + if (var2 < var0) { + var3 = var4 <<= 14; + if (var1 < 0) { + var3 -= var16 * var1; + var4 -= var15 * var1; + var7 -= var20 * var1; + var1 = 0; } - var5 <<= 14; // L: 306 - if (var2 < 0) { // L: 307 - var5 -= var17 * var2; // L: 308 - var2 = 0; // L: 309 + var5 <<= 14; + if (var2 < 0) { + var5 -= var17 * var2; + var2 = 0; } - if ((var2 == var1 || var16 >= var15) && (var2 != var1 || var16 <= var17)) { // L: 311 - var0 -= var2; // L: 332 - var2 -= var1; // L: 333 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 334 + if ((var2 == var1 || var16 >= var15) && (var2 != var1 || var16 <= var17)) { + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; while (true) { - --var2; // L: 335 + --var2; if (var2 < 0) { while (true) { - --var0; // L: 342 + --var0; if (var0 < 0) { - return; // L: 349 + return; } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var3 >> 14, var7, var19); // L: 343 - var3 += var16; // L: 344 - var5 += var17; // L: 345 - var7 += var20; // L: 346 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 347 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var3 >> 14, var7, var19); + var3 += var16; + var5 += var17; + var7 += var20; + var1 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19); // L: 336 - var3 += var16; // L: 337 - var4 += var15; // L: 338 - var7 += var20; // L: 339 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 340 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19); + var3 += var16; + var4 += var15; + var7 += var20; + var1 += Rasterizer2D.Rasterizer2D_width; } } else { - var0 -= var2; // L: 312 - var2 -= var1; // L: 313 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 314 + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; while (true) { - --var2; // L: 315 + --var2; if (var2 < 0) { while (true) { - --var0; // L: 322 + --var0; if (var0 < 0) { - return; // L: 329 + return; } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var5 >> 14, var7, var19); // L: 323 - var3 += var16; // L: 324 - var5 += var17; // L: 325 - var7 += var20; // L: 326 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 327 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var5 >> 14, var7, var19); + var3 += var16; + var5 += var17; + var7 += var20; + var1 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19); // L: 316 - var3 += var16; // L: 317 - var4 += var15; // L: 318 - var7 += var20; // L: 319 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 320 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19); + var3 += var16; + var4 += var15; + var7 += var20; + var1 += Rasterizer2D.Rasterizer2D_width; } } } else { - var5 = var4 <<= 14; // L: 353 - if (var1 < 0) { // L: 354 - var5 -= var16 * var1; // L: 355 - var4 -= var15 * var1; // L: 356 - var7 -= var20 * var1; // L: 357 - var1 = 0; // L: 358 + var5 = var4 <<= 14; + if (var1 < 0) { + var5 -= var16 * var1; + var4 -= var15 * var1; + var7 -= var20 * var1; + var1 = 0; } - var3 <<= 14; // L: 360 - if (var0 < 0) { // L: 361 - var3 -= var0 * var17; // L: 362 - var0 = 0; // L: 363 + var3 <<= 14; + if (var0 < 0) { + var3 -= var0 * var17; + var0 = 0; } - if (var16 < var15) { // L: 365 - var2 -= var0; // L: 366 - var0 -= var1; // L: 367 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 368 + if (var16 < var15) { + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; while (true) { - --var0; // L: 369 + --var0; if (var0 < 0) { while (true) { - --var2; // L: 376 + --var2; if (var2 < 0) { - return; // L: 383 + return; } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19); // L: 377 - var3 += var17; // L: 378 - var4 += var15; // L: 379 - var7 += var20; // L: 380 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 381 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19); + var3 += var17; + var4 += var15; + var7 += var20; + var1 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var7, var19); // L: 370 - var5 += var16; // L: 371 - var4 += var15; // L: 372 - var7 += var20; // L: 373 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 374 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var7, var19); + var5 += var16; + var4 += var15; + var7 += var20; + var1 += Rasterizer2D.Rasterizer2D_width; } } else { - var2 -= var0; // L: 386 - var0 -= var1; // L: 387 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 388 + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; while (true) { - --var0; // L: 389 + --var0; if (var0 < 0) { while (true) { - --var2; // L: 396 + --var2; if (var2 < 0) { - return; // L: 403 + return; } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19); // L: 397 - var3 += var17; // L: 398 - var4 += var15; // L: 399 - var7 += var20; // L: 400 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 401 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19); + var3 += var17; + var4 += var15; + var7 += var20; + var1 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var7, var19); // L: 390 - var5 += var16; // L: 391 - var4 += var15; // L: 392 - var7 += var20; // L: 393 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 394 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var7, var19); + var5 += var16; + var4 += var15; + var7 += var20; + var1 += Rasterizer2D.Rasterizer2D_width; } } } } - } else if (var2 < Rasterizer3D_clipHeight) { // L: 408 - if (var0 > Rasterizer3D_clipHeight) { // L: 409 + } else if (var2 < Rasterizer3D_clipHeight) { + if (var0 > Rasterizer3D_clipHeight) { var0 = Rasterizer3D_clipHeight; } - if (var1 > Rasterizer3D_clipHeight) { // L: 410 + if (var1 > Rasterizer3D_clipHeight) { var1 = Rasterizer3D_clipHeight; } - var8 = var19 + ((var8 << 8) - var5 * var19); // L: 411 - if (var0 < var1) { // L: 412 - var4 = var5 <<= 14; // L: 413 - if (var2 < 0) { // L: 414 - var4 -= var15 * var2; // L: 415 - var5 -= var17 * var2; // L: 416 - var8 -= var20 * var2; // L: 417 - var2 = 0; // L: 418 + var8 = var19 + ((var8 << 8) - var5 * var19); + if (var0 < var1) { + var4 = var5 <<= 14; + if (var2 < 0) { + var4 -= var15 * var2; + var5 -= var17 * var2; + var8 -= var20 * var2; + var2 = 0; } - var3 <<= 14; // L: 420 - if (var0 < 0) { // L: 421 - var3 -= var0 * var16; // L: 422 - var0 = 0; // L: 423 + var3 <<= 14; + if (var0 < 0) { + var3 -= var0 * var16; + var0 = 0; } - if (var15 < var17) { // L: 425 - var1 -= var0; // L: 426 - var0 -= var2; // L: 427 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 428 + if (var15 < var17) { + var1 -= var0; + var0 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; while (true) { - --var0; // L: 429 + --var0; if (var0 < 0) { while (true) { - --var1; // L: 436 + --var1; if (var1 < 0) { - return; // L: 443 + return; } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var3 >> 14, var8, var19); // L: 437 - var4 += var15; // L: 438 - var3 += var16; // L: 439 - var8 += var20; // L: 440 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 441 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var3 >> 14, var8, var19); + var4 += var15; + var3 += var16; + var8 += var20; + var2 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19); // L: 430 - var4 += var15; // L: 431 - var5 += var17; // L: 432 - var8 += var20; // L: 433 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 434 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19); + var4 += var15; + var5 += var17; + var8 += var20; + var2 += Rasterizer2D.Rasterizer2D_width; } } else { - var1 -= var0; // L: 446 - var0 -= var2; // L: 447 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 448 + var1 -= var0; + var0 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; while (true) { - --var0; // L: 449 + --var0; if (var0 < 0) { while (true) { - --var1; // L: 456 + --var1; if (var1 < 0) { - return; // L: 463 + return; } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var4 >> 14, var8, var19); // L: 457 - var4 += var15; // L: 458 - var3 += var16; // L: 459 - var8 += var20; // L: 460 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 461 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var4 >> 14, var8, var19); + var4 += var15; + var3 += var16; + var8 += var20; + var2 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19); // L: 450 - var4 += var15; // L: 451 - var5 += var17; // L: 452 - var8 += var20; // L: 453 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 454 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19); + var4 += var15; + var5 += var17; + var8 += var20; + var2 += Rasterizer2D.Rasterizer2D_width; } } } else { - var3 = var5 <<= 14; // L: 467 - if (var2 < 0) { // L: 468 - var3 -= var15 * var2; // L: 469 - var5 -= var17 * var2; // L: 470 - var8 -= var20 * var2; // L: 471 - var2 = 0; // L: 472 + var3 = var5 <<= 14; + if (var2 < 0) { + var3 -= var15 * var2; + var5 -= var17 * var2; + var8 -= var20 * var2; + var2 = 0; } - var4 <<= 14; // L: 474 - if (var1 < 0) { // L: 475 - var4 -= var16 * var1; // L: 476 - var1 = 0; // L: 477 + var4 <<= 14; + if (var1 < 0) { + var4 -= var16 * var1; + var1 = 0; } - if (var15 < var17) { // L: 479 - var0 -= var1; // L: 480 - var1 -= var2; // L: 481 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 482 + if (var15 < var17) { + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; while (true) { - --var1; // L: 483 + --var1; if (var1 < 0) { while (true) { - --var0; // L: 490 + --var0; if (var0 < 0) { - return; // L: 497 + return; } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19); // L: 491 - var4 += var16; // L: 492 - var5 += var17; // L: 493 - var8 += var20; // L: 494 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 495 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19); + var4 += var16; + var5 += var17; + var8 += var20; + var2 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var5 >> 14, var8, var19); // L: 484 - var3 += var15; // L: 485 - var5 += var17; // L: 486 - var8 += var20; // L: 487 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 488 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var5 >> 14, var8, var19); + var3 += var15; + var5 += var17; + var8 += var20; + var2 += Rasterizer2D.Rasterizer2D_width; } } else { - var0 -= var1; // L: 500 - var1 -= var2; // L: 501 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 502 + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; while (true) { - --var1; // L: 503 + --var1; if (var1 < 0) { while (true) { - --var0; // L: 510 + --var0; if (var0 < 0) { - return; // L: 517 + return; } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19); // L: 511 - var4 += var16; // L: 512 - var5 += var17; // L: 513 - var8 += var20; // L: 514 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 515 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19); + var4 += var16; + var5 += var17; + var8 += var20; + var2 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var3 >> 14, var8, var19); // L: 504 - var3 += var15; // L: 505 - var5 += var17; // L: 506 - var8 += var20; // L: 507 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 508 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var3 >> 14, var8, var19); + var3 += var15; + var5 += var17; + var8 += var20; + var2 += Rasterizer2D.Rasterizer2D_width; } } } @@ -770,563 +770,563 @@ public class Rasterizer3D extends Rasterizer2D { @ObfuscatedName("o") @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 (field2253) { // L: 524 - if (var5 > Rasterizer3D_clipWidth) { // L: 525 + if (field2253) { + if (var5 > Rasterizer3D_clipWidth) { var5 = Rasterizer3D_clipWidth; } - if (var4 < 0) { // L: 526 + if (var4 < 0) { var4 = 0; } } - if (var4 < var5) { // L: 528 - var1 += var4; // L: 529 - var6 += var4 * var7; // L: 530 + if (var4 < var5) { + var1 += var4; + var6 += var4 * var7; int var8; int var9; int var10; int var11; - if (field2276) { // L: 531 - var3 = var5 - var4 >> 2; // L: 532 - var7 <<= 2; // L: 533 - if (Rasterizer3D_alpha == 0) { // L: 534 - if (var3 > 0) { // L: 535 + if (field2276) { + var3 = var5 - var4 >> 2; + var7 <<= 2; + if (Rasterizer3D_alpha == 0) { + if (var3 > 0) { do { - var8 = (var6 & (var6 >> 31 & 1) - 1) >> 8; // L: 537 - var2 = Rasterizer3D_colorPalette[var8]; // L: 538 - var6 += var7; // L: 539 - var0[var1++] = var2; // L: 540 - var0[var1++] = var2; // L: 541 - var0[var1++] = var2; // L: 542 - var0[var1++] = var2; // L: 543 - --var3; // L: 544 + var8 = (var6 & (var6 >> 31 & 1) - 1) >> 8; + var2 = Rasterizer3D_colorPalette[var8]; + var6 += var7; + var0[var1++] = var2; + var0[var1++] = var2; + var0[var1++] = var2; + var0[var1++] = var2; + --var3; } while(var3 > 0); } - var3 = var5 - var4 & 3; // L: 546 - if (var3 > 0) { // L: 547 - var8 = (var6 & (var6 >> 31 & 1) - 1) >> 8; // L: 548 - var2 = Rasterizer3D_colorPalette[var8]; // L: 549 + var3 = var5 - var4 & 3; + if (var3 > 0) { + var8 = (var6 & (var6 >> 31 & 1) - 1) >> 8; + var2 = Rasterizer3D_colorPalette[var8]; do { - var0[var1++] = var2; // L: 551 - --var3; // L: 552 + var0[var1++] = var2; + --var3; } while(var3 > 0); } } else { - var8 = Rasterizer3D_alpha; // L: 556 - var9 = 256 - Rasterizer3D_alpha; // L: 557 - if (var3 > 0) { // L: 558 + var8 = Rasterizer3D_alpha; + var9 = 256 - Rasterizer3D_alpha; + if (var3 > 0) { do { - var10 = (var6 & (var6 >> 31 & 1) - 1) >> 8; // L: 560 - var2 = Rasterizer3D_colorPalette[var10]; // L: 561 - var6 += var7; // L: 562 - var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); // L: 563 - var11 = var0[var1]; // L: 564 - var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); // L: 565 - var11 = var0[var1]; // L: 566 - var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); // L: 567 - var11 = var0[var1]; // L: 568 - var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); // L: 569 - var11 = var0[var1]; // L: 570 - var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); // L: 571 - --var3; // L: 572 + var10 = (var6 & (var6 >> 31 & 1) - 1) >> 8; + var2 = Rasterizer3D_colorPalette[var10]; + var6 += var7; + var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); + var11 = var0[var1]; + var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); + var11 = var0[var1]; + var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); + var11 = var0[var1]; + var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); + var11 = var0[var1]; + var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); + --var3; } while(var3 > 0); } - var3 = var5 - var4 & 3; // L: 574 - if (var3 > 0) { // L: 575 - var10 = (var6 & (var6 >> 31 & 1) - 1) >> 8; // L: 576 - var2 = Rasterizer3D_colorPalette[var10]; // L: 577 - var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); // L: 578 + var3 = var5 - var4 & 3; + if (var3 > 0) { + var10 = (var6 & (var6 >> 31 & 1) - 1) >> 8; + var2 = Rasterizer3D_colorPalette[var10]; + var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); do { - var11 = var0[var1]; // L: 580 - var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); // L: 581 - --var3; // L: 582 + var11 = var0[var1]; + var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); + --var3; } while(var3 > 0); } } } else { - var3 = var5 - var4; // L: 588 - if (Rasterizer3D_alpha == 0) { // L: 589 + var3 = var5 - var4; + if (Rasterizer3D_alpha == 0) { do { - var8 = (var6 & (var6 >> 31 & 1) - 1) >> 8; // L: 591 - var0[var1++] = Rasterizer3D_colorPalette[var8]; // L: 592 - var6 += var7; // L: 593 - --var3; // L: 594 + var8 = (var6 & (var6 >> 31 & 1) - 1) >> 8; + var0[var1++] = Rasterizer3D_colorPalette[var8]; + var6 += var7; + --var3; } while(var3 > 0); } else { - var8 = Rasterizer3D_alpha; // L: 597 - var9 = 256 - Rasterizer3D_alpha; // L: 598 + var8 = Rasterizer3D_alpha; + var9 = 256 - Rasterizer3D_alpha; do { - var10 = (var6 & (var6 >> 31 & 1) - 1) >> 8; // L: 600 - var2 = Rasterizer3D_colorPalette[var10]; // L: 601 - var6 += var7; // L: 602 - var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); // L: 603 - var11 = var0[var1]; // L: 604 - var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); // L: 605 - --var3; // L: 606 + var10 = (var6 & (var6 >> 31 & 1) - 1) >> 8; + var2 = Rasterizer3D_colorPalette[var10]; + var6 += var7; + var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); + var11 = var0[var1]; + var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); + --var3; } while(var3 > 0); } } } - } // L: 585 608 + } @ObfuscatedName("v") public static final void method3856(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var7 = 0; // L: 613 - if (var0 != var1) { // L: 614 + int var7 = 0; + if (var0 != var1) { var7 = (var4 - var3 << 14) / (var1 - var0); } - int var8 = 0; // L: 615 - if (var2 != var1) { // L: 616 + int var8 = 0; + if (var2 != var1) { var8 = (var5 - var4 << 14) / (var2 - var1); } - int var9 = 0; // L: 617 - if (var0 != var2) { // L: 618 + int var9 = 0; + if (var0 != var2) { var9 = (var3 - var5 << 14) / (var0 - var2); } - if (var0 <= var1 && var0 <= var2) { // L: 619 - if (var0 < Rasterizer3D_clipHeight) { // L: 620 - if (var1 > Rasterizer3D_clipHeight) { // L: 621 + if (var0 <= var1 && var0 <= var2) { + if (var0 < Rasterizer3D_clipHeight) { + if (var1 > Rasterizer3D_clipHeight) { var1 = Rasterizer3D_clipHeight; } - if (var2 > Rasterizer3D_clipHeight) { // L: 622 + if (var2 > Rasterizer3D_clipHeight) { var2 = Rasterizer3D_clipHeight; } - if (var1 < var2) { // L: 623 - var5 = var3 <<= 14; // L: 624 - if (var0 < 0) { // L: 625 - var5 -= var0 * var9; // L: 626 - var3 -= var0 * var7; // L: 627 - var0 = 0; // L: 628 + if (var1 < var2) { + var5 = var3 <<= 14; + if (var0 < 0) { + var5 -= var0 * var9; + var3 -= var0 * var7; + var0 = 0; } - var4 <<= 14; // L: 630 - if (var1 < 0) { // L: 631 - var4 -= var8 * var1; // L: 632 - var1 = 0; // L: 633 + var4 <<= 14; + if (var1 < 0) { + var4 -= var8 * var1; + var1 = 0; } - if (var0 != var1 && var9 < var7 || var0 == var1 && var9 > var8) { // L: 635 - var2 -= var1; // L: 636 - var1 -= var0; // L: 637 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 638 + if (var0 != var1 && var9 < var7 || var0 == var1 && var9 > var8) { + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; while (true) { - --var1; // L: 639 + --var1; if (var1 < 0) { while (true) { - --var2; // L: 645 + --var2; if (var2 < 0) { - return; // L: 651 + return; } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var4 >> 14); // L: 646 - var5 += var9; // L: 647 - var4 += var8; // L: 648 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 649 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var4 >> 14); + var5 += var9; + var4 += var8; + var0 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); // L: 640 - var5 += var9; // L: 641 - var3 += var7; // L: 642 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 643 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); + var5 += var9; + var3 += var7; + var0 += Rasterizer2D.Rasterizer2D_width; } } else { - var2 -= var1; // L: 654 - var1 -= var0; // L: 655 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 656 + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; while (true) { - --var1; // L: 657 + --var1; if (var1 < 0) { while (true) { - --var2; // L: 663 + --var2; if (var2 < 0) { - return; // L: 669 + return; } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var5 >> 14); // L: 664 - var5 += var9; // L: 665 - var4 += var8; // L: 666 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 667 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var5 >> 14); + var5 += var9; + var4 += var8; + var0 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); // L: 658 - var5 += var9; // L: 659 - var3 += var7; // L: 660 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 661 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); + var5 += var9; + var3 += var7; + var0 += Rasterizer2D.Rasterizer2D_width; } } } else { - var4 = var3 <<= 14; // L: 673 - if (var0 < 0) { // L: 674 - var4 -= var0 * var9; // L: 675 - var3 -= var0 * var7; // L: 676 - var0 = 0; // L: 677 + var4 = var3 <<= 14; + if (var0 < 0) { + var4 -= var0 * var9; + var3 -= var0 * var7; + var0 = 0; } - var5 <<= 14; // L: 679 - if (var2 < 0) { // L: 680 - var5 -= var8 * var2; // L: 681 - var2 = 0; // L: 682 + var5 <<= 14; + if (var2 < 0) { + var5 -= var8 * var2; + var2 = 0; } - if (var0 != var2 && var9 < var7 || var0 == var2 && var8 > var7) { // L: 684 - var1 -= var2; // L: 685 - var2 -= var0; // L: 686 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 687 + if (var0 != var2 && var9 < var7 || var0 == var2 && var8 > var7) { + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; while (true) { - --var2; // L: 688 + --var2; if (var2 < 0) { while (true) { - --var1; // L: 694 + --var1; if (var1 < 0) { - return; // L: 700 + return; } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); // L: 695 - var5 += var8; // L: 696 - var3 += var7; // L: 697 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 698 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); + var5 += var8; + var3 += var7; + var0 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var3 >> 14); // L: 689 - var4 += var9; // L: 690 - var3 += var7; // L: 691 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 692 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var3 >> 14); + var4 += var9; + var3 += var7; + var0 += Rasterizer2D.Rasterizer2D_width; } } else { - var1 -= var2; // L: 703 - var2 -= var0; // L: 704 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 705 + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; while (true) { - --var2; // L: 706 + --var2; if (var2 < 0) { while (true) { - --var1; // L: 712 + --var1; if (var1 < 0) { - return; // L: 718 + return; } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); // L: 713 - var5 += var8; // L: 714 - var3 += var7; // L: 715 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 716 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); + var5 += var8; + var3 += var7; + var0 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var4 >> 14); // L: 707 - var4 += var9; // L: 708 - var3 += var7; // L: 709 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 710 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var4 >> 14); + var4 += var9; + var3 += var7; + var0 += Rasterizer2D.Rasterizer2D_width; } } } } - } else if (var1 <= var2) { // L: 722 - if (var1 < Rasterizer3D_clipHeight) { // L: 723 - if (var2 > Rasterizer3D_clipHeight) { // L: 724 + } else if (var1 <= var2) { + if (var1 < Rasterizer3D_clipHeight) { + if (var2 > Rasterizer3D_clipHeight) { var2 = Rasterizer3D_clipHeight; } - if (var0 > Rasterizer3D_clipHeight) { // L: 725 + if (var0 > Rasterizer3D_clipHeight) { var0 = Rasterizer3D_clipHeight; } - if (var2 < var0) { // L: 726 - var3 = var4 <<= 14; // L: 727 - if (var1 < 0) { // L: 728 - var3 -= var7 * var1; // L: 729 - var4 -= var8 * var1; // L: 730 - var1 = 0; // L: 731 + if (var2 < var0) { + var3 = var4 <<= 14; + if (var1 < 0) { + var3 -= var7 * var1; + var4 -= var8 * var1; + var1 = 0; } - var5 <<= 14; // L: 733 - if (var2 < 0) { // L: 734 - var5 -= var9 * var2; // L: 735 - var2 = 0; // L: 736 + var5 <<= 14; + if (var2 < 0) { + var5 -= var9 * var2; + var2 = 0; } - if (var2 != var1 && var7 < var8 || var2 == var1 && var7 > var9) { // L: 738 - var0 -= var2; // L: 739 - var2 -= var1; // L: 740 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 741 + if (var2 != var1 && var7 < var8 || var2 == var1 && var7 > var9) { + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; while (true) { - --var2; // L: 742 + --var2; if (var2 < 0) { while (true) { - --var0; // L: 748 + --var0; if (var0 < 0) { - return; // L: 754 + return; } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var5 >> 14); // L: 749 - var3 += var7; // L: 750 - var5 += var9; // L: 751 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 752 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var5 >> 14); + var3 += var7; + var5 += var9; + var1 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); // L: 743 - var3 += var7; // L: 744 - var4 += var8; // L: 745 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 746 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); + var3 += var7; + var4 += var8; + var1 += Rasterizer2D.Rasterizer2D_width; } } else { - var0 -= var2; // L: 757 - var2 -= var1; // L: 758 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 759 + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; while (true) { - --var2; // L: 760 + --var2; if (var2 < 0) { while (true) { - --var0; // L: 766 + --var0; if (var0 < 0) { - return; // L: 772 + return; } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var3 >> 14); // L: 767 - var3 += var7; // L: 768 - var5 += var9; // L: 769 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 770 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var3 >> 14); + var3 += var7; + var5 += var9; + var1 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); // L: 761 - var3 += var7; // L: 762 - var4 += var8; // L: 763 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 764 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); + var3 += var7; + var4 += var8; + var1 += Rasterizer2D.Rasterizer2D_width; } } } else { - var5 = var4 <<= 14; // L: 776 - if (var1 < 0) { // L: 777 - var5 -= var7 * var1; // L: 778 - var4 -= var8 * var1; // L: 779 - var1 = 0; // L: 780 + var5 = var4 <<= 14; + if (var1 < 0) { + var5 -= var7 * var1; + var4 -= var8 * var1; + var1 = 0; } - var3 <<= 14; // L: 782 - if (var0 < 0) { // L: 783 - var3 -= var0 * var9; // L: 784 - var0 = 0; // L: 785 + var3 <<= 14; + if (var0 < 0) { + var3 -= var0 * var9; + var0 = 0; } - if (var7 < var8) { // L: 787 - var2 -= var0; // L: 788 - var0 -= var1; // L: 789 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 790 + if (var7 < var8) { + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; while (true) { - --var0; // L: 791 + --var0; if (var0 < 0) { while (true) { - --var2; // L: 797 + --var2; if (var2 < 0) { - return; // L: 803 + return; } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); // L: 798 - var3 += var9; // L: 799 - var4 += var8; // L: 800 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 801 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); + var3 += var9; + var4 += var8; + var1 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var4 >> 14); // L: 792 - var5 += var7; // L: 793 - var4 += var8; // L: 794 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 795 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var4 >> 14); + var5 += var7; + var4 += var8; + var1 += Rasterizer2D.Rasterizer2D_width; } } else { - var2 -= var0; // L: 806 - var0 -= var1; // L: 807 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 808 + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; while (true) { - --var0; // L: 809 + --var0; if (var0 < 0) { while (true) { - --var2; // L: 815 + --var2; if (var2 < 0) { - return; // L: 821 + return; } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); // L: 816 - var3 += var9; // L: 817 - var4 += var8; // L: 818 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 819 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); + var3 += var9; + var4 += var8; + var1 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var5 >> 14); // L: 810 - var5 += var7; // L: 811 - var4 += var8; // L: 812 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 813 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var5 >> 14); + var5 += var7; + var4 += var8; + var1 += Rasterizer2D.Rasterizer2D_width; } } } } - } else if (var2 < Rasterizer3D_clipHeight) { // L: 826 - if (var0 > Rasterizer3D_clipHeight) { // L: 827 + } else if (var2 < Rasterizer3D_clipHeight) { + if (var0 > Rasterizer3D_clipHeight) { var0 = Rasterizer3D_clipHeight; } - if (var1 > Rasterizer3D_clipHeight) { // L: 828 + if (var1 > Rasterizer3D_clipHeight) { var1 = Rasterizer3D_clipHeight; } - if (var0 < var1) { // L: 829 - var4 = var5 <<= 14; // L: 830 - if (var2 < 0) { // L: 831 - var4 -= var8 * var2; // L: 832 - var5 -= var9 * var2; // L: 833 - var2 = 0; // L: 834 + if (var0 < var1) { + var4 = var5 <<= 14; + if (var2 < 0) { + var4 -= var8 * var2; + var5 -= var9 * var2; + var2 = 0; } - var3 <<= 14; // L: 836 - if (var0 < 0) { // L: 837 - var3 -= var0 * var7; // L: 838 - var0 = 0; // L: 839 + var3 <<= 14; + if (var0 < 0) { + var3 -= var0 * var7; + var0 = 0; } - if (var8 < var9) { // L: 841 - var1 -= var0; // L: 842 - var0 -= var2; // L: 843 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 844 + if (var8 < var9) { + var1 -= var0; + var0 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; while (true) { - --var0; // L: 845 + --var0; if (var0 < 0) { while (true) { - --var1; // L: 851 + --var1; if (var1 < 0) { - return; // L: 857 + return; } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var3 >> 14); // L: 852 - var4 += var8; // L: 853 - var3 += var7; // L: 854 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 855 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var3 >> 14); + var4 += var8; + var3 += var7; + var2 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14); // L: 846 - var4 += var8; // L: 847 - var5 += var9; // L: 848 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 849 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14); + var4 += var8; + var5 += var9; + var2 += Rasterizer2D.Rasterizer2D_width; } } else { - var1 -= var0; // L: 860 - var0 -= var2; // L: 861 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 862 + var1 -= var0; + var0 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; while (true) { - --var0; // L: 863 + --var0; if (var0 < 0) { while (true) { - --var1; // L: 869 + --var1; if (var1 < 0) { - return; // L: 875 + return; } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var4 >> 14); // L: 870 - var4 += var8; // L: 871 - var3 += var7; // L: 872 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 873 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var4 >> 14); + var4 += var8; + var3 += var7; + var2 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); // L: 864 - var4 += var8; // L: 865 - var5 += var9; // L: 866 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 867 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); + var4 += var8; + var5 += var9; + var2 += Rasterizer2D.Rasterizer2D_width; } } } else { - var3 = var5 <<= 14; // L: 879 - if (var2 < 0) { // L: 880 - var3 -= var8 * var2; // L: 881 - var5 -= var9 * var2; // L: 882 - var2 = 0; // L: 883 + var3 = var5 <<= 14; + if (var2 < 0) { + var3 -= var8 * var2; + var5 -= var9 * var2; + var2 = 0; } - var4 <<= 14; // L: 885 - if (var1 < 0) { // L: 886 - var4 -= var7 * var1; // L: 887 - var1 = 0; // L: 888 + var4 <<= 14; + if (var1 < 0) { + var4 -= var7 * var1; + var1 = 0; } - if (var8 < var9) { // L: 890 - var0 -= var1; // L: 891 - var1 -= var2; // L: 892 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 893 + if (var8 < var9) { + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; while (true) { - --var1; // L: 894 + --var1; if (var1 < 0) { while (true) { - --var0; // L: 900 + --var0; if (var0 < 0) { - return; // L: 906 + return; } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14); // L: 901 - var4 += var7; // L: 902 - var5 += var9; // L: 903 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 904 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14); + var4 += var7; + var5 += var9; + var2 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var5 >> 14); // L: 895 - var3 += var8; // L: 896 - var5 += var9; // L: 897 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 898 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var5 >> 14); + var3 += var8; + var5 += var9; + var2 += Rasterizer2D.Rasterizer2D_width; } } else { - var0 -= var1; // L: 909 - var1 -= var2; // L: 910 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 911 + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; while (true) { - --var1; // L: 912 + --var1; if (var1 < 0) { while (true) { - --var0; // L: 918 + --var0; if (var0 < 0) { - return; // L: 924 + return; } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); // L: 919 - var4 += var7; // L: 920 - var5 += var9; // L: 921 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 922 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); + var4 += var7; + var5 += var9; + var2 += Rasterizer2D.Rasterizer2D_width; } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var3 >> 14); // L: 913 - var3 += var8; // L: 914 - var5 += var9; // L: 915 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 916 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var3 >> 14); + var3 += var8; + var5 += var9; + var2 += Rasterizer2D.Rasterizer2D_width; } } } @@ -1336,93 +1336,93 @@ public class Rasterizer3D extends Rasterizer2D { @ObfuscatedName("d") @Export("Rasterizer3D_horizAlpha") static final void Rasterizer3D_horizAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5) { - if (field2253) { // L: 931 - if (var5 > Rasterizer3D_clipWidth) { // L: 932 + if (field2253) { + if (var5 > Rasterizer3D_clipWidth) { var5 = Rasterizer3D_clipWidth; } - if (var4 < 0) { // L: 933 + if (var4 < 0) { var4 = 0; } } - if (var4 < var5) { // L: 935 - var1 += var4; // L: 936 - var3 = var5 - var4 >> 2; // L: 937 - if (Rasterizer3D_alpha != 0) { // L: 938 - if (Rasterizer3D_alpha == 254) { // L: 950 + if (var4 < var5) { + var1 += var4; + var3 = var5 - var4 >> 2; + if (Rasterizer3D_alpha != 0) { + if (Rasterizer3D_alpha == 254) { while (true) { - --var3; // L: 951 + --var3; if (var3 < 0) { - var3 = var5 - var4 & 3; // L: 957 + var3 = var5 - var4 & 3; while (true) { - --var3; // L: 958 - if (var3 < 0) { - return; // L: 982 - } - - var0[var1++] = var0[var1]; // L: 959 - } - } - - var0[var1++] = var0[var1]; // L: 952 - var0[var1++] = var0[var1]; // L: 953 - var0[var1++] = var0[var1]; // L: 954 - var0[var1++] = var0[var1]; // L: 955 - } - } else { - int var6 = Rasterizer3D_alpha; // L: 963 - int var7 = 256 - Rasterizer3D_alpha; // L: 964 - var2 = (var7 * (var2 & 65280) >> 8 & 65280) + (var7 * (var2 & 16711935) >> 8 & 16711935); // L: 965 - - while (true) { - --var3; // L: 966 - int var8; - if (var3 < 0) { - var3 = var5 - var4 & 3; // L: 976 - - while (true) { - --var3; // L: 977 + --var3; if (var3 < 0) { return; } - var8 = var0[var1]; // L: 978 - var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 979 + var0[var1++] = var0[var1]; } } - var8 = var0[var1]; // L: 967 - var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 968 - var8 = var0[var1]; // L: 969 - var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 970 - var8 = var0[var1]; // L: 971 - var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 972 - var8 = var0[var1]; // L: 973 - var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 974 + var0[var1++] = var0[var1]; + var0[var1++] = var0[var1]; + var0[var1++] = var0[var1]; + var0[var1++] = var0[var1]; + } + } else { + int var6 = Rasterizer3D_alpha; + int var7 = 256 - Rasterizer3D_alpha; + var2 = (var7 * (var2 & 65280) >> 8 & 65280) + (var7 * (var2 & 16711935) >> 8 & 16711935); + + while (true) { + --var3; + int var8; + if (var3 < 0) { + var3 = var5 - var4 & 3; + + while (true) { + --var3; + if (var3 < 0) { + return; + } + + var8 = var0[var1]; + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); + } + } + + var8 = var0[var1]; + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); + var8 = var0[var1]; + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); + var8 = var0[var1]; + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); + var8 = var0[var1]; + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); } } } else { while (true) { - --var3; // L: 939 + --var3; if (var3 < 0) { - var3 = var5 - var4 & 3; // L: 945 + var3 = var5 - var4 & 3; while (true) { - --var3; // L: 946 + --var3; if (var3 < 0) { return; } - var0[var1++] = var2; // L: 947 + var0[var1++] = var2; } } - var0[var1++] = var2; // L: 940 - var0[var1++] = var2; // L: 941 - var0[var1++] = var2; // L: 942 - var0[var1++] = var2; // L: 943 + var0[var1++] = var2; + var0[var1++] = var2; + var0[var1++] = var2; + var0[var1++] = var2; } } } @@ -1430,642 +1430,642 @@ public class Rasterizer3D extends Rasterizer2D { @ObfuscatedName("h") static final void method3876(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: 985 + int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); int var20; - if (var19 == null) { // L: 986 - var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); // L: 987 - method3854(var0, var1, var2, var3, var4, var5, method3862(var20, var6), method3862(var20, var7), method3862(var20, var8)); // L: 988 + if (var19 == null) { + var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); + method3854(var0, var1, var2, var3, var4, var5, method3862(var20, var6), method3862(var20, var7), method3862(var20, var8)); } else { - Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); // L: 991 - field2251 = Rasterizer3D_textureLoader.vmethod4324(var18); // L: 992 - var20 = var4 - var3; // L: 993 - int var21 = var1 - var0; // L: 994 - int var22 = var5 - var3; // L: 995 - int var23 = var2 - var0; // L: 996 - int var24 = var7 - var6; // L: 997 - int var25 = var8 - var6; // L: 998 - int var26 = 0; // L: 999 - if (var0 != var1) { // L: 1000 + Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); + field2251 = Rasterizer3D_textureLoader.vmethod4324(var18); + var20 = var4 - var3; + int var21 = var1 - var0; + int var22 = var5 - var3; + int var23 = var2 - var0; + int var24 = var7 - var6; + int var25 = var8 - var6; + int var26 = 0; + if (var0 != var1) { var26 = (var4 - var3 << 14) / (var1 - var0); } - int var27 = 0; // L: 1001 - if (var2 != var1) { // L: 1002 + int var27 = 0; + if (var2 != var1) { var27 = (var5 - var4 << 14) / (var2 - var1); } - int var28 = 0; // L: 1003 - if (var0 != var2) { // L: 1004 + int var28 = 0; + if (var0 != var2) { var28 = (var3 - var5 << 14) / (var0 - var2); } - int var29 = var20 * var23 - var22 * var21; // L: 1005 - if (var29 != 0) { // L: 1006 - int var30 = (var24 * var23 - var25 * var21 << 9) / var29; // L: 1007 - int var31 = (var25 * var20 - var24 * var22 << 9) / var29; // L: 1008 - var10 = var9 - var10; // L: 1009 - var13 = var12 - var13; // L: 1010 - var16 = var15 - var16; // L: 1011 - var11 -= var9; // L: 1012 - var14 -= var12; // L: 1013 - var17 -= var15; // L: 1014 - int var32 = var11 * var12 - var9 * var14 << 14; // L: 1015 - int var33 = (int)(((long)(var15 * var14 - var17 * var12) << 3 << 14) / (long)Rasterizer3D_zoom); // L: 1016 - int var34 = (int)(((long)(var17 * var9 - var11 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1017 - int var35 = var10 * var12 - var13 * var9 << 14; // L: 1018 - int var36 = (int)(((long)(var13 * var15 - var16 * var12) << 3 << 14) / (long)Rasterizer3D_zoom); // L: 1019 - int var37 = (int)(((long)(var16 * var9 - var10 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1020 - int var38 = var13 * var11 - var10 * var14 << 14; // L: 1021 - int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 3 << 14) / (long)Rasterizer3D_zoom); // L: 1022 - int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); // L: 1023 + int var29 = var20 * var23 - var22 * var21; + if (var29 != 0) { + int var30 = (var24 * var23 - var25 * var21 << 9) / var29; + int var31 = (var25 * var20 - var24 * var22 << 9) / var29; + var10 = var9 - var10; + var13 = var12 - var13; + var16 = var15 - var16; + var11 -= var9; + var14 -= var12; + var17 -= var15; + int var32 = var11 * var12 - var9 * var14 << 14; + int var33 = (int)(((long)(var15 * var14 - var17 * var12) << 3 << 14) / (long)Rasterizer3D_zoom); + int var34 = (int)(((long)(var17 * var9 - var11 * var15) << 14) / (long)Rasterizer3D_zoom); + int var35 = var10 * var12 - var13 * var9 << 14; + int var36 = (int)(((long)(var13 * var15 - var16 * var12) << 3 << 14) / (long)Rasterizer3D_zoom); + int var37 = (int)(((long)(var16 * var9 - var10 * var15) << 14) / (long)Rasterizer3D_zoom); + int var38 = var13 * var11 - var10 * var14 << 14; + int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 3 << 14) / (long)Rasterizer3D_zoom); + int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); int var41; - if (var0 <= var1 && var0 <= var2) { // L: 1024 - if (var0 < Rasterizer3D_clipHeight) { // L: 1025 - if (var1 > Rasterizer3D_clipHeight) { // L: 1026 + if (var0 <= var1 && var0 <= var2) { + if (var0 < Rasterizer3D_clipHeight) { + if (var1 > Rasterizer3D_clipHeight) { var1 = Rasterizer3D_clipHeight; } - if (var2 > Rasterizer3D_clipHeight) { // L: 1027 + if (var2 > Rasterizer3D_clipHeight) { var2 = Rasterizer3D_clipHeight; } - var6 = var30 + ((var6 << 9) - var3 * var30); // L: 1028 - if (var1 < var2) { // L: 1029 - var5 = var3 <<= 14; // L: 1030 - if (var0 < 0) { // L: 1031 - var5 -= var0 * var28; // L: 1032 - var3 -= var0 * var26; // L: 1033 - var6 -= var0 * var31; // L: 1034 - var0 = 0; // L: 1035 + var6 = var30 + ((var6 << 9) - var3 * var30); + if (var1 < var2) { + var5 = var3 <<= 14; + if (var0 < 0) { + var5 -= var0 * var28; + var3 -= var0 * var26; + var6 -= var0 * var31; + var0 = 0; } - var4 <<= 14; // L: 1037 - if (var1 < 0) { // L: 1038 - var4 -= var27 * var1; // L: 1039 - var1 = 0; // L: 1040 + var4 <<= 14; + if (var1 < 0) { + var4 -= var27 * var1; + var1 = 0; } - var41 = var0 - Rasterizer3D_clipMidY; // L: 1042 - var32 += var34 * var41; // L: 1043 - var35 += var37 * var41; // L: 1044 - var38 += var40 * var41; // L: 1045 - if ((var0 == var1 || var28 >= var26) && (var0 != var1 || var28 <= var27)) { // L: 1046 - var2 -= var1; // L: 1073 - var1 -= var0; // L: 1074 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1075 + var41 = var0 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if ((var0 == var1 || var28 >= var26) && (var0 != var1 || var28 <= var27)) { + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; while (true) { - --var1; // L: 1076 + --var1; if (var1 < 0) { while (true) { - --var2; // L: 1086 + --var2; if (var2 < 0) { - return; // L: 1096 + return; } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1087 - var5 += var28; // L: 1088 - var4 += var27; // L: 1089 - var6 += var31; // L: 1090 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1091 - var32 += var34; // L: 1092 - var35 += var37; // L: 1093 - var38 += var40; // L: 1094 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var4 += var27; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1077 - var5 += var28; // L: 1078 - var3 += var26; // L: 1079 - var6 += var31; // L: 1080 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1081 - var32 += var34; // L: 1082 - var35 += var37; // L: 1083 - var38 += var40; // L: 1084 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } else { - var2 -= var1; // L: 1047 - var1 -= var0; // L: 1048 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1049 + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; while (true) { - --var1; // L: 1050 + --var1; if (var1 < 0) { while (true) { - --var2; // L: 1060 + --var2; if (var2 < 0) { - return; // L: 1070 + return; } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1061 - var5 += var28; // L: 1062 - var4 += var27; // L: 1063 - var6 += var31; // L: 1064 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1065 - var32 += var34; // L: 1066 - var35 += var37; // L: 1067 - var38 += var40; // L: 1068 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var4 += var27; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1051 - var5 += var28; // L: 1052 - var3 += var26; // L: 1053 - var6 += var31; // L: 1054 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1055 - var32 += var34; // L: 1056 - var35 += var37; // L: 1057 - var38 += var40; // L: 1058 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } } else { - var4 = var3 <<= 14; // L: 1100 - if (var0 < 0) { // L: 1101 - var4 -= var0 * var28; // L: 1102 - var3 -= var0 * var26; // L: 1103 - var6 -= var0 * var31; // L: 1104 - var0 = 0; // L: 1105 + var4 = var3 <<= 14; + if (var0 < 0) { + var4 -= var0 * var28; + var3 -= var0 * var26; + var6 -= var0 * var31; + var0 = 0; } - var5 <<= 14; // L: 1107 - if (var2 < 0) { // L: 1108 - var5 -= var27 * var2; // L: 1109 - var2 = 0; // L: 1110 + var5 <<= 14; + if (var2 < 0) { + var5 -= var27 * var2; + var2 = 0; } - var41 = var0 - Rasterizer3D_clipMidY; // L: 1112 - var32 += var34 * var41; // L: 1113 - var35 += var37 * var41; // L: 1114 - var38 += var40 * var41; // L: 1115 - if ((var0 == var2 || var28 >= var26) && (var0 != var2 || var27 <= var26)) { // L: 1116 - var1 -= var2; // L: 1143 - var2 -= var0; // L: 1144 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1145 + var41 = var0 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if ((var0 == var2 || var28 >= var26) && (var0 != var2 || var27 <= var26)) { + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; while (true) { - --var2; // L: 1146 + --var2; if (var2 < 0) { while (true) { - --var1; // L: 1156 + --var1; if (var1 < 0) { - return; // L: 1166 + return; } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1157 - var5 += var27; // L: 1158 - var3 += var26; // L: 1159 - var6 += var31; // L: 1160 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1161 - var32 += var34; // L: 1162 - var35 += var37; // L: 1163 - var38 += var40; // L: 1164 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var27; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1147 - var4 += var28; // L: 1148 - var3 += var26; // L: 1149 - var6 += var31; // L: 1150 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1151 - var32 += var34; // L: 1152 - var35 += var37; // L: 1153 - var38 += var40; // L: 1154 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var4 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } else { - var1 -= var2; // L: 1117 - var2 -= var0; // L: 1118 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1119 + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; while (true) { - --var2; // L: 1120 + --var2; if (var2 < 0) { while (true) { - --var1; // L: 1130 + --var1; if (var1 < 0) { - return; // L: 1140 + return; } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1131 - var5 += var27; // L: 1132 - var3 += var26; // L: 1133 - var6 += var31; // L: 1134 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1135 - var32 += var34; // L: 1136 - var35 += var37; // L: 1137 - var38 += var40; // L: 1138 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var27; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1121 - var4 += var28; // L: 1122 - var3 += var26; // L: 1123 - var6 += var31; // L: 1124 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1125 - var32 += var34; // L: 1126 - var35 += var37; // L: 1127 - var38 += var40; // L: 1128 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var4 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } } } - } else if (var1 <= var2) { // L: 1170 - if (var1 < Rasterizer3D_clipHeight) { // L: 1171 - if (var2 > Rasterizer3D_clipHeight) { // L: 1172 + } else if (var1 <= var2) { + if (var1 < Rasterizer3D_clipHeight) { + if (var2 > Rasterizer3D_clipHeight) { var2 = Rasterizer3D_clipHeight; } - if (var0 > Rasterizer3D_clipHeight) { // L: 1173 + if (var0 > Rasterizer3D_clipHeight) { var0 = Rasterizer3D_clipHeight; } - var7 = var30 + ((var7 << 9) - var30 * var4); // L: 1174 - if (var2 < var0) { // L: 1175 - var3 = var4 <<= 14; // L: 1176 - if (var1 < 0) { // L: 1177 - var3 -= var26 * var1; // L: 1178 - var4 -= var27 * var1; // L: 1179 - var7 -= var31 * var1; // L: 1180 - var1 = 0; // L: 1181 + var7 = var30 + ((var7 << 9) - var30 * var4); + if (var2 < var0) { + var3 = var4 <<= 14; + if (var1 < 0) { + var3 -= var26 * var1; + var4 -= var27 * var1; + var7 -= var31 * var1; + var1 = 0; } - var5 <<= 14; // L: 1183 - if (var2 < 0) { // L: 1184 - var5 -= var28 * var2; // L: 1185 - var2 = 0; // L: 1186 + var5 <<= 14; + if (var2 < 0) { + var5 -= var28 * var2; + var2 = 0; } - var41 = var1 - Rasterizer3D_clipMidY; // L: 1188 - var32 += var34 * var41; // L: 1189 - var35 += var37 * var41; // L: 1190 - var38 += var40 * var41; // L: 1191 - if (var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) { // L: 1192 - var0 -= var2; // L: 1193 - var2 -= var1; // L: 1194 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 1195 + var41 = var1 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) { + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; while (true) { - --var2; // L: 1196 + --var2; if (var2 < 0) { while (true) { - --var0; // L: 1206 + --var0; if (var0 < 0) { - return; // L: 1216 + return; } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1207 - var3 += var26; // L: 1208 - var5 += var28; // L: 1209 - var7 += var31; // L: 1210 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1211 - var32 += var34; // L: 1212 - var35 += var37; // L: 1213 - var38 += var40; // L: 1214 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var26; + var5 += var28; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1197 - var3 += var26; // L: 1198 - var4 += var27; // L: 1199 - var7 += var31; // L: 1200 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1201 - var32 += var34; // L: 1202 - var35 += var37; // L: 1203 - var38 += var40; // L: 1204 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } else { - var0 -= var2; // L: 1219 - var2 -= var1; // L: 1220 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 1221 + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; while (true) { - --var2; // L: 1222 + --var2; if (var2 < 0) { while (true) { - --var0; // L: 1232 + --var0; if (var0 < 0) { - return; // L: 1242 + return; } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1233 - var3 += var26; // L: 1234 - var5 += var28; // L: 1235 - var7 += var31; // L: 1236 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1237 - var32 += var34; // L: 1238 - var35 += var37; // L: 1239 - var38 += var40; // L: 1240 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var26; + var5 += var28; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1223 - var3 += var26; // L: 1224 - var4 += var27; // L: 1225 - var7 += var31; // L: 1226 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1227 - var32 += var34; // L: 1228 - var35 += var37; // L: 1229 - var38 += var40; // L: 1230 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } } else { - var5 = var4 <<= 14; // L: 1246 - if (var1 < 0) { // L: 1247 - var5 -= var26 * var1; // L: 1248 - var4 -= var27 * var1; // L: 1249 - var7 -= var31 * var1; // L: 1250 - var1 = 0; // L: 1251 + var5 = var4 <<= 14; + if (var1 < 0) { + var5 -= var26 * var1; + var4 -= var27 * var1; + var7 -= var31 * var1; + var1 = 0; } - var3 <<= 14; // L: 1253 - if (var0 < 0) { // L: 1254 - var3 -= var0 * var28; // L: 1255 - var0 = 0; // L: 1256 + var3 <<= 14; + if (var0 < 0) { + var3 -= var0 * var28; + var0 = 0; } - var41 = var1 - Rasterizer3D_clipMidY; // L: 1258 - var32 += var34 * var41; // L: 1259 - var35 += var37 * var41; // L: 1260 - var38 += var40 * var41; // L: 1261 - if (var26 < var27) { // L: 1262 - var2 -= var0; // L: 1263 - var0 -= var1; // L: 1264 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 1265 + var41 = var1 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var26 < var27) { + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; while (true) { - --var0; // L: 1266 + --var0; if (var0 < 0) { while (true) { - --var2; // L: 1276 + --var2; if (var2 < 0) { - return; // L: 1286 + return; } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1277 - var3 += var28; // L: 1278 - var4 += var27; // L: 1279 - var7 += var31; // L: 1280 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1281 - var32 += var34; // L: 1282 - var35 += var37; // L: 1283 - var38 += var40; // L: 1284 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var28; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1267 - var5 += var26; // L: 1268 - var4 += var27; // L: 1269 - var7 += var31; // L: 1270 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1271 - var32 += var34; // L: 1272 - var35 += var37; // L: 1273 - var38 += var40; // L: 1274 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var5 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } else { - var2 -= var0; // L: 1289 - var0 -= var1; // L: 1290 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 1291 + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; while (true) { - --var0; // L: 1292 + --var0; if (var0 < 0) { while (true) { - --var2; // L: 1302 + --var2; if (var2 < 0) { - return; // L: 1312 + return; } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1303 - var3 += var28; // L: 1304 - var4 += var27; // L: 1305 - var7 += var31; // L: 1306 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1307 - var32 += var34; // L: 1308 - var35 += var37; // L: 1309 - var38 += var40; // L: 1310 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var28; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1293 - var5 += var26; // L: 1294 - var4 += var27; // L: 1295 - var7 += var31; // L: 1296 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1297 - var32 += var34; // L: 1298 - var35 += var37; // L: 1299 - var38 += var40; // L: 1300 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var5 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } } } - } else if (var2 < Rasterizer3D_clipHeight) { // L: 1317 - if (var0 > Rasterizer3D_clipHeight) { // L: 1318 + } else if (var2 < Rasterizer3D_clipHeight) { + if (var0 > Rasterizer3D_clipHeight) { var0 = Rasterizer3D_clipHeight; } - if (var1 > Rasterizer3D_clipHeight) { // L: 1319 + if (var1 > Rasterizer3D_clipHeight) { var1 = Rasterizer3D_clipHeight; } - var8 = (var8 << 9) - var5 * var30 + var30; // L: 1320 - if (var0 < var1) { // L: 1321 - var4 = var5 <<= 14; // L: 1322 - if (var2 < 0) { // L: 1323 - var4 -= var27 * var2; // L: 1324 - var5 -= var28 * var2; // L: 1325 - var8 -= var31 * var2; // L: 1326 - var2 = 0; // L: 1327 + var8 = (var8 << 9) - var5 * var30 + var30; + if (var0 < var1) { + var4 = var5 <<= 14; + if (var2 < 0) { + var4 -= var27 * var2; + var5 -= var28 * var2; + var8 -= var31 * var2; + var2 = 0; } - var3 <<= 14; // L: 1329 - if (var0 < 0) { // L: 1330 - var3 -= var0 * var26; // L: 1331 - var0 = 0; // L: 1332 + var3 <<= 14; + if (var0 < 0) { + var3 -= var0 * var26; + var0 = 0; } - var41 = var2 - Rasterizer3D_clipMidY; // L: 1334 - var32 += var34 * var41; // L: 1335 - var35 += var37 * var41; // L: 1336 - var38 += var40 * var41; // L: 1337 - if (var27 < var28) { // L: 1338 - var1 -= var0; // L: 1339 - var0 -= var2; // L: 1340 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 1341 + var41 = var2 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var27 < var28) { + var1 -= var0; + var0 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; while (true) { - --var0; // L: 1342 + --var0; if (var0 < 0) { while (true) { - --var1; // L: 1352 + --var1; if (var1 < 0) { - return; // L: 1362 + return; } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1353 - var4 += var27; // L: 1354 - var3 += var26; // L: 1355 - var8 += var31; // L: 1356 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 1357 - var32 += var34; // L: 1358 - var35 += var37; // L: 1359 - var38 += var40; // L: 1360 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var27; + var3 += var26; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1343 - var4 += var27; // L: 1344 - var5 += var28; // L: 1345 - var8 += var31; // L: 1346 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 1347 - var32 += var34; // L: 1348 - var35 += var37; // L: 1349 - var38 += var40; // L: 1350 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var27; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } else { - var1 -= var0; // L: 1365 - var0 -= var2; // L: 1366 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 1367 + var1 -= var0; + var0 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; while (true) { - --var0; // L: 1368 + --var0; if (var0 < 0) { while (true) { - --var1; // L: 1378 + --var1; if (var1 < 0) { - return; // L: 1388 + return; } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1379 - var4 += var27; // L: 1380 - var3 += var26; // L: 1381 - var8 += var31; // L: 1382 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 1383 - var32 += var34; // L: 1384 - var35 += var37; // L: 1385 - var38 += var40; // L: 1386 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var27; + var3 += var26; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1369 - var4 += var27; // L: 1370 - var5 += var28; // L: 1371 - var8 += var31; // L: 1372 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 1373 - var32 += var34; // L: 1374 - var35 += var37; // L: 1375 - var38 += var40; // L: 1376 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var27; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } } else { - var3 = var5 <<= 14; // L: 1392 - if (var2 < 0) { // L: 1393 - var3 -= var27 * var2; // L: 1394 - var5 -= var28 * var2; // L: 1395 - var8 -= var31 * var2; // L: 1396 - var2 = 0; // L: 1397 + var3 = var5 <<= 14; + if (var2 < 0) { + var3 -= var27 * var2; + var5 -= var28 * var2; + var8 -= var31 * var2; + var2 = 0; } - var4 <<= 14; // L: 1399 - if (var1 < 0) { // L: 1400 - var4 -= var26 * var1; // L: 1401 - var1 = 0; // L: 1402 + var4 <<= 14; + if (var1 < 0) { + var4 -= var26 * var1; + var1 = 0; } - var41 = var2 - Rasterizer3D_clipMidY; // L: 1404 - var32 += var34 * var41; // L: 1405 - var35 += var37 * var41; // L: 1406 - var38 += var40 * var41; // L: 1407 - if (var27 < var28) { // L: 1408 - var0 -= var1; // L: 1409 - var1 -= var2; // L: 1410 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 1411 + var41 = var2 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var27 < var28) { + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; while (true) { - --var1; // L: 1412 + --var1; if (var1 < 0) { while (true) { - --var0; // L: 1422 + --var0; if (var0 < 0) { - return; // L: 1432 + return; } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1423 - var4 += var26; // L: 1424 - var5 += var28; // L: 1425 - var8 += var31; // L: 1426 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 1427 - var32 += var34; // L: 1428 - var35 += var37; // L: 1429 - var38 += var40; // L: 1430 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var26; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1413 - var3 += var27; // L: 1414 - var5 += var28; // L: 1415 - var8 += var31; // L: 1416 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 1417 - var32 += var34; // L: 1418 - var35 += var37; // L: 1419 - var38 += var40; // L: 1420 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var3 += var27; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } else { - var0 -= var1; // L: 1435 - var1 -= var2; // L: 1436 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 1437 + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; while (true) { - --var1; // L: 1438 + --var1; if (var1 < 0) { while (true) { - --var0; // L: 1448 + --var0; if (var0 < 0) { - return; // L: 1458 + return; } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1449 - var4 += var26; // L: 1450 - var5 += var28; // L: 1451 - var8 += var31; // L: 1452 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 1453 - var32 += var34; // L: 1454 - var35 += var37; // L: 1455 - var38 += var40; // L: 1456 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var26; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1439 - var3 += var27; // L: 1440 - var5 += var28; // L: 1441 - var8 += var31; // L: 1442 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 1443 - var32 += var34; // L: 1444 - var35 += var37; // L: 1445 - var38 += var40; // L: 1446 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var3 += var27; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } } } } } - } // L: 989 + } @ObfuscatedName("g") @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 (field2253) { // L: 1467 - if (var6 > Rasterizer3D_clipWidth) { // L: 1468 + if (field2253) { + if (var6 > Rasterizer3D_clipWidth) { var6 = Rasterizer3D_clipWidth; } - if (var5 < 0) { // L: 1469 + if (var5 < 0) { var5 = 0; } } - if (var5 < var6) { // L: 1471 - var4 += var5; // L: 1472 - var7 += var5 * var8; // L: 1473 - int var17 = var6 - var5; // L: 1474 + if (var5 < var6) { + var4 += var5; + var7 += var5 * var8; + int var17 = var6 - var5; int var15; int var16; int var10000; @@ -2075,1040 +2075,1040 @@ public class Rasterizer3D extends Rasterizer2D { int var21; int var22; int var23; - if (Rasterizer3D_isLowDetailTexture) { // L: 1475 - var23 = var5 - Rasterizer3D_clipMidX; // L: 1481 - var9 += var23 * (var12 >> 3); // L: 1482 - var10 += (var13 >> 3) * var23; // L: 1483 - var11 += var23 * (var14 >> 3); // L: 1484 - var22 = var11 >> 12; // L: 1485 - if (var22 != 0) { // L: 1486 - var18 = var9 / var22; // L: 1487 - var19 = var10 / var22; // L: 1488 - if (var18 < 0) { // L: 1489 + if (Rasterizer3D_isLowDetailTexture) { + var23 = var5 - Rasterizer3D_clipMidX; + var9 += var23 * (var12 >> 3); + var10 += (var13 >> 3) * var23; + var11 += var23 * (var14 >> 3); + var22 = var11 >> 12; + if (var22 != 0) { + var18 = var9 / var22; + var19 = var10 / var22; + if (var18 < 0) { var18 = 0; - } else if (var18 > 4032) { // L: 1490 + } else if (var18 > 4032) { var18 = 4032; } } else { - var18 = 0; // L: 1493 - var19 = 0; // L: 1494 + var18 = 0; + var19 = 0; } - var9 += var12; // L: 1496 - var10 += var13; // L: 1497 - var11 += var14; // L: 1498 - var22 = var11 >> 12; // L: 1499 - if (var22 != 0) { // L: 1500 - var20 = var9 / var22; // L: 1501 - var21 = var10 / var22; // L: 1502 - if (var20 < 0) { // L: 1503 + var9 += var12; + var10 += var13; + var11 += var14; + var22 = var11 >> 12; + if (var22 != 0) { + var20 = var9 / var22; + var21 = var10 / var22; + if (var20 < 0) { var20 = 0; - } else if (var20 > 4032) { // L: 1504 + } else if (var20 > 4032) { var20 = 4032; } } else { - var20 = 0; // L: 1507 - var21 = 0; // L: 1508 + var20 = 0; + var21 = 0; } - var2 = (var18 << 20) + var19; // L: 1510 - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); // L: 1511 - var17 >>= 3; // L: 1512 - var8 <<= 3; // L: 1513 - var15 = var7 >> 8; // L: 1514 - if (field2251) { // L: 1515 - if (var17 > 0) { // L: 1516 + var2 = (var18 << 20) + var19; + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); + var17 >>= 3; + var8 <<= 3; + var15 = var7 >> 8; + if (field2251) { + if (var17 > 0) { do { - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1518 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1519 - var2 += var16; // L: 1520 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1521 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1522 - var2 += var16; // L: 1523 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1524 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1525 - var2 += var16; // L: 1526 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1527 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1528 - var2 += var16; // L: 1529 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1530 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1531 - var2 += var16; // L: 1532 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1533 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1534 - var2 += var16; // L: 1535 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1536 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1537 - var2 += var16; // L: 1538 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1539 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1540 - var10000 = var16 + var2; // L: 1541 - var18 = var20; // L: 1542 - var19 = var21; // L: 1543 - var9 += var12; // L: 1544 - var10 += var13; // L: 1545 - var11 += var14; // L: 1546 - var22 = var11 >> 12; // L: 1547 - if (var22 != 0) { // L: 1548 - var20 = var9 / var22; // L: 1549 - var21 = var10 / var22; // L: 1550 - if (var20 < 0) { // L: 1551 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var10000 = var16 + var2; + var18 = var20; + var19 = var21; + var9 += var12; + var10 += var13; + var11 += var14; + var22 = var11 >> 12; + if (var22 != 0) { + var20 = var9 / var22; + var21 = var10 / var22; + if (var20 < 0) { var20 = 0; - } else if (var20 > 4032) { // L: 1552 + } else if (var20 > 4032) { var20 = 4032; } } else { - var20 = 0; // L: 1555 - var21 = 0; // L: 1556 + var20 = 0; + var21 = 0; } - var2 = (var18 << 20) + var19; // L: 1558 - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); // L: 1559 - var7 += var8; // L: 1560 - var15 = var7 >> 8; // L: 1561 - --var17; // L: 1562 + var2 = (var18 << 20) + var19; + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); + var7 += var8; + var15 = var7 >> 8; + --var17; } while(var17 > 0); } - var17 = var6 - var5 & 7; // L: 1564 - if (var17 > 0) { // L: 1565 + var17 = var6 - var5 & 7; + if (var17 > 0) { do { - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1567 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1568 - var2 += var16; // L: 1569 - --var17; // L: 1570 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + --var17; } while(var17 > 0); } } else { - if (var17 > 0) { // L: 1574 + if (var17 > 0) { do { - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1576 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1577 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1579 - var2 += var16; // L: 1580 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1581 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1582 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1584 - var2 += var16; // L: 1585 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1586 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1587 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1589 - var2 += var16; // L: 1590 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1591 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1592 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1594 - var2 += var16; // L: 1595 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1596 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1597 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1599 - var2 += var16; // L: 1600 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1601 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1602 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1604 - var2 += var16; // L: 1605 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1606 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1607 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1609 - var2 += var16; // L: 1610 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1611 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1612 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1614 - var10000 = var16 + var2; // L: 1615 - var18 = var20; // L: 1616 - var19 = var21; // L: 1617 - var9 += var12; // L: 1618 - var10 += var13; // L: 1619 - var11 += var14; // L: 1620 - var22 = var11 >> 12; // L: 1621 - if (var22 != 0) { // L: 1622 - var20 = var9 / var22; // L: 1623 - var21 = var10 / var22; // L: 1624 - if (var20 < 0) { // L: 1625 + ++var4; + var10000 = var16 + var2; + var18 = var20; + var19 = var21; + var9 += var12; + var10 += var13; + var11 += var14; + var22 = var11 >> 12; + if (var22 != 0) { + var20 = var9 / var22; + var21 = var10 / var22; + if (var20 < 0) { var20 = 0; - } else if (var20 > 4032) { // L: 1626 + } else if (var20 > 4032) { var20 = 4032; } } else { - var20 = 0; // L: 1629 - var21 = 0; // L: 1630 + var20 = 0; + var21 = 0; } - var2 = (var18 << 20) + var19; // L: 1632 - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); // L: 1633 - var7 += var8; // L: 1634 - var15 = var7 >> 8; // L: 1635 - --var17; // L: 1636 + var2 = (var18 << 20) + var19; + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); + var7 += var8; + var15 = var7 >> 8; + --var17; } while(var17 > 0); } - var17 = var6 - var5 & 7; // L: 1638 - if (var17 > 0) { // L: 1639 + var17 = var6 - var5 & 7; + if (var17 > 0) { do { - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1641 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1642 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1644 - var2 += var16; // L: 1645 - --var17; // L: 1646 + ++var4; + var2 += var16; + --var17; } while(var17 > 0); } } } else { - var23 = var5 - Rasterizer3D_clipMidX; // L: 1656 - var9 += var23 * (var12 >> 3); // L: 1657 - var10 += (var13 >> 3) * var23; // L: 1658 - var11 += var23 * (var14 >> 3); // L: 1659 - var22 = var11 >> 14; // L: 1660 - if (var22 != 0) { // L: 1661 - var18 = var9 / var22; // L: 1662 - var19 = var10 / var22; // L: 1663 - if (var18 < 0) { // L: 1664 + var23 = var5 - Rasterizer3D_clipMidX; + var9 += var23 * (var12 >> 3); + var10 += (var13 >> 3) * var23; + var11 += var23 * (var14 >> 3); + var22 = var11 >> 14; + if (var22 != 0) { + var18 = var9 / var22; + var19 = var10 / var22; + if (var18 < 0) { var18 = 0; - } else if (var18 > 16256) { // L: 1665 + } else if (var18 > 16256) { var18 = 16256; } } else { - var18 = 0; // L: 1668 - var19 = 0; // L: 1669 + var18 = 0; + var19 = 0; } - var9 += var12; // L: 1671 - var10 += var13; // L: 1672 - var11 += var14; // L: 1673 - var22 = var11 >> 14; // L: 1674 - if (var22 != 0) { // L: 1675 - var20 = var9 / var22; // L: 1676 - var21 = var10 / var22; // L: 1677 - if (var20 < 0) { // L: 1678 + var9 += var12; + var10 += var13; + var11 += var14; + var22 = var11 >> 14; + if (var22 != 0) { + var20 = var9 / var22; + var21 = var10 / var22; + if (var20 < 0) { var20 = 0; - } else if (var20 > 16256) { // L: 1679 + } else if (var20 > 16256) { var20 = 16256; } } else { - var20 = 0; // L: 1682 - var21 = 0; // L: 1683 + var20 = 0; + var21 = 0; } - var2 = (var18 << 18) + var19; // L: 1685 - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); // L: 1686 - var17 >>= 3; // L: 1687 - var8 <<= 3; // L: 1688 - var15 = var7 >> 8; // L: 1689 - if (field2251) { // L: 1690 - if (var17 > 0) { // L: 1691 + var2 = (var18 << 18) + var19; + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); + var17 >>= 3; + var8 <<= 3; + var15 = var7 >> 8; + if (field2251) { + if (var17 > 0) { do { - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1693 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1694 - var2 += var16; // L: 1695 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1696 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1697 - var2 += var16; // L: 1698 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1699 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1700 - var2 += var16; // L: 1701 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1702 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1703 - var2 += var16; // L: 1704 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1705 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1706 - var2 += var16; // L: 1707 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1708 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1709 - var2 += var16; // L: 1710 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1711 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1712 - var2 += var16; // L: 1713 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1714 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1715 - var10000 = var16 + var2; // L: 1716 - var18 = var20; // L: 1717 - var19 = var21; // L: 1718 - var9 += var12; // L: 1719 - var10 += var13; // L: 1720 - var11 += var14; // L: 1721 - var22 = var11 >> 14; // L: 1722 - if (var22 != 0) { // L: 1723 - var20 = var9 / var22; // L: 1724 - var21 = var10 / var22; // L: 1725 - if (var20 < 0) { // L: 1726 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var10000 = var16 + var2; + var18 = var20; + var19 = var21; + var9 += var12; + var10 += var13; + var11 += var14; + var22 = var11 >> 14; + if (var22 != 0) { + var20 = var9 / var22; + var21 = var10 / var22; + if (var20 < 0) { var20 = 0; - } else if (var20 > 16256) { // L: 1727 + } else if (var20 > 16256) { var20 = 16256; } } else { - var20 = 0; // L: 1730 - var21 = 0; // L: 1731 + var20 = 0; + var21 = 0; } - var2 = (var18 << 18) + var19; // L: 1733 - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); // L: 1734 - var7 += var8; // L: 1735 - var15 = var7 >> 8; // L: 1736 - --var17; // L: 1737 + var2 = (var18 << 18) + var19; + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); + var7 += var8; + var15 = var7 >> 8; + --var17; } while(var17 > 0); } - var17 = var6 - var5 & 7; // L: 1739 - if (var17 > 0) { // L: 1740 + var17 = var6 - var5 & 7; + if (var17 > 0) { do { - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1742 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1743 - var2 += var16; // L: 1744 - --var17; // L: 1745 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + --var17; } while(var17 > 0); } } else { - if (var17 > 0) { // L: 1749 + if (var17 > 0) { do { - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1751 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1752 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1754 - var2 += var16; // L: 1755 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1756 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1757 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1759 - var2 += var16; // L: 1760 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1761 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1762 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1764 - var2 += var16; // L: 1765 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1766 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1767 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1769 - var2 += var16; // L: 1770 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1771 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1772 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1774 - var2 += var16; // L: 1775 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1776 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1777 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1779 - var2 += var16; // L: 1780 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1781 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1782 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1784 - var2 += var16; // L: 1785 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1786 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1787 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1789 - var10000 = var16 + var2; // L: 1790 - var18 = var20; // L: 1791 - var19 = var21; // L: 1792 - var9 += var12; // L: 1793 - var10 += var13; // L: 1794 - var11 += var14; // L: 1795 - var22 = var11 >> 14; // L: 1796 - if (var22 != 0) { // L: 1797 - var20 = var9 / var22; // L: 1798 - var21 = var10 / var22; // L: 1799 - if (var20 < 0) { // L: 1800 + ++var4; + var10000 = var16 + var2; + var18 = var20; + var19 = var21; + var9 += var12; + var10 += var13; + var11 += var14; + var22 = var11 >> 14; + if (var22 != 0) { + var20 = var9 / var22; + var21 = var10 / var22; + if (var20 < 0) { var20 = 0; - } else if (var20 > 16256) { // L: 1801 + } else if (var20 > 16256) { var20 = 16256; } } else { - var20 = 0; // L: 1804 - var21 = 0; // L: 1805 + var20 = 0; + var21 = 0; } - var2 = (var18 << 18) + var19; // L: 1807 - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); // L: 1808 - var7 += var8; // L: 1809 - var15 = var7 >> 8; // L: 1810 - --var17; // L: 1811 + var2 = (var18 << 18) + var19; + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); + var7 += var8; + var15 = var7 >> 8; + --var17; } while(var17 > 0); } - var17 = var6 - var5 & 7; // L: 1813 - if (var17 > 0) { // L: 1814 + var17 = var6 - var5 & 7; + if (var17 > 0) { do { - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1816 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1817 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 1819 - var2 += var16; // L: 1820 - --var17; // L: 1821 + ++var4; + var2 += var16; + --var17; } while(var17 > 0); } } } } - } // L: 1825 + } @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: 1828 + int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); int var20; - if (var19 == null) { // L: 1829 - var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); // L: 1830 - method3854(var0, var1, var2, var3, var4, var5, method3862(var20, var6), method3862(var20, var7), method3862(var20, var8)); // L: 1831 + if (var19 == null) { + var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); + method3854(var0, var1, var2, var3, var4, var5, method3862(var20, var6), method3862(var20, var7), method3862(var20, var8)); } else { - Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); // L: 1834 - field2251 = Rasterizer3D_textureLoader.vmethod4324(var18); // L: 1835 - var20 = var4 - var3; // L: 1836 - int var21 = var1 - var0; // L: 1837 - int var22 = var5 - var3; // L: 1838 - int var23 = var2 - var0; // L: 1839 - int var24 = var7 - var6; // L: 1840 - int var25 = var8 - var6; // L: 1841 - int var26 = 0; // L: 1842 - if (var0 != var1) { // L: 1843 + Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); + field2251 = Rasterizer3D_textureLoader.vmethod4324(var18); + var20 = var4 - var3; + int var21 = var1 - var0; + int var22 = var5 - var3; + int var23 = var2 - var0; + int var24 = var7 - var6; + int var25 = var8 - var6; + int var26 = 0; + if (var0 != var1) { var26 = (var4 - var3 << 14) / (var1 - var0); } - int var27 = 0; // L: 1844 - if (var2 != var1) { // L: 1845 + int var27 = 0; + if (var2 != var1) { var27 = (var5 - var4 << 14) / (var2 - var1); } - int var28 = 0; // L: 1846 - if (var0 != var2) { // L: 1847 + int var28 = 0; + if (var0 != var2) { var28 = (var3 - var5 << 14) / (var0 - var2); } - int var29 = var20 * var23 - var22 * var21; // L: 1848 - if (var29 != 0) { // L: 1849 - int var30 = (var24 * var23 - var25 * var21 << 9) / var29; // L: 1850 - int var31 = (var25 * var20 - var24 * var22 << 9) / var29; // L: 1851 - var10 = var9 - var10; // L: 1852 - var13 = var12 - var13; // L: 1853 - var16 = var15 - var16; // L: 1854 - var11 -= var9; // L: 1855 - var14 -= var12; // L: 1856 - var17 -= var15; // L: 1857 - int var32 = var11 * var12 - var9 * var14 << 14; // L: 1858 - int var33 = (int)(((long)(var15 * var14 - var17 * var12) << 14) / (long)Rasterizer3D_zoom); // L: 1859 - int var34 = (int)(((long)(var17 * var9 - var11 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1860 - int var35 = var10 * var12 - var13 * var9 << 14; // L: 1861 - int var36 = (int)(((long)(var13 * var15 - var16 * var12) << 14) / (long)Rasterizer3D_zoom); // L: 1862 - int var37 = (int)(((long)(var16 * var9 - var10 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1863 - int var38 = var13 * var11 - var10 * var14 << 14; // L: 1864 - int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 14) / (long)Rasterizer3D_zoom); // L: 1865 - int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); // L: 1866 + int var29 = var20 * var23 - var22 * var21; + if (var29 != 0) { + int var30 = (var24 * var23 - var25 * var21 << 9) / var29; + int var31 = (var25 * var20 - var24 * var22 << 9) / var29; + var10 = var9 - var10; + var13 = var12 - var13; + var16 = var15 - var16; + var11 -= var9; + var14 -= var12; + var17 -= var15; + int var32 = var11 * var12 - var9 * var14 << 14; + int var33 = (int)(((long)(var15 * var14 - var17 * var12) << 14) / (long)Rasterizer3D_zoom); + int var34 = (int)(((long)(var17 * var9 - var11 * var15) << 14) / (long)Rasterizer3D_zoom); + int var35 = var10 * var12 - var13 * var9 << 14; + int var36 = (int)(((long)(var13 * var15 - var16 * var12) << 14) / (long)Rasterizer3D_zoom); + int var37 = (int)(((long)(var16 * var9 - var10 * var15) << 14) / (long)Rasterizer3D_zoom); + int var38 = var13 * var11 - var10 * var14 << 14; + int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 14) / (long)Rasterizer3D_zoom); + int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); int var41; - if (var0 <= var1 && var0 <= var2) { // L: 1867 - if (var0 < Rasterizer3D_clipHeight) { // L: 1868 - if (var1 > Rasterizer3D_clipHeight) { // L: 1869 + if (var0 <= var1 && var0 <= var2) { + if (var0 < Rasterizer3D_clipHeight) { + if (var1 > Rasterizer3D_clipHeight) { var1 = Rasterizer3D_clipHeight; } - if (var2 > Rasterizer3D_clipHeight) { // L: 1870 + if (var2 > Rasterizer3D_clipHeight) { var2 = Rasterizer3D_clipHeight; } - var6 = var30 + ((var6 << 9) - var3 * var30); // L: 1871 - if (var1 < var2) { // L: 1872 - var5 = var3 <<= 14; // L: 1873 - if (var0 < 0) { // L: 1874 - var5 -= var0 * var28; // L: 1875 - var3 -= var0 * var26; // L: 1876 - var6 -= var0 * var31; // L: 1877 - var0 = 0; // L: 1878 + var6 = var30 + ((var6 << 9) - var3 * var30); + if (var1 < var2) { + var5 = var3 <<= 14; + if (var0 < 0) { + var5 -= var0 * var28; + var3 -= var0 * var26; + var6 -= var0 * var31; + var0 = 0; } - var4 <<= 14; // L: 1880 - if (var1 < 0) { // L: 1881 - var4 -= var27 * var1; // L: 1882 - var1 = 0; // L: 1883 + var4 <<= 14; + if (var1 < 0) { + var4 -= var27 * var1; + var1 = 0; } - var41 = var0 - Rasterizer3D_clipMidY; // L: 1885 - var32 += var34 * var41; // L: 1886 - var35 += var37 * var41; // L: 1887 - var38 += var40 * var41; // L: 1888 - if ((var0 == var1 || var28 >= var26) && (var0 != var1 || var28 <= var27)) { // L: 1889 - var2 -= var1; // L: 1916 - var1 -= var0; // L: 1917 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1918 + var41 = var0 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if ((var0 == var1 || var28 >= var26) && (var0 != var1 || var28 <= var27)) { + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; while (true) { - --var1; // L: 1919 + --var1; if (var1 < 0) { while (true) { - --var2; // L: 1929 + --var2; if (var2 < 0) { - return; // L: 1939 + return; } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1930 - var5 += var28; // L: 1931 - var4 += var27; // L: 1932 - var6 += var31; // L: 1933 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1934 - var32 += var34; // L: 1935 - var35 += var37; // L: 1936 - var38 += var40; // L: 1937 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var4 += var27; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1920 - var5 += var28; // L: 1921 - var3 += var26; // L: 1922 - var6 += var31; // L: 1923 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1924 - var32 += var34; // L: 1925 - var35 += var37; // L: 1926 - var38 += var40; // L: 1927 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } else { - var2 -= var1; // L: 1890 - var1 -= var0; // L: 1891 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1892 + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; while (true) { - --var1; // L: 1893 + --var1; if (var1 < 0) { while (true) { - --var2; // L: 1903 + --var2; if (var2 < 0) { - return; // L: 1913 + return; } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1904 - var5 += var28; // L: 1905 - var4 += var27; // L: 1906 - var6 += var31; // L: 1907 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1908 - var32 += var34; // L: 1909 - var35 += var37; // L: 1910 - var38 += var40; // L: 1911 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var4 += var27; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1894 - var5 += var28; // L: 1895 - var3 += var26; // L: 1896 - var6 += var31; // L: 1897 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1898 - var32 += var34; // L: 1899 - var35 += var37; // L: 1900 - var38 += var40; // L: 1901 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } } else { - var4 = var3 <<= 14; // L: 1943 - if (var0 < 0) { // L: 1944 - var4 -= var0 * var28; // L: 1945 - var3 -= var0 * var26; // L: 1946 - var6 -= var0 * var31; // L: 1947 - var0 = 0; // L: 1948 + var4 = var3 <<= 14; + if (var0 < 0) { + var4 -= var0 * var28; + var3 -= var0 * var26; + var6 -= var0 * var31; + var0 = 0; } - var5 <<= 14; // L: 1950 - if (var2 < 0) { // L: 1951 - var5 -= var27 * var2; // L: 1952 - var2 = 0; // L: 1953 + var5 <<= 14; + if (var2 < 0) { + var5 -= var27 * var2; + var2 = 0; } - var41 = var0 - Rasterizer3D_clipMidY; // L: 1955 - var32 += var34 * var41; // L: 1956 - var35 += var37 * var41; // L: 1957 - var38 += var40 * var41; // L: 1958 - if ((var0 == var2 || var28 >= var26) && (var0 != var2 || var27 <= var26)) { // L: 1959 - var1 -= var2; // L: 1986 - var2 -= var0; // L: 1987 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1988 + var41 = var0 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if ((var0 == var2 || var28 >= var26) && (var0 != var2 || var27 <= var26)) { + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; while (true) { - --var2; // L: 1989 + --var2; if (var2 < 0) { while (true) { - --var1; // L: 1999 + --var1; if (var1 < 0) { - return; // L: 2009 + return; } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 2000 - var5 += var27; // L: 2001 - var3 += var26; // L: 2002 - var6 += var31; // L: 2003 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 2004 - var32 += var34; // L: 2005 - var35 += var37; // L: 2006 - var38 += var40; // L: 2007 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var27; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1990 - var4 += var28; // L: 1991 - var3 += var26; // L: 1992 - var6 += var31; // L: 1993 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1994 - var32 += var34; // L: 1995 - var35 += var37; // L: 1996 - var38 += var40; // L: 1997 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var4 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } else { - var1 -= var2; // L: 1960 - var2 -= var0; // L: 1961 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1962 + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; while (true) { - --var2; // L: 1963 + --var2; if (var2 < 0) { while (true) { - --var1; // L: 1973 + --var1; if (var1 < 0) { - return; // L: 1983 + return; } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1974 - var5 += var27; // L: 1975 - var3 += var26; // L: 1976 - var6 += var31; // L: 1977 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1978 - var32 += var34; // L: 1979 - var35 += var37; // L: 1980 - var38 += var40; // L: 1981 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var27; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1964 - var4 += var28; // L: 1965 - var3 += var26; // L: 1966 - var6 += var31; // L: 1967 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1968 - var32 += var34; // L: 1969 - var35 += var37; // L: 1970 - var38 += var40; // L: 1971 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var4 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } } } - } else if (var1 <= var2) { // L: 2013 - if (var1 < Rasterizer3D_clipHeight) { // L: 2014 - if (var2 > Rasterizer3D_clipHeight) { // L: 2015 + } else if (var1 <= var2) { + if (var1 < Rasterizer3D_clipHeight) { + if (var2 > Rasterizer3D_clipHeight) { var2 = Rasterizer3D_clipHeight; } - if (var0 > Rasterizer3D_clipHeight) { // L: 2016 + if (var0 > Rasterizer3D_clipHeight) { var0 = Rasterizer3D_clipHeight; } - var7 = var30 + ((var7 << 9) - var30 * var4); // L: 2017 - if (var2 < var0) { // L: 2018 - var3 = var4 <<= 14; // L: 2019 - if (var1 < 0) { // L: 2020 - var3 -= var26 * var1; // L: 2021 - var4 -= var27 * var1; // L: 2022 - var7 -= var31 * var1; // L: 2023 - var1 = 0; // L: 2024 + var7 = var30 + ((var7 << 9) - var30 * var4); + if (var2 < var0) { + var3 = var4 <<= 14; + if (var1 < 0) { + var3 -= var26 * var1; + var4 -= var27 * var1; + var7 -= var31 * var1; + var1 = 0; } - var5 <<= 14; // L: 2026 - if (var2 < 0) { // L: 2027 - var5 -= var28 * var2; // L: 2028 - var2 = 0; // L: 2029 + var5 <<= 14; + if (var2 < 0) { + var5 -= var28 * var2; + var2 = 0; } - var41 = var1 - Rasterizer3D_clipMidY; // L: 2031 - var32 += var34 * var41; // L: 2032 - var35 += var37 * var41; // L: 2033 - var38 += var40 * var41; // L: 2034 - if (var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) { // L: 2035 - var0 -= var2; // L: 2036 - var2 -= var1; // L: 2037 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 2038 + var41 = var1 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) { + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; while (true) { - --var2; // L: 2039 + --var2; if (var2 < 0) { while (true) { - --var0; // L: 2049 + --var0; if (var0 < 0) { - return; // L: 2059 + return; } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2050 - var3 += var26; // L: 2051 - var5 += var28; // L: 2052 - var7 += var31; // L: 2053 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2054 - var32 += var34; // L: 2055 - var35 += var37; // L: 2056 - var38 += var40; // L: 2057 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var26; + var5 += var28; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2040 - var3 += var26; // L: 2041 - var4 += var27; // L: 2042 - var7 += var31; // L: 2043 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2044 - var32 += var34; // L: 2045 - var35 += var37; // L: 2046 - var38 += var40; // L: 2047 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } else { - var0 -= var2; // L: 2062 - var2 -= var1; // L: 2063 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 2064 + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; while (true) { - --var2; // L: 2065 + --var2; if (var2 < 0) { while (true) { - --var0; // L: 2075 + --var0; if (var0 < 0) { - return; // L: 2085 + return; } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2076 - var3 += var26; // L: 2077 - var5 += var28; // L: 2078 - var7 += var31; // L: 2079 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2080 - var32 += var34; // L: 2081 - var35 += var37; // L: 2082 - var38 += var40; // L: 2083 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var26; + var5 += var28; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2066 - var3 += var26; // L: 2067 - var4 += var27; // L: 2068 - var7 += var31; // L: 2069 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2070 - var32 += var34; // L: 2071 - var35 += var37; // L: 2072 - var38 += var40; // L: 2073 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } } else { - var5 = var4 <<= 14; // L: 2089 - if (var1 < 0) { // L: 2090 - var5 -= var26 * var1; // L: 2091 - var4 -= var27 * var1; // L: 2092 - var7 -= var31 * var1; // L: 2093 - var1 = 0; // L: 2094 + var5 = var4 <<= 14; + if (var1 < 0) { + var5 -= var26 * var1; + var4 -= var27 * var1; + var7 -= var31 * var1; + var1 = 0; } - var3 <<= 14; // L: 2096 - if (var0 < 0) { // L: 2097 - var3 -= var0 * var28; // L: 2098 - var0 = 0; // L: 2099 + var3 <<= 14; + if (var0 < 0) { + var3 -= var0 * var28; + var0 = 0; } - var41 = var1 - Rasterizer3D_clipMidY; // L: 2101 - var32 += var34 * var41; // L: 2102 - var35 += var37 * var41; // L: 2103 - var38 += var40 * var41; // L: 2104 - if (var26 < var27) { // L: 2105 - var2 -= var0; // L: 2106 - var0 -= var1; // L: 2107 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 2108 + var41 = var1 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var26 < var27) { + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; while (true) { - --var0; // L: 2109 + --var0; if (var0 < 0) { while (true) { - --var2; // L: 2119 + --var2; if (var2 < 0) { - return; // L: 2129 + return; } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2120 - var3 += var28; // L: 2121 - var4 += var27; // L: 2122 - var7 += var31; // L: 2123 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2124 - var32 += var34; // L: 2125 - var35 += var37; // L: 2126 - var38 += var40; // L: 2127 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var28; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2110 - var5 += var26; // L: 2111 - var4 += var27; // L: 2112 - var7 += var31; // L: 2113 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2114 - var32 += var34; // L: 2115 - var35 += var37; // L: 2116 - var38 += var40; // L: 2117 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var5 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } else { - var2 -= var0; // L: 2132 - var0 -= var1; // L: 2133 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 2134 + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; while (true) { - --var0; // L: 2135 + --var0; if (var0 < 0) { while (true) { - --var2; // L: 2145 + --var2; if (var2 < 0) { - return; // L: 2155 + return; } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2146 - var3 += var28; // L: 2147 - var4 += var27; // L: 2148 - var7 += var31; // L: 2149 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2150 - var32 += var34; // L: 2151 - var35 += var37; // L: 2152 - var38 += var40; // L: 2153 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var28; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2136 - var5 += var26; // L: 2137 - var4 += var27; // L: 2138 - var7 += var31; // L: 2139 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2140 - var32 += var34; // L: 2141 - var35 += var37; // L: 2142 - var38 += var40; // L: 2143 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var5 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } } } - } else if (var2 < Rasterizer3D_clipHeight) { // L: 2160 - if (var0 > Rasterizer3D_clipHeight) { // L: 2161 + } else if (var2 < Rasterizer3D_clipHeight) { + if (var0 > Rasterizer3D_clipHeight) { var0 = Rasterizer3D_clipHeight; } - if (var1 > Rasterizer3D_clipHeight) { // L: 2162 + if (var1 > Rasterizer3D_clipHeight) { var1 = Rasterizer3D_clipHeight; } - var8 = (var8 << 9) - var5 * var30 + var30; // L: 2163 - if (var0 < var1) { // L: 2164 - var4 = var5 <<= 14; // L: 2165 - if (var2 < 0) { // L: 2166 - var4 -= var27 * var2; // L: 2167 - var5 -= var28 * var2; // L: 2168 - var8 -= var31 * var2; // L: 2169 - var2 = 0; // L: 2170 + var8 = (var8 << 9) - var5 * var30 + var30; + if (var0 < var1) { + var4 = var5 <<= 14; + if (var2 < 0) { + var4 -= var27 * var2; + var5 -= var28 * var2; + var8 -= var31 * var2; + var2 = 0; } - var3 <<= 14; // L: 2172 - if (var0 < 0) { // L: 2173 - var3 -= var0 * var26; // L: 2174 - var0 = 0; // L: 2175 + var3 <<= 14; + if (var0 < 0) { + var3 -= var0 * var26; + var0 = 0; } - var41 = var2 - Rasterizer3D_clipMidY; // L: 2177 - var32 += var34 * var41; // L: 2178 - var35 += var37 * var41; // L: 2179 - var38 += var40 * var41; // L: 2180 - if (var27 < var28) { // L: 2181 - var1 -= var0; // L: 2182 - var0 -= var2; // L: 2183 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 2184 + var41 = var2 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var27 < var28) { + var1 -= var0; + var0 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; while (true) { - --var0; // L: 2185 + --var0; if (var0 < 0) { while (true) { - --var1; // L: 2195 + --var1; if (var1 < 0) { - return; // L: 2205 + return; } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2196 - var4 += var27; // L: 2197 - var3 += var26; // L: 2198 - var8 += var31; // L: 2199 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 2200 - var32 += var34; // L: 2201 - var35 += var37; // L: 2202 - var38 += var40; // L: 2203 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var27; + var3 += var26; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2186 - var4 += var27; // L: 2187 - var5 += var28; // L: 2188 - var8 += var31; // L: 2189 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 2190 - var32 += var34; // L: 2191 - var35 += var37; // L: 2192 - var38 += var40; // L: 2193 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var27; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } else { - var1 -= var0; // L: 2208 - var0 -= var2; // L: 2209 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 2210 + var1 -= var0; + var0 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; while (true) { - --var0; // L: 2211 + --var0; if (var0 < 0) { while (true) { - --var1; // L: 2221 + --var1; if (var1 < 0) { - return; // L: 2231 + return; } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2222 - var4 += var27; // L: 2223 - var3 += var26; // L: 2224 - var8 += var31; // L: 2225 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 2226 - var32 += var34; // L: 2227 - var35 += var37; // L: 2228 - var38 += var40; // L: 2229 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var27; + var3 += var26; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2212 - var4 += var27; // L: 2213 - var5 += var28; // L: 2214 - var8 += var31; // L: 2215 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 2216 - var32 += var34; // L: 2217 - var35 += var37; // L: 2218 - var38 += var40; // L: 2219 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var27; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } } else { - var3 = var5 <<= 14; // L: 2235 - if (var2 < 0) { // L: 2236 - var3 -= var27 * var2; // L: 2237 - var5 -= var28 * var2; // L: 2238 - var8 -= var31 * var2; // L: 2239 - var2 = 0; // L: 2240 + var3 = var5 <<= 14; + if (var2 < 0) { + var3 -= var27 * var2; + var5 -= var28 * var2; + var8 -= var31 * var2; + var2 = 0; } - var4 <<= 14; // L: 2242 - if (var1 < 0) { // L: 2243 - var4 -= var26 * var1; // L: 2244 - var1 = 0; // L: 2245 + var4 <<= 14; + if (var1 < 0) { + var4 -= var26 * var1; + var1 = 0; } - var41 = var2 - Rasterizer3D_clipMidY; // L: 2247 - var32 += var34 * var41; // L: 2248 - var35 += var37 * var41; // L: 2249 - var38 += var40 * var41; // L: 2250 - if (var27 < var28) { // L: 2251 - var0 -= var1; // L: 2252 - var1 -= var2; // L: 2253 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 2254 + var41 = var2 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var27 < var28) { + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; while (true) { - --var1; // L: 2255 + --var1; if (var1 < 0) { while (true) { - --var0; // L: 2265 + --var0; if (var0 < 0) { - return; // L: 2275 + return; } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2266 - var4 += var26; // L: 2267 - var5 += var28; // L: 2268 - var8 += var31; // L: 2269 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 2270 - var32 += var34; // L: 2271 - var35 += var37; // L: 2272 - var38 += var40; // L: 2273 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var26; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2256 - var3 += var27; // L: 2257 - var5 += var28; // L: 2258 - var8 += var31; // L: 2259 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 2260 - var32 += var34; // L: 2261 - var35 += var37; // L: 2262 - var38 += var40; // L: 2263 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var3 += var27; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } else { - var0 -= var1; // L: 2278 - var1 -= var2; // L: 2279 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 2280 + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; while (true) { - --var1; // L: 2281 + --var1; if (var1 < 0) { while (true) { - --var0; // L: 2291 + --var0; if (var0 < 0) { - return; // L: 2301 + return; } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2292 - var4 += var26; // L: 2293 - var5 += var28; // L: 2294 - var8 += var31; // L: 2295 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 2296 - var32 += var34; // L: 2297 - var35 += var37; // L: 2298 - var38 += var40; // L: 2299 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var26; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2282 - var3 += var27; // L: 2283 - var5 += var28; // L: 2284 - var8 += var31; // L: 2285 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 2286 - var32 += var34; // L: 2287 - var35 += var37; // L: 2288 - var38 += var40; // L: 2289 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var3 += var27; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } } } } } - } // L: 1832 + } @ObfuscatedName("a") @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 (field2253) { // L: 2310 - if (var6 > Rasterizer3D_clipWidth) { // L: 2311 + if (field2253) { + if (var6 > Rasterizer3D_clipWidth) { var6 = Rasterizer3D_clipWidth; } - if (var5 < 0) { // L: 2312 + if (var5 < 0) { var5 = 0; } } - if (var5 < var6) { // L: 2314 - var4 += var5; // L: 2315 - var7 += var5 * var8; // L: 2316 - int var17 = var6 - var5; // L: 2317 + if (var5 < var6) { + var4 += var5; + var7 += var5 * var8; + int var17 = var6 - var5; int var15; int var16; int var18; @@ -3117,336 +3117,336 @@ public class Rasterizer3D extends Rasterizer2D { int var21; int var22; int var23; - if (Rasterizer3D_isLowDetailTexture) { // L: 2318 - var23 = var5 - Rasterizer3D_clipMidX; // L: 2325 - var9 += var23 * var12; // L: 2326 - var10 += var13 * var23; // L: 2327 - var11 += var23 * var14; // L: 2328 - var22 = var11 >> 12; // L: 2329 - if (var22 != 0) { // L: 2330 - var18 = var9 / var22; // L: 2331 - var19 = var10 / var22; // L: 2332 + if (Rasterizer3D_isLowDetailTexture) { + var23 = var5 - Rasterizer3D_clipMidX; + var9 += var23 * var12; + var10 += var13 * var23; + var11 += var23 * var14; + var22 = var11 >> 12; + if (var22 != 0) { + var18 = var9 / var22; + var19 = var10 / var22; } else { - var18 = 0; // L: 2335 - var19 = 0; // L: 2336 + var18 = 0; + var19 = 0; } - var9 += var17 * var12; // L: 2338 - var10 += var13 * var17; // L: 2339 - var11 += var17 * var14; // L: 2340 - var22 = var11 >> 12; // L: 2341 - if (var22 != 0) { // L: 2342 - var20 = var9 / var22; // L: 2343 - var21 = var10 / var22; // L: 2344 + var9 += var17 * var12; + var10 += var13 * var17; + var11 += var17 * var14; + var22 = var11 >> 12; + if (var22 != 0) { + var20 = var9 / var22; + var21 = var10 / var22; } else { - var20 = 0; // L: 2347 - var21 = 0; // L: 2348 + var20 = 0; + var21 = 0; } - var2 = (var18 << 20) + var19; // L: 2350 - var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 20); // L: 2351 - var17 >>= 3; // L: 2352 - var8 <<= 3; // L: 2353 - var15 = var7 >> 8; // L: 2354 - if (field2251) { // L: 2356 - if (var17 > 0) { // L: 2357 + var2 = (var18 << 20) + var19; + var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 20); + var17 >>= 3; + var8 <<= 3; + var15 = var7 >> 8; + if (field2251) { + if (var17 > 0) { do { - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2359 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2360 - var2 += var16; // L: 2361 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2362 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2363 - var2 += var16; // L: 2364 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2365 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2366 - var2 += var16; // L: 2367 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2368 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2369 - var2 += var16; // L: 2370 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2371 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2372 - var2 += var16; // L: 2373 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2374 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2375 - var2 += var16; // L: 2376 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2377 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2378 - var2 += var16; // L: 2379 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2380 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2381 - var2 += var16; // L: 2382 - var7 += var8; // L: 2383 - var15 = var7 >> 8; // L: 2384 - --var17; // L: 2385 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var7 += var8; + var15 = var7 >> 8; + --var17; } while(var17 > 0); } - var17 = var6 - var5 & 7; // L: 2387 - if (var17 > 0) { // L: 2388 + var17 = var6 - var5 & 7; + if (var17 > 0) { do { - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2390 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2391 - var2 += var16; // L: 2392 - --var17; // L: 2393 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + --var17; } while(var17 > 0); } } else { - if (var17 > 0) { // L: 2397 + if (var17 > 0) { do { - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2399 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2400 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2402 - var2 += var16; // L: 2403 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2404 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2405 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2407 - var2 += var16; // L: 2408 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2409 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2410 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2412 - var2 += var16; // L: 2413 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2414 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2415 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2417 - var2 += var16; // L: 2418 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2419 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2420 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2422 - var2 += var16; // L: 2423 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2424 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2425 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2427 - var2 += var16; // L: 2428 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2429 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2430 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2432 - var2 += var16; // L: 2433 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2434 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2435 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2437 - var2 += var16; // L: 2438 - var7 += var8; // L: 2439 - var15 = var7 >> 8; // L: 2440 - --var17; // L: 2441 + ++var4; + var2 += var16; + var7 += var8; + var15 = var7 >> 8; + --var17; } while(var17 > 0); } - var17 = var6 - var5 & 7; // L: 2443 - if (var17 > 0) { // L: 2444 + var17 = var6 - var5 & 7; + if (var17 > 0) { do { - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2446 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2447 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2449 - var2 += var16; // L: 2450 - --var17; // L: 2451 + ++var4; + var2 += var16; + --var17; } while(var17 > 0); } } } else { - var23 = var5 - Rasterizer3D_clipMidX; // L: 2462 - var9 += var23 * var12; // L: 2463 - var10 += var13 * var23; // L: 2464 - var11 += var23 * var14; // L: 2465 - var22 = var11 >> 14; // L: 2466 - if (var22 != 0) { // L: 2467 - var18 = var9 / var22; // L: 2468 - var19 = var10 / var22; // L: 2469 + var23 = var5 - Rasterizer3D_clipMidX; + var9 += var23 * var12; + var10 += var13 * var23; + var11 += var23 * var14; + var22 = var11 >> 14; + if (var22 != 0) { + var18 = var9 / var22; + var19 = var10 / var22; } else { - var18 = 0; // L: 2472 - var19 = 0; // L: 2473 + var18 = 0; + var19 = 0; } - var9 += var17 * var12; // L: 2475 - var10 += var13 * var17; // L: 2476 - var11 += var17 * var14; // L: 2477 - var22 = var11 >> 14; // L: 2478 - if (var22 != 0) { // L: 2479 - var20 = var9 / var22; // L: 2480 - var21 = var10 / var22; // L: 2481 + var9 += var17 * var12; + var10 += var13 * var17; + var11 += var17 * var14; + var22 = var11 >> 14; + if (var22 != 0) { + var20 = var9 / var22; + var21 = var10 / var22; } else { - var20 = 0; // L: 2484 - var21 = 0; // L: 2485 + var20 = 0; + var21 = 0; } - var2 = (var18 << 18) + var19; // L: 2487 - var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 18); // L: 2488 - var17 >>= 3; // L: 2489 - var8 <<= 3; // L: 2490 - var15 = var7 >> 8; // L: 2491 - if (field2251) { // L: 2493 - if (var17 > 0) { // L: 2494 + var2 = (var18 << 18) + var19; + var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 18); + var17 >>= 3; + var8 <<= 3; + var15 = var7 >> 8; + if (field2251) { + if (var17 > 0) { do { - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2496 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2497 - var2 += var16; // L: 2498 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2499 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2500 - var2 += var16; // L: 2501 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2502 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2503 - var2 += var16; // L: 2504 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2505 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2506 - var2 += var16; // L: 2507 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2508 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2509 - var2 += var16; // L: 2510 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2511 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2512 - var2 += var16; // L: 2513 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2514 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2515 - var2 += var16; // L: 2516 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2517 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2518 - var2 += var16; // L: 2519 - var7 += var8; // L: 2520 - var15 = var7 >> 8; // L: 2521 - --var17; // L: 2522 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + var7 += var8; + var15 = var7 >> 8; + --var17; } while(var17 > 0); } - var17 = var6 - var5 & 7; // L: 2524 - if (var17 > 0) { // L: 2525 + var17 = var6 - var5 & 7; + if (var17 > 0) { do { - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2527 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2528 - var2 += var16; // L: 2529 - --var17; // L: 2530 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var16; + --var17; } while(var17 > 0); } } else { - if (var17 > 0) { // L: 2534 + if (var17 > 0) { do { - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2536 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2537 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2539 - var2 += var16; // L: 2540 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2541 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2542 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2544 - var2 += var16; // L: 2545 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2546 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2547 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2549 - var2 += var16; // L: 2550 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2551 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2552 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2554 - var2 += var16; // L: 2555 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2556 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2557 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2559 - var2 += var16; // L: 2560 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2561 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2562 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2564 - var2 += var16; // L: 2565 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2566 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2567 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2569 - var2 += var16; // L: 2570 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2571 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2572 + ++var4; + var2 += var16; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2574 - var2 += var16; // L: 2575 - var7 += var8; // L: 2576 - var15 = var7 >> 8; // L: 2577 - --var17; // L: 2578 + ++var4; + var2 += var16; + var7 += var8; + var15 = var7 >> 8; + --var17; } while(var17 > 0); } - var17 = var6 - var5 & 7; // L: 2580 - if (var17 > 0) { // L: 2581 + var17 = var6 - var5 & 7; + if (var17 > 0) { do { - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2583 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2584 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } - ++var4; // L: 2586 - var2 += var16; // L: 2587 - --var17; // L: 2588 + ++var4; + var2 += var16; + --var17; } while(var17 > 0); } } } } - } // L: 2592 + } @ObfuscatedName("u") static final int method3862(int var0, int var1) { - var1 = (var0 & 127) * var1 >> 7; // L: 2595 - if (var1 < 2) { // L: 2596 + var1 = (var0 & 127) * var1 >> 7; + if (var1 < 2) { var1 = 2; - } else if (var1 > 126) { // L: 2597 + } else if (var1 > 126) { var1 = 126; } - return (var0 & 65408) + var1; // L: 2598 + return (var0 & 65408) + var1; } @ObfuscatedName("k") static final int method3847(int var0, int var1, int var2, int var3) { - return var0 * var2 + var3 * var1 >> 16; // L: 2602 + return var0 * var2 + var3 * var1 >> 16; } @ObfuscatedName("f") static final int method3864(int var0, int var1, int var2, int var3) { - return var2 * var1 - var3 * var0 >> 16; // L: 2606 + return var2 * var1 - var3 * var0 >> 16; } @ObfuscatedName("l") static final int method3859(int var0, int var1, int var2, int var3) { - return var0 * var2 - var3 * var1 >> 16; // L: 2610 + return var0 * var2 - var3 * var1 >> 16; } @ObfuscatedName("q") static final int method3866(int var0, int var1, int var2, int var3) { - return var3 * var0 + var2 * var1 >> 16; // L: 2614 + return var3 * var0 + var2 * var1 >> 16; } @ObfuscatedName("x") static final int method3917(int var0, int var1, int var2, int var3) { - return var0 * var2 + var3 * var1 >> 16; // L: 2618 + return var0 * var2 + var3 * var1 >> 16; } @ObfuscatedName("z") static final int method3868(int var0, int var1, int var2, int var3) { - return var2 * var1 - var3 * var0 >> 16; // L: 2622 + return var2 * var1 - var3 * var0 >> 16; } } diff --git a/runescape-client/src/main/java/RawPcmStream.java b/runescape-client/src/main/java/RawPcmStream.java index b89f7e0b86..1bdb90f247 100644 --- a/runescape-client/src/main/java/RawPcmStream.java +++ b/runescape-client/src/main/java/RawPcmStream.java @@ -44,38 +44,38 @@ public class RawPcmStream extends PcmStream { descriptor = "(Laj;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.field339 = var1.field265; // L: 54 - this.field334 = var2; // L: 55 - this.field331 = var3; // L: 56 - this.field332 = var4; // L: 57 - this.field335 = 0; // L: 58 - this.method841(); // L: 59 - } // L: 60 + super.sound = var1; + this.start = var1.start; + this.end = var1.end; + this.field339 = var1.field265; + this.field334 = var2; + this.field331 = var3; + this.field332 = var4; + this.field335 = 0; + this.method841(); + } @ObfuscatedSignature( descriptor = "(Laj;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.field339 = var1.field265; // L: 42 - this.field334 = var2; // L: 43 - this.field331 = var3; // L: 44 - this.field332 = 8192; // L: 45 - this.field335 = 0; // L: 46 - this.method841(); // L: 47 - } // L: 48 + super.sound = var1; + this.start = var1.start; + this.end = var1.end; + this.field339 = var1.field265; + this.field334 = var2; + this.field331 = var3; + this.field332 = 8192; + this.field335 = 0; + this.method841(); + } @ObfuscatedName("t") void method841() { - this.field333 = this.field331; // L: 73 - this.field340 = method967(this.field331, this.field332); // L: 74 - this.field336 = method836(this.field331, this.field332); // L: 75 - } // L: 76 + this.field333 = this.field331; + this.field340 = method967(this.field331, this.field332); + this.field336 = method836(this.field331, this.field332); + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -83,7 +83,7 @@ public class RawPcmStream extends PcmStream { ) @Export("firstSubStream") protected PcmStream firstSubStream() { - return null; // L: 200 + return null; } @ObfuscatedName("j") @@ -92,423 +92,423 @@ public class RawPcmStream extends PcmStream { ) @Export("nextSubStream") protected PcmStream nextSubStream() { - return null; // L: 204 + return null; } @ObfuscatedName("w") protected int vmethod5260() { - return this.field331 == 0 && this.field329 == 0 ? 0 : 1; // L: 208 209 + return this.field331 == 0 && this.field329 == 0 ? 0 : 1; } @ObfuscatedName("n") @Export("fill") public synchronized void fill(int[] var1, int var2, int var3) { - if (this.field331 == 0 && this.field329 == 0) { // L: 213 - this.skip(var3); // L: 214 + if (this.field331 == 0 && this.field329 == 0) { + this.skip(var3); } else { - RawSound var4 = (RawSound)super.sound; // L: 217 - int var5 = this.start << 8; // L: 218 - int var6 = this.end << 8; // L: 219 - int var7 = var4.samples.length << 8; // L: 220 - int var8 = var6 - var5; // L: 221 - if (var8 <= 0) { // L: 222 + RawSound var4 = (RawSound)super.sound; + int var5 = this.start << 8; + int var6 = this.end << 8; + int var7 = var4.samples.length << 8; + int var8 = var6 - var5; + if (var8 <= 0) { this.numLoops = 0; } - int var9 = var2; // L: 223 - var3 += var2; // L: 224 - if (this.field335 < 0) { // L: 225 - if (this.field334 <= 0) { // L: 226 - this.method850(); // L: 228 - this.remove(); // L: 229 - return; // L: 230 + int var9 = var2; + var3 += var2; + if (this.field335 < 0) { + if (this.field334 <= 0) { + this.method850(); + this.remove(); + return; } this.field335 = 0; } - if (this.field335 >= var7) { // L: 233 - if (this.field334 >= 0) { // L: 234 - this.method850(); // L: 236 - this.remove(); // L: 237 - return; // L: 238 + if (this.field335 >= var7) { + if (this.field334 >= 0) { + this.method850(); + this.remove(); + return; } this.field335 = var7 - 1; } - if (this.numLoops < 0) { // L: 241 - if (this.field339) { // L: 242 - if (this.field334 < 0) { // L: 243 - var9 = this.method864(var1, var2, var5, var3, var4.samples[this.start]); // L: 244 - if (this.field335 >= var5) { // L: 245 + if (this.numLoops < 0) { + if (this.field339) { + if (this.field334 < 0) { + var9 = this.method864(var1, var2, var5, var3, var4.samples[this.start]); + if (this.field335 >= var5) { return; } - this.field335 = var5 + var5 - 1 - this.field335; // L: 246 - this.field334 = -this.field334; // L: 247 + this.field335 = var5 + var5 - 1 - this.field335; + this.field334 = -this.field334; } while (true) { - var9 = this.method889(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 250 - if (this.field335 < var6) { // L: 251 + var9 = this.method889(var1, var9, var6, var3, var4.samples[this.end - 1]); + if (this.field335 < var6) { return; } - this.field335 = var6 + var6 - 1 - this.field335; // L: 252 - this.field334 = -this.field334; // L: 253 - var9 = this.method864(var1, var9, var5, var3, var4.samples[this.start]); // L: 254 - if (this.field335 >= var5) { // L: 255 + this.field335 = var6 + var6 - 1 - this.field335; + this.field334 = -this.field334; + var9 = this.method864(var1, var9, var5, var3, var4.samples[this.start]); + if (this.field335 >= var5) { return; } - this.field335 = var5 + var5 - 1 - this.field335; // L: 256 - this.field334 = -this.field334; // L: 257 + this.field335 = var5 + var5 - 1 - this.field335; + this.field334 = -this.field334; } - } else if (this.field334 < 0) { // L: 260 + } else if (this.field334 < 0) { while (true) { - var9 = this.method864(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 262 - if (this.field335 >= var5) { // L: 263 + var9 = this.method864(var1, var9, var5, var3, var4.samples[this.end - 1]); + if (this.field335 >= var5) { return; } - this.field335 = var6 - 1 - (var6 - 1 - this.field335) % var8; // L: 264 + this.field335 = var6 - 1 - (var6 - 1 - this.field335) % var8; } } else { while (true) { - var9 = this.method889(var1, var9, var6, var3, var4.samples[this.start]); // L: 269 - if (this.field335 < var6) { // L: 270 + var9 = this.method889(var1, var9, var6, var3, var4.samples[this.start]); + if (this.field335 < var6) { return; } - this.field335 = var5 + (this.field335 - var5) % var8; // L: 271 + this.field335 = var5 + (this.field335 - var5) % var8; } } } else { - if (this.numLoops > 0) { // L: 275 - if (this.field339) { // L: 276 + if (this.numLoops > 0) { + if (this.field339) { label127: { - if (this.field334 < 0) { // L: 277 - var9 = this.method864(var1, var2, var5, var3, var4.samples[this.start]); // L: 278 - if (this.field335 >= var5) { // L: 279 + if (this.field334 < 0) { + var9 = this.method864(var1, var2, var5, var3, var4.samples[this.start]); + if (this.field335 >= var5) { return; } - this.field335 = var5 + var5 - 1 - this.field335; // L: 280 - this.field334 = -this.field334; // L: 281 - if (--this.numLoops == 0) { // L: 282 + this.field335 = var5 + var5 - 1 - this.field335; + this.field334 = -this.field334; + if (--this.numLoops == 0) { break label127; } } do { - var9 = this.method889(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 285 - if (this.field335 < var6) { // L: 286 + var9 = this.method889(var1, var9, var6, var3, var4.samples[this.end - 1]); + if (this.field335 < var6) { return; } - this.field335 = var6 + var6 - 1 - this.field335; // L: 287 - this.field334 = -this.field334; // L: 288 - if (--this.numLoops == 0) { // L: 289 + this.field335 = var6 + var6 - 1 - this.field335; + this.field334 = -this.field334; + if (--this.numLoops == 0) { break; } - var9 = this.method864(var1, var9, var5, var3, var4.samples[this.start]); // L: 290 - if (this.field335 >= var5) { // L: 291 + var9 = this.method864(var1, var9, var5, var3, var4.samples[this.start]); + if (this.field335 >= var5) { return; } - this.field335 = var5 + var5 - 1 - this.field335; // L: 292 - this.field334 = -this.field334; // L: 293 - } while(--this.numLoops != 0); // L: 294 + this.field335 = var5 + var5 - 1 - this.field335; + this.field334 = -this.field334; + } while(--this.numLoops != 0); } } else { int var10; - if (this.field334 < 0) { // L: 297 + if (this.field334 < 0) { while (true) { - var9 = this.method864(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 299 - if (this.field335 >= var5) { // L: 300 + var9 = this.method864(var1, var9, var5, var3, var4.samples[this.end - 1]); + if (this.field335 >= var5) { return; } - var10 = (var6 - 1 - this.field335) / var8; // L: 301 - if (var10 >= this.numLoops) { // L: 302 - this.field335 += var8 * this.numLoops; // L: 303 - this.numLoops = 0; // L: 304 - break; // L: 305 + var10 = (var6 - 1 - this.field335) / var8; + if (var10 >= this.numLoops) { + this.field335 += var8 * this.numLoops; + this.numLoops = 0; + break; } - this.field335 += var8 * var10; // L: 307 - this.numLoops -= var10; // L: 308 + this.field335 += var8 * var10; + this.numLoops -= var10; } } else { while (true) { - var9 = this.method889(var1, var9, var6, var3, var4.samples[this.start]); // L: 313 - if (this.field335 < var6) { // L: 314 + var9 = this.method889(var1, var9, var6, var3, var4.samples[this.start]); + if (this.field335 < var6) { return; } - var10 = (this.field335 - var5) / var8; // L: 315 - if (var10 >= this.numLoops) { // L: 316 - this.field335 -= var8 * this.numLoops; // L: 317 - this.numLoops = 0; // L: 318 - break; // L: 319 + var10 = (this.field335 - var5) / var8; + if (var10 >= this.numLoops) { + this.field335 -= var8 * this.numLoops; + this.numLoops = 0; + break; } - this.field335 -= var8 * var10; // L: 321 - this.numLoops -= var10; // L: 322 + this.field335 -= var8 * var10; + this.numLoops -= var10; } } } } - if (this.field334 < 0) { // L: 326 - this.method864(var1, var9, 0, var3, 0); // L: 327 - if (this.field335 < 0) { // L: 328 - this.field335 = -1; // L: 329 - this.method850(); // L: 330 - this.remove(); // L: 331 + if (this.field334 < 0) { + this.method864(var1, var9, 0, var3, 0); + if (this.field335 < 0) { + this.field335 = -1; + this.method850(); + this.remove(); } } else { - this.method889(var1, var9, var7, var3, 0); // L: 335 - if (this.field335 >= var7) { // L: 336 - this.field335 = var7; // L: 337 - this.method850(); // L: 338 - this.remove(); // L: 339 + this.method889(var1, var9, var7, var3, 0); + if (this.field335 >= var7) { + this.field335 = var7; + this.method850(); + this.remove(); } } } } - } // L: 215 342 + } @ObfuscatedName("r") @Export("setNumLoops") public synchronized void setNumLoops(int var1) { - this.numLoops = var1; // L: 79 - } // L: 80 + this.numLoops = var1; + } @ObfuscatedName("o") @Export("skip") public synchronized void skip(int var1) { - if (this.field329 > 0) { // L: 345 - if (var1 >= this.field329) { // L: 346 - if (this.field331 == Integer.MIN_VALUE) { // L: 347 - this.field331 = 0; // L: 348 - this.field336 = 0; // L: 349 - this.field340 = 0; // L: 350 - this.field333 = 0; // L: 351 - this.remove(); // L: 352 - var1 = this.field329; // L: 353 + if (this.field329 > 0) { + if (var1 >= this.field329) { + if (this.field331 == Integer.MIN_VALUE) { + this.field331 = 0; + this.field336 = 0; + this.field340 = 0; + this.field333 = 0; + this.remove(); + var1 = this.field329; } - this.field329 = 0; // L: 355 - this.method841(); // L: 356 + this.field329 = 0; + this.method841(); } else { - this.field333 += this.field341 * var1; // L: 359 - this.field340 += this.field342 * var1; // L: 360 - this.field336 += this.field343 * var1; // L: 361 - this.field329 -= var1; // L: 362 + this.field333 += this.field341 * var1; + this.field340 += this.field342 * var1; + this.field336 += this.field343 * var1; + this.field329 -= var1; } } - RawSound var2 = (RawSound)super.sound; // L: 365 - int var3 = this.start << 8; // L: 366 - int var4 = this.end << 8; // L: 367 - int var5 = var2.samples.length << 8; // L: 368 - int var6 = var4 - var3; // L: 369 - if (var6 <= 0) { // L: 370 + RawSound var2 = (RawSound)super.sound; + int var3 = this.start << 8; + int var4 = this.end << 8; + int var5 = var2.samples.length << 8; + int var6 = var4 - var3; + if (var6 <= 0) { this.numLoops = 0; } - if (this.field335 < 0) { // L: 371 - if (this.field334 <= 0) { // L: 372 - this.method850(); // L: 374 - this.remove(); // L: 375 - return; // L: 376 + if (this.field335 < 0) { + if (this.field334 <= 0) { + this.method850(); + this.remove(); + return; } this.field335 = 0; } - if (this.field335 >= var5) { // L: 379 - if (this.field334 >= 0) { // L: 380 - this.method850(); // L: 382 - this.remove(); // L: 383 - return; // L: 384 + if (this.field335 >= var5) { + if (this.field334 >= 0) { + this.method850(); + this.remove(); + return; } this.field335 = var5 - 1; } - this.field335 += this.field334 * var1; // L: 387 - if (this.numLoops < 0) { // L: 388 - if (!this.field339) { // L: 389 - if (this.field334 < 0) { // L: 404 - if (this.field335 >= var3) { // L: 405 + this.field335 += this.field334 * var1; + if (this.numLoops < 0) { + if (!this.field339) { + if (this.field334 < 0) { + if (this.field335 >= var3) { return; } - this.field335 = var4 - 1 - (var4 - 1 - this.field335) % var6; // L: 406 + this.field335 = var4 - 1 - (var4 - 1 - this.field335) % var6; } else { - if (this.field335 < var4) { // L: 409 + if (this.field335 < var4) { return; } - this.field335 = var3 + (this.field335 - var3) % var6; // L: 410 + this.field335 = var3 + (this.field335 - var3) % var6; } } else { - if (this.field334 < 0) { // L: 390 - if (this.field335 >= var3) { // L: 391 + if (this.field334 < 0) { + if (this.field335 >= var3) { return; } - this.field335 = var3 + var3 - 1 - this.field335; // L: 392 - this.field334 = -this.field334; // L: 393 + this.field335 = var3 + var3 - 1 - this.field335; + this.field334 = -this.field334; } - while (this.field335 >= var4) { // L: 396 - this.field335 = var4 + var4 - 1 - this.field335; // L: 397 - this.field334 = -this.field334; // L: 398 - if (this.field335 >= var3) { // L: 399 + while (this.field335 >= var4) { + this.field335 = var4 + var4 - 1 - this.field335; + this.field334 = -this.field334; + if (this.field335 >= var3) { return; } - this.field335 = var3 + var3 - 1 - this.field335; // L: 400 - this.field334 = -this.field334; // L: 401 + this.field335 = var3 + var3 - 1 - this.field335; + this.field334 = -this.field334; } } } else { - if (this.numLoops > 0) { // L: 414 - if (this.field339) { // L: 415 + if (this.numLoops > 0) { + if (this.field339) { label129: { - if (this.field334 < 0) { // L: 416 - if (this.field335 >= var3) { // L: 417 + if (this.field334 < 0) { + if (this.field335 >= var3) { return; } - this.field335 = var3 + var3 - 1 - this.field335; // L: 418 - this.field334 = -this.field334; // L: 419 - if (--this.numLoops == 0) { // L: 420 + this.field335 = var3 + var3 - 1 - this.field335; + this.field334 = -this.field334; + if (--this.numLoops == 0) { break label129; } } do { - if (this.field335 < var4) { // L: 423 + if (this.field335 < var4) { return; } - this.field335 = var4 + var4 - 1 - this.field335; // L: 424 - this.field334 = -this.field334; // L: 425 - if (--this.numLoops == 0) { // L: 426 + this.field335 = var4 + var4 - 1 - this.field335; + this.field334 = -this.field334; + if (--this.numLoops == 0) { break; } - if (this.field335 >= var3) { // L: 427 + if (this.field335 >= var3) { return; } - this.field335 = var3 + var3 - 1 - this.field335; // L: 428 - this.field334 = -this.field334; // L: 429 - } while(--this.numLoops != 0); // L: 430 + this.field335 = var3 + var3 - 1 - this.field335; + this.field334 = -this.field334; + } while(--this.numLoops != 0); } } else { label161: { int var7; - if (this.field334 < 0) { // L: 433 - if (this.field335 >= var3) { // L: 434 + if (this.field334 < 0) { + if (this.field335 >= var3) { return; } - var7 = (var4 - 1 - this.field335) / var6; // L: 435 - if (var7 >= this.numLoops) { // L: 436 - this.field335 += var6 * this.numLoops; // L: 437 - this.numLoops = 0; // L: 438 - break label161; // L: 439 + var7 = (var4 - 1 - this.field335) / var6; + if (var7 >= this.numLoops) { + this.field335 += var6 * this.numLoops; + this.numLoops = 0; + break label161; } - this.field335 += var6 * var7; // L: 441 - this.numLoops -= var7; // L: 442 + this.field335 += var6 * var7; + this.numLoops -= var7; } else { - if (this.field335 < var4) { // L: 445 + if (this.field335 < var4) { return; } - var7 = (this.field335 - var3) / var6; // L: 446 - if (var7 >= this.numLoops) { // L: 447 - this.field335 -= var6 * this.numLoops; // L: 448 - this.numLoops = 0; // L: 449 - break label161; // L: 450 + var7 = (this.field335 - var3) / var6; + if (var7 >= this.numLoops) { + this.field335 -= var6 * this.numLoops; + this.numLoops = 0; + break label161; } - this.field335 -= var6 * var7; // L: 452 - this.numLoops -= var7; // L: 453 + this.field335 -= var6 * var7; + this.numLoops -= var7; } - return; // L: 455 + return; } } } - if (this.field334 < 0) { // L: 457 - if (this.field335 < 0) { // L: 458 - this.field335 = -1; // L: 459 - this.method850(); // L: 460 - this.remove(); // L: 461 + if (this.field334 < 0) { + if (this.field335 < 0) { + this.field335 = -1; + this.method850(); + this.remove(); } - } else if (this.field335 >= var5) { // L: 465 - this.field335 = var5; // L: 466 - this.method850(); // L: 467 - this.remove(); // L: 468 + } else if (this.field335 >= var5) { + this.field335 = var5; + this.method850(); + this.remove(); } } - } // L: 412 471 + } @ObfuscatedName("v") public synchronized void method843(int var1) { - this.method899(var1 << 6, this.method847()); // L: 83 - } // L: 84 + this.method899(var1 << 6, this.method847()); + } @ObfuscatedName("d") synchronized void method837(int var1) { - this.method899(var1, this.method847()); // L: 87 - } // L: 88 + this.method899(var1, this.method847()); + } @ObfuscatedName("h") synchronized void method899(int var1, int var2) { - this.field331 = var1; // L: 91 - this.field332 = var2; // L: 92 - this.field329 = 0; // L: 93 - this.method841(); // L: 94 - } // L: 95 + this.field331 = var1; + this.field332 = var2; + this.field329 = 0; + this.method841(); + } @ObfuscatedName("g") public synchronized int method862() { - return this.field331 == Integer.MIN_VALUE ? 0 : this.field331; // L: 98 + return this.field331 == Integer.MIN_VALUE ? 0 : this.field331; } @ObfuscatedName("e") public synchronized int method847() { - return this.field332 < 0 ? -1 : this.field332; // L: 102 + return this.field332 < 0 ? -1 : this.field332; } @ObfuscatedName("a") public synchronized void method848(int var1) { - int var2 = ((RawSound)super.sound).samples.length << 8; // L: 106 - if (var1 < -1) { // L: 107 + int var2 = ((RawSound)super.sound).samples.length << 8; + if (var1 < -1) { var1 = -1; } - if (var1 > var2) { // L: 108 + if (var1 > var2) { var1 = var2; } - this.field335 = var1; // L: 109 - } // L: 110 + this.field335 = var1; + } @ObfuscatedName("u") @ObfuscatedSignature( @@ -516,332 +516,332 @@ public class RawPcmStream extends PcmStream { garbageValue = "1" ) public synchronized void method925() { - this.field334 = (this.field334 ^ this.field334 >> 31) + (this.field334 >>> 31); // L: 113 - this.field334 = -this.field334; // L: 114 - } // L: 115 + this.field334 = (this.field334 ^ this.field334 >> 31) + (this.field334 >>> 31); + this.field334 = -this.field334; + } @ObfuscatedName("k") void method850() { - if (this.field329 != 0) { // L: 118 + if (this.field329 != 0) { if (this.field331 == Integer.MIN_VALUE) { - this.field331 = 0; // L: 119 + this.field331 = 0; } - this.field329 = 0; // L: 120 - this.method841(); // L: 121 + this.field329 = 0; + this.method841(); } - } // L: 123 + } @ObfuscatedName("f") public synchronized void method851(int var1, int var2) { - this.method932(var1, var2, this.method847()); // L: 126 - } // L: 127 + this.method932(var1, var2, this.method847()); + } @ObfuscatedName("l") public synchronized void method932(int var1, int var2, int var3) { - if (var1 == 0) { // L: 130 - this.method899(var2, var3); // L: 131 + if (var1 == 0) { + this.method899(var2, var3); } else { - int var4 = method967(var2, var3); // L: 134 - int var5 = method836(var2, var3); // L: 135 - if (var4 == this.field340 && var5 == this.field336) { // L: 136 - this.field329 = 0; // L: 137 + int var4 = method967(var2, var3); + int var5 = method836(var2, var3); + if (var4 == this.field340 && var5 == this.field336) { + this.field329 = 0; } else { - int var6 = var2 - this.field333; // L: 140 - if (this.field333 - var2 > var6) { // L: 141 + int var6 = var2 - this.field333; + if (this.field333 - var2 > var6) { var6 = this.field333 - var2; } - if (var4 - this.field340 > var6) { // L: 142 + if (var4 - this.field340 > var6) { var6 = var4 - this.field340; } - if (this.field340 - var4 > var6) { // L: 143 + if (this.field340 - var4 > var6) { var6 = this.field340 - var4; } if (var5 - this.field336 > var6) { - var6 = var5 - this.field336; // L: 144 + var6 = var5 - this.field336; } - if (this.field336 - var5 > var6) { // L: 145 + if (this.field336 - var5 > var6) { var6 = this.field336 - var5; } - if (var1 > var6) { // L: 146 + if (var1 > var6) { var1 = var6; } - this.field329 = var1; // L: 147 - this.field331 = var2; // L: 148 - this.field332 = var3; // L: 149 - this.field341 = (var2 - this.field333) / var1; // L: 150 - this.field342 = (var4 - this.field340) / var1; // L: 151 - this.field343 = (var5 - this.field336) / var1; // L: 152 + this.field329 = var1; + this.field331 = var2; + this.field332 = var3; + this.field341 = (var2 - this.field333) / var1; + this.field342 = (var4 - this.field340) / var1; + this.field343 = (var5 - this.field336) / var1; } } - } // L: 132 138 153 + } @ObfuscatedName("q") public synchronized void method954(int var1) { - if (var1 == 0) { // L: 156 - this.method837(0); // L: 157 - this.remove(); // L: 158 - } else if (this.field340 == 0 && this.field336 == 0) { // L: 161 - this.field329 = 0; // L: 162 - this.field331 = 0; // L: 163 - this.field333 = 0; // L: 164 - this.remove(); // L: 165 + if (var1 == 0) { + this.method837(0); + this.remove(); + } else if (this.field340 == 0 && this.field336 == 0) { + this.field329 = 0; + this.field331 = 0; + this.field333 = 0; + this.remove(); } else { - int var2 = -this.field333; // L: 168 - if (this.field333 > var2) { // L: 169 + int var2 = -this.field333; + if (this.field333 > var2) { var2 = this.field333; } - if (-this.field340 > var2) { // L: 170 + if (-this.field340 > var2) { var2 = -this.field340; } - if (this.field340 > var2) { // L: 171 + if (this.field340 > var2) { var2 = this.field340; } - if (-this.field336 > var2) { // L: 172 + if (-this.field336 > var2) { var2 = -this.field336; } - if (this.field336 > var2) { // L: 173 + if (this.field336 > var2) { var2 = this.field336; } - if (var1 > var2) { // L: 174 + if (var1 > var2) { var1 = var2; } - this.field329 = var1; // L: 175 - this.field331 = Integer.MIN_VALUE; // L: 176 - this.field341 = -this.field333 / var1; // L: 177 - this.field342 = -this.field340 / var1; // L: 178 - this.field343 = -this.field336 / var1; // L: 179 + this.field329 = var1; + this.field331 = Integer.MIN_VALUE; + this.field341 = -this.field333 / var1; + this.field342 = -this.field340 / var1; + this.field343 = -this.field336 / var1; } - } // L: 159 166 180 + } @ObfuscatedName("x") public synchronized void method963(int var1) { - if (this.field334 < 0) { // L: 183 + if (this.field334 < 0) { this.field334 = -var1; } else { - this.field334 = var1; // L: 184 + this.field334 = var1; } - } // L: 185 + } @ObfuscatedName("ax") public synchronized int method855() { - return this.field334 < 0 ? -this.field334 : this.field334; // L: 188 + return this.field334 < 0 ? -this.field334 : this.field334; } @ObfuscatedName("am") public boolean method854() { - return this.field335 < 0 || this.field335 >= ((RawSound)super.sound).samples.length << 8; // L: 192 + return this.field335 < 0 || this.field335 >= ((RawSound)super.sound).samples.length << 8; } @ObfuscatedName("au") public boolean method857() { - return this.field329 != 0; // L: 196 + return this.field329 != 0; } @ObfuscatedName("ac") int vmethod991() { - int var1 = this.field333 * 3 >> 6; // L: 31 - var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); // L: 32 - if (this.numLoops == 0) { // L: 33 + int var1 = this.field333 * 3 >> 6; + var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); + if (this.numLoops == 0) { var1 -= var1 * this.field335 / (((RawSound)super.sound).samples.length << 8); } else if (this.numLoops >= 0) { - var1 -= var1 * this.start / ((RawSound)super.sound).samples.length; // L: 34 + var1 -= var1 * this.start / ((RawSound)super.sound).samples.length; } - return var1 > 255 ? 255 : var1; // L: 35 + return var1 > 255 ? 255 : var1; } @ObfuscatedName("aj") int method889(int[] var1, int var2, int var3, int var4, int var5) { while (true) { - if (this.field329 > 0) { // L: 474 - int var6 = var2 + this.field329; // L: 475 - if (var6 > var4) { // L: 476 + if (this.field329 > 0) { + int var6 = var2 + this.field329; + if (var6 > var4) { var6 = var4; } - this.field329 += var2; // L: 477 - if (this.field334 == 256 && (this.field335 & 255) == 0) { // L: 478 - if (SpriteMask.PcmPlayer_stereo) { // L: 479 + this.field329 += var2; + if (this.field334 == 256 && (this.field335 & 255) == 0) { + if (SpriteMask.PcmPlayer_stereo) { var2 = method875(0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field340, this.field336, this.field342, this.field343, 0, var6, var3, this); } else { - var2 = method874(((RawSound)super.sound).samples, var1, this.field335, var2, this.field333, this.field341, 0, var6, var3, this); // L: 480 + var2 = method874(((RawSound)super.sound).samples, var1, this.field335, var2, this.field333, this.field341, 0, var6, var3, this); } - } else if (SpriteMask.PcmPlayer_stereo) { // L: 483 + } else if (SpriteMask.PcmPlayer_stereo) { var2 = method879(0, 0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field340, this.field336, this.field342, this.field343, 0, var6, var3, this, this.field334, var5); } else { - var2 = method878(0, 0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field333, this.field341, 0, var6, var3, this, this.field334, var5); // L: 484 + var2 = method878(0, 0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field333, this.field341, 0, var6, var3, this, this.field334, var5); } - this.field329 -= var2; // L: 486 - if (this.field329 != 0) { // L: 487 + this.field329 -= var2; + if (this.field329 != 0) { return var2; } - if (!this.method865()) { // L: 488 + if (!this.method865()) { continue; } return var4; } - if (this.field334 == 256 && (this.field335 & 255) == 0) { // L: 490 - if (SpriteMask.PcmPlayer_stereo) { // L: 491 + if (this.field334 == 256 && (this.field335 & 255) == 0) { + if (SpriteMask.PcmPlayer_stereo) { return method867(0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field340, this.field336, 0, var4, var3, this); } - return method866(((RawSound)super.sound).samples, var1, this.field335, var2, this.field333, 0, var4, var3, this); // L: 492 + return method866(((RawSound)super.sound).samples, var1, this.field335, var2, this.field333, 0, var4, var3, this); } - if (SpriteMask.PcmPlayer_stereo) { // L: 495 + if (SpriteMask.PcmPlayer_stereo) { return method871(0, 0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field340, this.field336, 0, var4, var3, this, this.field334, var5); } - return method870(0, 0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field333, 0, var4, var3, this, this.field334, var5); // L: 496 + return method870(0, 0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field333, 0, var4, var3, this, this.field334, var5); } } @ObfuscatedName("af") int method864(int[] var1, int var2, int var3, int var4, int var5) { while (true) { - if (this.field329 > 0) { // L: 501 - int var6 = var2 + this.field329; // L: 502 - if (var6 > var4) { // L: 503 + if (this.field329 > 0) { + int var6 = var2 + this.field329; + if (var6 > var4) { var6 = var4; } - this.field329 += var2; // L: 504 - if (this.field334 == -256 && (this.field335 & 255) == 0) { // L: 505 - if (SpriteMask.PcmPlayer_stereo) { // L: 506 + this.field329 += var2; + if (this.field334 == -256 && (this.field335 & 255) == 0) { + if (SpriteMask.PcmPlayer_stereo) { var2 = method877(0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field340, this.field336, this.field342, this.field343, 0, var6, var3, this); } else { - var2 = method876(((RawSound)super.sound).samples, var1, this.field335, var2, this.field333, this.field341, 0, var6, var3, this); // L: 507 + var2 = method876(((RawSound)super.sound).samples, var1, this.field335, var2, this.field333, this.field341, 0, var6, var3, this); } - } else if (SpriteMask.PcmPlayer_stereo) { // L: 510 + } else if (SpriteMask.PcmPlayer_stereo) { var2 = method881(0, 0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field340, this.field336, this.field342, this.field343, 0, var6, var3, this, this.field334, var5); } else { - var2 = method880(0, 0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field333, this.field341, 0, var6, var3, this, this.field334, var5); // L: 511 + var2 = method880(0, 0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field333, this.field341, 0, var6, var3, this, this.field334, var5); } - this.field329 -= var2; // L: 513 - if (this.field329 != 0) { // L: 514 + this.field329 -= var2; + if (this.field329 != 0) { return var2; } - if (!this.method865()) { // L: 515 + if (!this.method865()) { continue; } return var4; } - if (this.field334 == -256 && (this.field335 & 255) == 0) { // L: 517 - if (SpriteMask.PcmPlayer_stereo) { // L: 518 + if (this.field334 == -256 && (this.field335 & 255) == 0) { + if (SpriteMask.PcmPlayer_stereo) { return method869(0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field340, this.field336, 0, var4, var3, this); } - return method844(((RawSound)super.sound).samples, var1, this.field335, var2, this.field333, 0, var4, var3, this); // L: 519 + return method844(((RawSound)super.sound).samples, var1, this.field335, var2, this.field333, 0, var4, var3, this); } - if (SpriteMask.PcmPlayer_stereo) { // L: 522 + if (SpriteMask.PcmPlayer_stereo) { return method885(0, 0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field340, this.field336, 0, var4, var3, this, this.field334, var5); } - return method872(0, 0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field333, 0, var4, var3, this, this.field334, var5); // L: 523 + return method872(0, 0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field333, 0, var4, var3, this, this.field334, var5); } } @ObfuscatedName("ar") boolean method865() { - int var1 = this.field331; // L: 528 + int var1 = this.field331; int var2; int var3; - if (var1 == Integer.MIN_VALUE) { // L: 531 - var3 = 0; // L: 532 - var2 = 0; // L: 533 - var1 = 0; // L: 534 + if (var1 == Integer.MIN_VALUE) { + var3 = 0; + var2 = 0; + var1 = 0; } else { - var2 = method967(var1, this.field332); // L: 537 - var3 = method836(var1, this.field332); // L: 538 + var2 = method967(var1, this.field332); + var3 = method836(var1, this.field332); } - if (var1 == this.field333 && var2 == this.field340 && var3 == this.field336) { // L: 540 - if (this.field331 == Integer.MIN_VALUE) { // L: 570 - this.field331 = 0; // L: 571 - this.field336 = 0; // L: 572 - this.field340 = 0; // L: 573 - this.field333 = 0; // L: 574 - this.remove(); // L: 575 - return true; // L: 576 + if (var1 == this.field333 && var2 == this.field340 && var3 == this.field336) { + if (this.field331 == Integer.MIN_VALUE) { + this.field331 = 0; + this.field336 = 0; + this.field340 = 0; + this.field333 = 0; + this.remove(); + return true; } else { - this.method841(); // L: 578 - return false; // L: 579 + this.method841(); + return false; } } else { - if (this.field333 < var1) { // L: 541 - this.field341 = 1; // L: 542 - this.field329 = var1 - this.field333; // L: 543 - } else if (this.field333 > var1) { // L: 545 - this.field341 = -1; // L: 546 - this.field329 = this.field333 - var1; // L: 547 + if (this.field333 < var1) { + this.field341 = 1; + this.field329 = var1 - this.field333; + } else if (this.field333 > var1) { + this.field341 = -1; + this.field329 = this.field333 - var1; } else { - this.field341 = 0; // L: 549 + this.field341 = 0; } - if (this.field340 < var2) { // L: 550 - this.field342 = 1; // L: 551 - if (this.field329 == 0 || this.field329 > var2 - this.field340) { // L: 552 + if (this.field340 < var2) { + this.field342 = 1; + if (this.field329 == 0 || this.field329 > var2 - this.field340) { this.field329 = var2 - this.field340; } - } else if (this.field340 > var2) { // L: 554 - this.field342 = -1; // L: 555 - if (this.field329 == 0 || this.field329 > this.field340 - var2) { // L: 556 + } else if (this.field340 > var2) { + this.field342 = -1; + if (this.field329 == 0 || this.field329 > this.field340 - var2) { this.field329 = this.field340 - var2; } } else { - this.field342 = 0; // L: 558 + this.field342 = 0; } - if (this.field336 < var3) { // L: 559 - this.field343 = 1; // L: 560 - if (this.field329 == 0 || this.field329 > var3 - this.field336) { // L: 561 + if (this.field336 < var3) { + this.field343 = 1; + if (this.field329 == 0 || this.field329 > var3 - this.field336) { this.field329 = var3 - this.field336; } - } else if (this.field336 > var3) { // L: 563 - this.field343 = -1; // L: 564 - if (this.field329 == 0 || this.field329 > this.field336 - var3) { // L: 565 + } else if (this.field336 > var3) { + this.field343 = -1; + if (this.field329 == 0 || this.field329 > this.field336 - var3) { this.field329 = this.field336 - var3; } } else { - this.field343 = 0; // L: 567 + this.field343 = 0; } - return false; // L: 568 + return false; } } @ObfuscatedName("c") static int method967(int var0, int var1) { - return var1 < 0 ? var0 : (int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D); // L: 23 + return var1 < 0 ? var0 : (int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D); } @ObfuscatedName("b") static int method836(int var0, int var1) { - return var1 < 0 ? -var0 : (int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D); // L: 27 + return var1 < 0 ? -var0 : (int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D); } @ObfuscatedName("p") @@ -850,7 +850,7 @@ public class RawPcmStream extends PcmStream { ) @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)(class339.field4058 * 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)(class339.field4058 * 100)), var2 << 6) : null; } @ObfuscatedName("m") @@ -858,7 +858,7 @@ public class RawPcmStream extends PcmStream { descriptor = "(Laj;III)Lat;" ) public static RawPcmStream method943(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 + return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, var1, var2, var3) : null; } @ObfuscatedName("ag") @@ -866,30 +866,30 @@ public class RawPcmStream extends PcmStream { descriptor = "([B[IIIIIIILat;)I" ) static int method866(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 - if ((var5 = var3 + var7 - var2) > var6) { // L: 586 + var2 >>= 8; + var7 >>= 8; + var4 <<= 2; + if ((var5 = var3 + var7 - var2) > var6) { var5 = var6; } int var10001; - for (var5 -= 3; var3 < var5; var1[var10001] += var0[var2++] * var4) { // L: 587 588 - var10001 = var3++; // L: 589 + for (var5 -= 3; var3 < var5; var1[var10001] += var0[var2++] * var4) { + var10001 = var3++; var1[var10001] += var0[var2++] * var4; - var10001 = var3++; // L: 590 + var10001 = var3++; var1[var10001] += var0[var2++] * var4; - var10001 = var3++; // L: 591 + var10001 = var3++; var1[var10001] += var0[var2++] * var4; - var10001 = var3++; // L: 592 + var10001 = var3++; } - for (var5 += 3; var3 < var5; var1[var10001] += var0[var2++] * var4) { // L: 594 595 - var10001 = var3++; // L: 596 + for (var5 += 3; var3 < var5; var1[var10001] += var0[var2++] * var4) { + var10001 = var3++; } - var8.field335 = var2 << 8; // L: 598 - return var3; // L: 599 + var8.field335 = var2 << 8; + return var3; } @ObfuscatedName("al") @@ -897,50 +897,50 @@ public class RawPcmStream extends PcmStream { descriptor = "(I[B[IIIIIIIILat;)I" ) static int method867(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 - var6 <<= 2; // L: 606 - if ((var7 = var4 + var9 - var3) > var8) { // L: 607 + var3 >>= 8; + var9 >>= 8; + var5 <<= 2; + var6 <<= 2; + if ((var7 = var4 + var9 - var3) > var8) { var7 = var8; } - var4 <<= 1; // L: 608 - var7 <<= 1; // L: 609 + var4 <<= 1; + var7 <<= 1; int var10001; byte var11; - for (var7 -= 6; var4 < var7; var2[var10001] += var11 * var6) { // L: 610 611 - var11 = var1[var3++]; // L: 612 - var10001 = var4++; // L: 613 - var2[var10001] += var11 * var5; - var10001 = var4++; // L: 614 - var2[var10001] += var11 * var6; - var11 = var1[var3++]; // L: 615 - var10001 = var4++; // L: 616 - var2[var10001] += var11 * var5; - var10001 = var4++; // L: 617 - var2[var10001] += var11 * var6; - var11 = var1[var3++]; // L: 618 - var10001 = var4++; // L: 619 - var2[var10001] += var11 * var5; - var10001 = var4++; // L: 620 - var2[var10001] += var11 * var6; - var11 = var1[var3++]; // L: 621 + for (var7 -= 6; var4 < var7; var2[var10001] += var11 * var6) { + var11 = var1[var3++]; + var10001 = var4++; + var2[var10001] += var11 * var5; + var10001 = var4++; + var2[var10001] += var11 * var6; + var11 = var1[var3++]; + var10001 = var4++; + var2[var10001] += var11 * var5; + var10001 = var4++; + var2[var10001] += var11 * var6; + var11 = var1[var3++]; + var10001 = var4++; + var2[var10001] += var11 * var5; + var10001 = var4++; + var2[var10001] += var11 * var6; + var11 = var1[var3++]; var10001 = var4++; - var2[var10001] += var11 * var5; // L: 622 - var10001 = var4++; // L: 623 - } - - for (var7 += 6; var4 < var7; var2[var10001] += var11 * var6) { // L: 625 626 629 - var11 = var1[var3++]; // L: 627 - var10001 = var4++; // L: 628 var2[var10001] += var11 * var5; var10001 = var4++; } - var10.field335 = var3 << 8; // L: 631 - return var4 >> 1; // L: 632 + for (var7 += 6; var4 < var7; var2[var10001] += var11 * var6) { + var11 = var1[var3++]; + var10001 = var4++; + var2[var10001] += var11 * var5; + var10001 = var4++; + } + + var10.field335 = var3 << 8; + return var4 >> 1; } @ObfuscatedName("aa") @@ -948,30 +948,30 @@ public class RawPcmStream extends PcmStream { descriptor = "([B[IIIIIIILat;)I" ) static int method844(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 - if ((var5 = var3 + var2 - (var7 - 1)) > var6) { // L: 639 + var2 >>= 8; + var7 >>= 8; + var4 <<= 2; + if ((var5 = var3 + var2 - (var7 - 1)) > var6) { var5 = var6; } int var10001; - for (var5 -= 3; var3 < var5; var1[var10001] += var0[var2--] * var4) { // L: 640 641 - var10001 = var3++; // L: 642 + for (var5 -= 3; var3 < var5; var1[var10001] += var0[var2--] * var4) { + var10001 = var3++; var1[var10001] += var0[var2--] * var4; var10001 = var3++; - var1[var10001] += var0[var2--] * var4; // L: 643 - var10001 = var3++; // L: 644 var1[var10001] += var0[var2--] * var4; - var10001 = var3++; // L: 645 + var10001 = var3++; + var1[var10001] += var0[var2--] * var4; + var10001 = var3++; } - for (var5 += 3; var3 < var5; var1[var10001] += var0[var2--] * var4) { // L: 647 648 - var10001 = var3++; // L: 649 + for (var5 += 3; var3 < var5; var1[var10001] += var0[var2--] * var4) { + var10001 = var3++; } - var8.field335 = var2 << 8; // L: 651 - return var3; // L: 652 + var8.field335 = var2 << 8; + return var3; } @ObfuscatedName("as") @@ -979,50 +979,50 @@ public class RawPcmStream extends PcmStream { descriptor = "(I[B[IIIIIIIILat;)I" ) static int method869(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 - var6 <<= 2; // L: 659 - if ((var7 = var3 + var4 - (var9 - 1)) > var8) { // L: 660 + var3 >>= 8; + var9 >>= 8; + var5 <<= 2; + var6 <<= 2; + if ((var7 = var3 + var4 - (var9 - 1)) > var8) { var7 = var8; } - var4 <<= 1; // L: 661 - var7 <<= 1; // L: 662 + var4 <<= 1; + var7 <<= 1; int var10001; byte var11; - for (var7 -= 6; var4 < var7; var2[var10001] += var11 * var6) { // L: 663 664 - var11 = var1[var3--]; // L: 665 - var10001 = var4++; // L: 666 - var2[var10001] += var11 * var5; - var10001 = var4++; // L: 667 - var2[var10001] += var11 * var6; - var11 = var1[var3--]; // L: 668 - var10001 = var4++; // L: 669 - var2[var10001] += var11 * var5; - var10001 = var4++; // L: 670 - var2[var10001] += var11 * var6; - var11 = var1[var3--]; // L: 671 - var10001 = var4++; // L: 672 - var2[var10001] += var11 * var5; - var10001 = var4++; // L: 673 - var2[var10001] += var11 * var6; - var11 = var1[var3--]; // L: 674 + for (var7 -= 6; var4 < var7; var2[var10001] += var11 * var6) { + var11 = var1[var3--]; + var10001 = var4++; + var2[var10001] += var11 * var5; + var10001 = var4++; + var2[var10001] += var11 * var6; + var11 = var1[var3--]; + var10001 = var4++; + var2[var10001] += var11 * var5; + var10001 = var4++; + var2[var10001] += var11 * var6; + var11 = var1[var3--]; + var10001 = var4++; + var2[var10001] += var11 * var5; + var10001 = var4++; + var2[var10001] += var11 * var6; + var11 = var1[var3--]; var10001 = var4++; - var2[var10001] += var11 * var5; // L: 675 - var10001 = var4++; // L: 676 - } - - for (var7 += 6; var4 < var7; var2[var10001] += var11 * var6) { // L: 678 679 682 - var11 = var1[var3--]; // L: 680 - var10001 = var4++; // L: 681 var2[var10001] += var11 * var5; var10001 = var4++; } - var10.field335 = var3 << 8; // L: 684 - return var4 >> 1; // L: 685 + for (var7 += 6; var4 < var7; var2[var10001] += var11 * var6) { + var11 = var1[var3--]; + var10001 = var4++; + var2[var10001] += var11 * var5; + var10001 = var4++; + } + + var10.field335 = var3 << 8; + return var4 >> 1; } @ObfuscatedName("at") @@ -1030,32 +1030,32 @@ public class RawPcmStream extends PcmStream { descriptor = "(II[B[IIIIIIILat;II)I" ) static int method870(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 + if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 257) / var11) > var8) { var7 = var8; } byte var13; int var10001; - while (var5 < var7) { // L: 690 - var1 = var4 >> 8; // L: 691 - var13 = var2[var1]; // L: 692 - var10001 = var5++; // L: 693 + while (var5 < var7) { + var1 = var4 >> 8; + var13 = var2[var1]; + var10001 = var5++; var3[var10001] += ((var13 << 8) + (var2[var1 + 1] - var13) * (var4 & 255)) * var6 >> 6; - var4 += var11; // L: 694 + var4 += var11; } - if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 1) / var11) > var8) { // L: 696 + if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 1) / var11) > var8) { var7 = var8; } - for (var1 = var12; var5 < var7; var4 += var11) { // L: 697 698 701 - var13 = var2[var4 >> 8]; // L: 699 + for (var1 = var12; var5 < var7; var4 += var11) { + var13 = var2[var4 >> 8]; var10001 = var5++; - var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6; // L: 700 + var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6; } - var10.field335 = var4; // L: 703 - return var5; // L: 704 + var10.field335 = var4; + return var5; } @ObfuscatedName("ai") @@ -1063,41 +1063,41 @@ public class RawPcmStream extends PcmStream { descriptor = "(II[B[IIIIIIIILat;II)I" ) static int method871(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 + if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { var8 = var9; } - var5 <<= 1; // L: 709 + var5 <<= 1; byte var14; int var10001; - for (var8 <<= 1; var5 < var8; var4 += var12) { // L: 710 711 717 - var1 = var4 >> 8; // L: 712 - var14 = var2[var1]; // L: 713 - var0 = (var14 << 8) + (var4 & 255) * (var2[var1 + 1] - var14); // L: 714 - var10001 = var5++; // L: 715 + for (var8 <<= 1; var5 < var8; var4 += var12) { + var1 = var4 >> 8; + var14 = var2[var1]; + var0 = (var14 << 8) + (var4 & 255) * (var2[var1 + 1] - var14); + var10001 = var5++; var3[var10001] += var0 * var6 >> 6; - var10001 = var5++; // L: 716 + var10001 = var5++; var3[var10001] += var0 * var7 >> 6; } - if (var12 == 0 || (var8 = (var5 >> 1) + (var10 - var4 + var12 - 1) / var12) > var9) { // L: 719 + if (var12 == 0 || (var8 = (var5 >> 1) + (var10 - var4 + var12 - 1) / var12) > var9) { var8 = var9; } - var8 <<= 1; // L: 720 + var8 <<= 1; - for (var1 = var13; var5 < var8; var4 += var12) { // L: 721 722 727 - var14 = var2[var4 >> 8]; // L: 723 - var0 = (var14 << 8) + (var1 - var14) * (var4 & 255); // L: 724 - var10001 = var5++; // L: 725 + for (var1 = var13; var5 < var8; var4 += var12) { + var14 = var2[var4 >> 8]; + var0 = (var14 << 8) + (var1 - var14) * (var4 & 255); + var10001 = var5++; var3[var10001] += var0 * var6 >> 6; - var10001 = var5++; // L: 726 + var10001 = var5++; var3[var10001] += var0 * var7 >> 6; } - var11.field335 = var4; // L: 729 - return var5 >> 1; // L: 730 + var11.field335 = var4; + return var5 >> 1; } @ObfuscatedName("aq") @@ -1105,32 +1105,32 @@ public class RawPcmStream extends PcmStream { descriptor = "(II[B[IIIIIIILat;II)I" ) static int method872(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 + if (var11 == 0 || (var7 = var5 + (var11 + (var9 + 256 - var4)) / var11) > var8) { var7 = var8; } int var10001; - while (var5 < var7) { // L: 735 - var1 = var4 >> 8; // L: 736 - byte var13 = var2[var1 - 1]; // L: 737 - var10001 = var5++; // L: 738 + while (var5 < var7) { + var1 = var4 >> 8; + byte var13 = var2[var1 - 1]; + var10001 = var5++; var3[var10001] += ((var13 << 8) + (var2[var1] - var13) * (var4 & 255)) * var6 >> 6; - var4 += var11; // L: 739 + var4 += var11; } - if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4)) / var11) > var8) { // L: 741 + if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4)) / var11) > var8) { var7 = var8; } - var0 = var12; // L: 742 + var0 = var12; - for (var1 = var11; var5 < var7; var4 += var1) { // L: 743 744 746 + for (var1 = var11; var5 < var7; var4 += var1) { var10001 = var5++; - var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; // L: 745 + var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; } - var10.field335 = var4; // L: 748 - return var5; // L: 749 + var10.field335 = var4; + return var5; } @ObfuscatedName("aw") @@ -1138,39 +1138,39 @@ public class RawPcmStream extends PcmStream { descriptor = "(II[B[IIIIIIIILat;II)I" ) static int method885(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 + if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { var8 = var9; } - var5 <<= 1; // L: 754 + var5 <<= 1; int var10001; - for (var8 <<= 1; var5 < var8; var4 += var12) { // L: 755 756 762 - var1 = var4 >> 8; // L: 757 - byte var14 = var2[var1 - 1]; // L: 758 - var0 = (var2[var1] - var14) * (var4 & 255) + (var14 << 8); // L: 759 - var10001 = var5++; // L: 760 + for (var8 <<= 1; var5 < var8; var4 += var12) { + var1 = var4 >> 8; + byte var14 = var2[var1 - 1]; + var0 = (var2[var1] - var14) * (var4 & 255) + (var14 << 8); + var10001 = var5++; var3[var10001] += var0 * var6 >> 6; - var10001 = var5++; // L: 761 + var10001 = var5++; var3[var10001] += var0 * var7 >> 6; } - if (var12 == 0 || (var8 = (var5 >> 1) + (var10 - var4 + var12) / var12) > var9) { // L: 764 + if (var12 == 0 || (var8 = (var5 >> 1) + (var10 - var4 + var12) / var12) > var9) { var8 = var9; } - var8 <<= 1; // L: 765 + var8 <<= 1; - for (var1 = var13; var5 < var8; var4 += var12) { // L: 766 767 771 - var0 = (var1 << 8) + (var4 & 255) * (var2[var4 >> 8] - var1); // L: 768 - var10001 = var5++; // L: 769 + for (var1 = var13; var5 < var8; var4 += var12) { + var0 = (var1 << 8) + (var4 & 255) * (var2[var4 >> 8] - var1); + var10001 = var5++; var3[var10001] += var0 * var6 >> 6; - var10001 = var5++; // L: 770 + var10001 = var5++; var3[var10001] += var0 * var7 >> 6; } - var11.field335 = var4; // L: 773 - return var5 >> 1; // L: 774 + var11.field335 = var4; + return var5 >> 1; } @ObfuscatedName("ay") @@ -1178,40 +1178,40 @@ public class RawPcmStream extends PcmStream { descriptor = "([B[IIIIIIIILat;)I" ) static int method874(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 - var5 <<= 2; // L: 781 - if ((var6 = var3 + var8 - var2) > var7) { // L: 782 + var2 >>= 8; + var8 >>= 8; + var4 <<= 2; + var5 <<= 2; + if ((var6 = var3 + var8 - var2) > var7) { var6 = var7; } - var9.field340 += var9.field342 * (var6 - var3); // L: 783 - var9.field336 += var9.field343 * (var6 - var3); // L: 784 + var9.field340 += var9.field342 * (var6 - var3); + var9.field336 += var9.field343 * (var6 - var3); int var10001; - for (var6 -= 3; var3 < var6; var4 += var5) { // L: 785 786 794 - var10001 = var3++; // L: 787 + for (var6 -= 3; var3 < var6; var4 += var5) { + var10001 = var3++; var1[var10001] += var0[var2++] * var4; - var4 += var5; // L: 788 - var10001 = var3++; // L: 789 + var4 += var5; + var10001 = var3++; var1[var10001] += var0[var2++] * var4; - var4 += var5; // L: 790 - var10001 = var3++; // L: 791 + var4 += var5; + var10001 = var3++; var1[var10001] += var0[var2++] * var4; - var4 += var5; // L: 792 - var10001 = var3++; // L: 793 + var4 += var5; + var10001 = var3++; var1[var10001] += var0[var2++] * var4; } - for (var6 += 3; var3 < var6; var4 += var5) { // L: 796 797 799 - var10001 = var3++; // L: 798 + for (var6 += 3; var3 < var6; var4 += var5) { + var10001 = var3++; var1[var10001] += var0[var2++] * var4; } - var9.field333 = var4 >> 2; // L: 801 - var9.field335 = var2 << 8; // L: 802 - return var3; // L: 803 + var9.field333 = var4 >> 2; + var9.field335 = var2 << 8; + return var3; } @ObfuscatedName("ae") @@ -1219,65 +1219,65 @@ public class RawPcmStream extends PcmStream { descriptor = "(I[B[IIIIIIIIIILat;)I" ) static int method875(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 - var6 <<= 2; // L: 810 - var7 <<= 2; // L: 811 - var8 <<= 2; // L: 812 - if ((var9 = var11 + var4 - var3) > var10) { // L: 813 + var3 >>= 8; + var11 >>= 8; + var5 <<= 2; + var6 <<= 2; + var7 <<= 2; + var8 <<= 2; + if ((var9 = var11 + var4 - var3) > var10) { var9 = var10; } - var12.field333 += var12.field341 * (var9 - var4); // L: 814 - var4 <<= 1; // L: 815 - var9 <<= 1; // L: 816 + var12.field333 += var12.field341 * (var9 - var4); + var4 <<= 1; + var9 <<= 1; byte var13; int var10001; - for (var9 -= 6; var4 < var9; var6 += var8) { // L: 817 818 838 - var13 = var1[var3++]; // L: 819 - var10001 = var4++; // L: 820 - var2[var10001] += var13 * var5; - var5 += var7; // L: 821 - var10001 = var4++; // L: 822 - var2[var10001] += var13 * var6; - var6 += var8; // L: 823 - var13 = var1[var3++]; // L: 824 - var10001 = var4++; // L: 825 - var2[var10001] += var13 * var5; - var5 += var7; // L: 826 - var10001 = var4++; // L: 827 - var2[var10001] += var13 * var6; - var6 += var8; // L: 828 - var13 = var1[var3++]; // L: 829 - var10001 = var4++; // L: 830 - var2[var10001] += var13 * var5; - var5 += var7; // L: 831 - var10001 = var4++; // L: 832 - var2[var10001] += var13 * var6; - var6 += var8; // L: 833 - var13 = var1[var3++]; // L: 834 - var10001 = var4++; // L: 835 - var2[var10001] += var13 * var5; - var5 += var7; // L: 836 + for (var9 -= 6; var4 < var9; var6 += var8) { + var13 = var1[var3++]; var10001 = var4++; - var2[var10001] += var13 * var6; // L: 837 - } - - for (var9 += 6; var4 < var9; var6 += var8) { // L: 840 841 846 - var13 = var1[var3++]; // L: 842 - var10001 = var4++; // L: 843 var2[var10001] += var13 * var5; - var5 += var7; // L: 844 - var10001 = var4++; // L: 845 + var5 += var7; + var10001 = var4++; + var2[var10001] += var13 * var6; + var6 += var8; + var13 = var1[var3++]; + var10001 = var4++; + var2[var10001] += var13 * var5; + var5 += var7; + var10001 = var4++; + var2[var10001] += var13 * var6; + var6 += var8; + var13 = var1[var3++]; + var10001 = var4++; + var2[var10001] += var13 * var5; + var5 += var7; + var10001 = var4++; + var2[var10001] += var13 * var6; + var6 += var8; + var13 = var1[var3++]; + var10001 = var4++; + var2[var10001] += var13 * var5; + var5 += var7; + var10001 = var4++; var2[var10001] += var13 * var6; } - var12.field340 = var5 >> 2; // L: 848 - var12.field336 = var6 >> 2; // L: 849 - var12.field335 = var3 << 8; // L: 850 - return var4 >> 1; // L: 851 + for (var9 += 6; var4 < var9; var6 += var8) { + var13 = var1[var3++]; + var10001 = var4++; + var2[var10001] += var13 * var5; + var5 += var7; + var10001 = var4++; + var2[var10001] += var13 * var6; + } + + var12.field340 = var5 >> 2; + var12.field336 = var6 >> 2; + var12.field335 = var3 << 8; + return var4 >> 1; } @ObfuscatedName("ak") @@ -1285,40 +1285,40 @@ public class RawPcmStream extends PcmStream { descriptor = "([B[IIIIIIIILat;)I" ) static int method876(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 - var5 <<= 2; // L: 858 - if ((var6 = var3 + var2 - (var8 - 1)) > var7) { // L: 859 + var2 >>= 8; + var8 >>= 8; + var4 <<= 2; + var5 <<= 2; + if ((var6 = var3 + var2 - (var8 - 1)) > var7) { var6 = var7; } - var9.field340 += var9.field342 * (var6 - var3); // L: 860 - var9.field336 += var9.field343 * (var6 - var3); // L: 861 + var9.field340 += var9.field342 * (var6 - var3); + var9.field336 += var9.field343 * (var6 - var3); int var10001; - for (var6 -= 3; var3 < var6; var4 += var5) { // L: 862 863 871 - var10001 = var3++; // L: 864 + for (var6 -= 3; var3 < var6; var4 += var5) { + var10001 = var3++; var1[var10001] += var0[var2--] * var4; - var4 += var5; // L: 865 - var10001 = var3++; // L: 866 + var4 += var5; + var10001 = var3++; var1[var10001] += var0[var2--] * var4; - var4 += var5; // L: 867 - var10001 = var3++; // L: 868 + var4 += var5; + var10001 = var3++; var1[var10001] += var0[var2--] * var4; - var4 += var5; // L: 869 - var10001 = var3++; // L: 870 + var4 += var5; + var10001 = var3++; var1[var10001] += var0[var2--] * var4; } - for (var6 += 3; var3 < var6; var4 += var5) { // L: 873 874 876 - var10001 = var3++; // L: 875 + for (var6 += 3; var3 < var6; var4 += var5) { + var10001 = var3++; var1[var10001] += var0[var2--] * var4; } - var9.field333 = var4 >> 2; // L: 878 - var9.field335 = var2 << 8; // L: 879 - return var3; // L: 880 + var9.field333 = var4 >> 2; + var9.field335 = var2 << 8; + return var3; } @ObfuscatedName("ad") @@ -1326,65 +1326,65 @@ public class RawPcmStream extends PcmStream { descriptor = "(I[B[IIIIIIIIIILat;)I" ) static int method877(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 - var6 <<= 2; // L: 887 - var7 <<= 2; // L: 888 - var8 <<= 2; // L: 889 - if ((var9 = var3 + var4 - (var11 - 1)) > var10) { // L: 890 + var3 >>= 8; + var11 >>= 8; + var5 <<= 2; + var6 <<= 2; + var7 <<= 2; + var8 <<= 2; + if ((var9 = var3 + var4 - (var11 - 1)) > var10) { var9 = var10; } - var12.field333 += var12.field341 * (var9 - var4); // L: 891 - var4 <<= 1; // L: 892 - var9 <<= 1; // L: 893 + var12.field333 += var12.field341 * (var9 - var4); + var4 <<= 1; + var9 <<= 1; byte var13; int var10001; - for (var9 -= 6; var4 < var9; var6 += var8) { // L: 894 895 915 - var13 = var1[var3--]; // L: 896 - var10001 = var4++; // L: 897 + for (var9 -= 6; var4 < var9; var6 += var8) { + var13 = var1[var3--]; + var10001 = var4++; var2[var10001] += var13 * var5; - var5 += var7; // L: 898 - var10001 = var4++; // L: 899 + var5 += var7; + var10001 = var4++; var2[var10001] += var13 * var6; - var6 += var8; // L: 900 - var13 = var1[var3--]; // L: 901 - var10001 = var4++; // L: 902 + var6 += var8; + var13 = var1[var3--]; + var10001 = var4++; var2[var10001] += var13 * var5; - var5 += var7; // L: 903 - var10001 = var4++; // L: 904 + var5 += var7; + var10001 = var4++; var2[var10001] += var13 * var6; - var6 += var8; // L: 905 - var13 = var1[var3--]; // L: 906 - var10001 = var4++; // L: 907 + var6 += var8; + var13 = var1[var3--]; + var10001 = var4++; var2[var10001] += var13 * var5; - var5 += var7; // L: 908 - var10001 = var4++; // L: 909 + var5 += var7; + var10001 = var4++; var2[var10001] += var13 * var6; - var6 += var8; // L: 910 - var13 = var1[var3--]; // L: 911 - var10001 = var4++; // L: 912 + var6 += var8; + var13 = var1[var3--]; + var10001 = var4++; var2[var10001] += var13 * var5; - var5 += var7; // L: 913 - var10001 = var4++; // L: 914 + var5 += var7; + var10001 = var4++; var2[var10001] += var13 * var6; } - for (var9 += 6; var4 < var9; var6 += var8) { // L: 917 918 923 - var13 = var1[var3--]; // L: 919 - var10001 = var4++; // L: 920 + for (var9 += 6; var4 < var9; var6 += var8) { + var13 = var1[var3--]; + var10001 = var4++; var2[var10001] += var13 * var5; - var5 += var7; // L: 921 - var10001 = var4++; // L: 922 + var5 += var7; + var10001 = var4++; var2[var10001] += var13 * var6; } - var12.field340 = var5 >> 2; // L: 925 - var12.field336 = var6 >> 2; // L: 926 - var12.field335 = var3 << 8; // L: 927 - return var4 >> 1; // L: 928 + var12.field340 = var5 >> 2; + var12.field336 = var6 >> 2; + var12.field335 = var3 << 8; + return var4 >> 1; } @ObfuscatedName("bp") @@ -1392,39 +1392,39 @@ public class RawPcmStream extends PcmStream { descriptor = "(II[B[IIIIIIIILat;II)I" ) static int method878(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.field340 -= var11.field342 * var5; // L: 932 - var11.field336 -= var11.field343 * var5; // L: 933 - if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { // L: 934 + var11.field340 -= var11.field342 * var5; + var11.field336 -= var11.field343 * var5; + if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { var8 = var9; } byte var14; int var10001; - while (var5 < var8) { // L: 935 - var1 = var4 >> 8; // L: 936 - var14 = var2[var1]; // L: 937 + while (var5 < var8) { + var1 = var4 >> 8; + var14 = var2[var1]; var10001 = var5++; - var3[var10001] += ((var14 << 8) + (var2[var1 + 1] - var14) * (var4 & 255)) * var6 >> 6; // L: 938 - var6 += var7; // L: 939 - var4 += var12; // L: 940 + var3[var10001] += ((var14 << 8) + (var2[var1 + 1] - var14) * (var4 & 255)) * var6 >> 6; + var6 += var7; + var4 += var12; } - if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 1) / var12) > var9) { // L: 942 + if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 1) / var12) > var9) { var8 = var9; } - for (var1 = var13; var5 < var8; var4 += var12) { // L: 943 944 948 - var14 = var2[var4 >> 8]; // L: 945 - var10001 = var5++; // L: 946 + for (var1 = var13; var5 < var8; var4 += var12) { + var14 = var2[var4 >> 8]; + var10001 = var5++; var3[var10001] += ((var14 << 8) + (var1 - var14) * (var4 & 255)) * var6 >> 6; - var6 += var7; // L: 947 + var6 += var7; } - var11.field340 += var11.field342 * var5; // L: 950 - var11.field336 += var11.field343 * var5; // L: 951 - var11.field333 = var6; // L: 952 - var11.field335 = var4; // L: 953 - return var5; // L: 954 + var11.field340 += var11.field342 * var5; + var11.field336 += var11.field343 * var5; + var11.field333 = var6; + var11.field335 = var4; + return var5; } @ObfuscatedName("bd") @@ -1432,50 +1432,50 @@ public class RawPcmStream extends PcmStream { descriptor = "(II[B[IIIIIIIIIILat;II)I" ) static int method879(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.field333 -= var5 * var13.field341; // L: 958 - if (var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) { // L: 959 + var13.field333 -= var5 * var13.field341; + if (var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) { var10 = var11; } - var5 <<= 1; // L: 960 + var5 <<= 1; byte var16; int var10001; - for (var10 <<= 1; var5 < var10; var4 += var14) { // L: 961 962 970 - var1 = var4 >> 8; // L: 963 - var16 = var2[var1]; // L: 964 - var0 = (var16 << 8) + (var4 & 255) * (var2[var1 + 1] - var16); // L: 965 - var10001 = var5++; // L: 966 + for (var10 <<= 1; var5 < var10; var4 += var14) { + var1 = var4 >> 8; + var16 = var2[var1]; + var0 = (var16 << 8) + (var4 & 255) * (var2[var1 + 1] - var16); + var10001 = var5++; var3[var10001] += var0 * var6 >> 6; - var6 += var8; // L: 967 - var10001 = var5++; // L: 968 + var6 += var8; + var10001 = var5++; var3[var10001] += var0 * var7 >> 6; - var7 += var9; // L: 969 + var7 += var9; } - if (var14 == 0 || (var10 = (var5 >> 1) + (var12 - var4 + var14 - 1) / var14) > var11) { // L: 972 + if (var14 == 0 || (var10 = (var5 >> 1) + (var12 - var4 + var14 - 1) / var14) > var11) { var10 = var11; } - var10 <<= 1; // L: 973 + var10 <<= 1; - for (var1 = var15; var5 < var10; var4 += var14) { // L: 974 975 982 - var16 = var2[var4 >> 8]; // L: 976 - var0 = (var16 << 8) + (var1 - var16) * (var4 & 255); // L: 977 - var10001 = var5++; // L: 978 + for (var1 = var15; var5 < var10; var4 += var14) { + var16 = var2[var4 >> 8]; + var0 = (var16 << 8) + (var1 - var16) * (var4 & 255); + var10001 = var5++; var3[var10001] += var0 * var6 >> 6; - var6 += var8; // L: 979 - var10001 = var5++; // L: 980 + var6 += var8; + var10001 = var5++; var3[var10001] += var0 * var7 >> 6; - var7 += var9; // L: 981 + var7 += var9; } - var5 >>= 1; // L: 984 - var13.field333 += var13.field341 * var5; // L: 985 - var13.field340 = var6; // L: 986 - var13.field336 = var7; // L: 987 - var13.field335 = var4; // L: 988 - return var5; // L: 989 + var5 >>= 1; + var13.field333 += var13.field341 * var5; + var13.field340 = var6; + var13.field336 = var7; + var13.field335 = var4; + return var5; } @ObfuscatedName("ba") @@ -1483,39 +1483,39 @@ public class RawPcmStream extends PcmStream { descriptor = "(II[B[IIIIIIIILat;II)I" ) static int method880(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.field340 -= var11.field342 * var5; // L: 993 - var11.field336 -= var11.field343 * var5; // L: 994 - if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { // L: 995 + var11.field340 -= var11.field342 * var5; + var11.field336 -= var11.field343 * var5; + if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { var8 = var9; } int var10001; - while (var5 < var8) { // L: 996 - var1 = var4 >> 8; // L: 997 - byte var14 = var2[var1 - 1]; // L: 998 + while (var5 < var8) { + var1 = var4 >> 8; + byte var14 = var2[var1 - 1]; var10001 = var5++; - var3[var10001] += ((var14 << 8) + (var2[var1] - var14) * (var4 & 255)) * var6 >> 6; // L: 999 - var6 += var7; // L: 1000 - var4 += var12; // L: 1001 + var3[var10001] += ((var14 << 8) + (var2[var1] - var14) * (var4 & 255)) * var6 >> 6; + var6 += var7; + var4 += var12; } - if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12) / var12) > var9) { // L: 1003 + if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12) / var12) > var9) { var8 = var9; } - var0 = var13; // L: 1004 + var0 = var13; - for (var1 = var12; var5 < var8; var4 += var1) { // L: 1005 1006 1009 - var10001 = var5++; // L: 1007 + for (var1 = var12; var5 < var8; var4 += var1) { + var10001 = var5++; var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; - var6 += var7; // L: 1008 + var6 += var7; } - var11.field340 += var11.field342 * var5; // L: 1011 - var11.field336 += var11.field343 * var5; // L: 1012 - var11.field333 = var6; // L: 1013 - var11.field335 = var4; // L: 1014 - return var5; // L: 1015 + var11.field340 += var11.field342 * var5; + var11.field336 += var11.field343 * var5; + var11.field333 = var6; + var11.field335 = var4; + return var5; } @ObfuscatedName("bq") @@ -1523,47 +1523,47 @@ public class RawPcmStream extends PcmStream { descriptor = "(II[B[IIIIIIIIIILat;II)I" ) static int method881(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.field333 -= var5 * var13.field341; // L: 1019 - if (var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) { // L: 1020 + var13.field333 -= var5 * var13.field341; + if (var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) { var10 = var11; } - var5 <<= 1; // L: 1021 + var5 <<= 1; int var10001; - for (var10 <<= 1; var5 < var10; var4 += var14) { // L: 1022 1023 1031 - var1 = var4 >> 8; // L: 1024 - byte var16 = var2[var1 - 1]; // L: 1025 - var0 = (var2[var1] - var16) * (var4 & 255) + (var16 << 8); // L: 1026 - var10001 = var5++; // L: 1027 + for (var10 <<= 1; var5 < var10; var4 += var14) { + var1 = var4 >> 8; + byte var16 = var2[var1 - 1]; + var0 = (var2[var1] - var16) * (var4 & 255) + (var16 << 8); + var10001 = var5++; var3[var10001] += var0 * var6 >> 6; - var6 += var8; // L: 1028 - var10001 = var5++; // L: 1029 + var6 += var8; + var10001 = var5++; var3[var10001] += var0 * var7 >> 6; - var7 += var9; // L: 1030 + var7 += var9; } - if (var14 == 0 || (var10 = (var5 >> 1) + (var12 - var4 + var14) / var14) > var11) { // L: 1033 + if (var14 == 0 || (var10 = (var5 >> 1) + (var12 - var4 + var14) / var14) > var11) { var10 = var11; } - var10 <<= 1; // L: 1034 + var10 <<= 1; - for (var1 = var15; var5 < var10; var4 += var14) { // L: 1035 1036 1042 - var0 = (var1 << 8) + (var4 & 255) * (var2[var4 >> 8] - var1); // L: 1037 - var10001 = var5++; // L: 1038 + for (var1 = var15; var5 < var10; var4 += var14) { + var0 = (var1 << 8) + (var4 & 255) * (var2[var4 >> 8] - var1); + var10001 = var5++; var3[var10001] += var0 * var6 >> 6; - var6 += var8; // L: 1039 - var10001 = var5++; // L: 1040 + var6 += var8; + var10001 = var5++; var3[var10001] += var0 * var7 >> 6; - var7 += var9; // L: 1041 + var7 += var9; } - var5 >>= 1; // L: 1044 - var13.field333 += var13.field341 * var5; // L: 1045 - var13.field340 = var6; // L: 1046 - var13.field336 = var7; // L: 1047 - var13.field335 = var4; // L: 1048 - return var5; // L: 1049 + var5 >>= 1; + var13.field333 += var13.field341 * var5; + var13.field340 = var6; + var13.field336 = var7; + var13.field335 = var4; + return var5; } } diff --git a/runescape-client/src/main/java/RawSound.java b/runescape-client/src/main/java/RawSound.java index 4826dd4363..272c2a4d9e 100644 --- a/runescape-client/src/main/java/RawSound.java +++ b/runescape-client/src/main/java/RawSound.java @@ -22,19 +22,19 @@ public class RawSound extends AbstractSound { public boolean field265; RawSound(int var1, byte[] var2, int var3, int var4) { - this.sampleRate = var1; // L: 13 - this.samples = var2; // L: 14 - this.start = var3; // L: 15 - this.end = var4; // L: 16 - } // L: 17 + this.sampleRate = var1; + this.samples = var2; + this.start = var3; + this.end = var4; + } RawSound(int var1, byte[] var2, int var3, int var4, boolean var5) { - this.sampleRate = var1; // L: 20 - this.samples = var2; // L: 21 - this.start = var3; // L: 22 - this.end = var4; // L: 23 - this.field265 = var5; // L: 24 - } // L: 25 + this.sampleRate = var1; + this.samples = var2; + this.start = var3; + this.end = var4; + this.field265 = var5; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -42,18 +42,18 @@ public class RawSound extends AbstractSound { ) @Export("resample") public RawSound resample(Decimator var1) { - this.samples = var1.resample(this.samples); // L: 28 - this.sampleRate = var1.scaleRate(this.sampleRate); // L: 29 - if (this.start == this.end) { // L: 30 + this.samples = var1.resample(this.samples); + this.sampleRate = var1.scaleRate(this.sampleRate); + if (this.start == this.end) { this.start = this.end = var1.scalePosition(this.start); } else { - this.start = var1.scalePosition(this.start); // L: 32 - this.end = var1.scalePosition(this.end); // L: 33 - if (this.start == this.end) { // L: 34 + this.start = var1.scalePosition(this.start); + this.end = var1.scalePosition(this.end); + if (this.start == this.end) { --this.start; } } - return this; // L: 36 + return this; } } diff --git a/runescape-client/src/main/java/ReflectionCheck.java b/runescape-client/src/main/java/ReflectionCheck.java index a7756c3669..14db24c9b6 100644 --- a/runescape-client/src/main/java/ReflectionCheck.java +++ b/runescape-client/src/main/java/ReflectionCheck.java @@ -42,7 +42,7 @@ public class ReflectionCheck extends Node { Method[] methods; ReflectionCheck() { - } // L: 17 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -51,11 +51,11 @@ public class ReflectionCheck extends Node { ) @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 + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var2 == null) { return 0; } else { - return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; // L: 23 24 + return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; } } @@ -65,11 +65,11 @@ public class ReflectionCheck extends Node { garbageValue = "-1748869629" ) static void method662(int var0) { - ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 72 + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); if (var1 != null) { - var1.remove(); // L: 74 + var1.remove(); } - } // L: 73 75 + } @ObfuscatedName("j") @ObfuscatedSignature( @@ -78,44 +78,44 @@ public class ReflectionCheck extends Node { ) @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 + if (var2 == 1) { + int var4 = var0.population; + int var5 = var1.population; + if (!var3) { + if (var4 == -1) { var4 = 2001; } - if (var5 == -1) { // L: 216 + if (var5 == -1) { var5 = 2001; } } - return var4 - var5; // L: 218 - } else if (var2 == 2) { // L: 220 + return var4 - var5; + } else if (var2 == 2) { return var0.location - var1.location; - } else if (var2 == 3) { // L: 221 - if (var0.activity.equals("-")) { // L: 222 - if (var1.activity.equals("-")) { // L: 223 + } else if (var2 == 3) { + if (var0.activity.equals("-")) { + if (var1.activity.equals("-")) { return 0; } else { - return var3 ? -1 : 1; // L: 224 + return var3 ? -1 : 1; } - } else if (var1.activity.equals("-")) { // L: 226 + } else if (var1.activity.equals("-")) { return var3 ? 1 : -1; } else { - return var0.activity.compareTo(var1.activity); // L: 227 + return var0.activity.compareTo(var1.activity); } - } else if (var2 == 4) { // L: 229 + } else if (var2 == 4) { return var0.method1676() ? (var1.method1676() ? 0 : 1) : (var1.method1676() ? -1 : 0); - } else if (var2 == 5) { // L: 230 + } else if (var2 == 5) { return var0.method1696() ? (var1.method1696() ? 0 : 1) : (var1.method1696() ? -1 : 0); - } else if (var2 == 6) { // L: 231 + } else if (var2 == 6) { return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0); - } else if (var2 == 7) { // L: 232 + } else if (var2 == 7) { return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0); } else { - return var0.id - var1.id; // L: 233 + return var0.id - var1.id; } } @@ -128,74 +128,74 @@ public class ReflectionCheck extends Node { int var3; int var6; int var9; - if (var0 == ScriptOpcodes.ENUM_STRING) { // L: 2059 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 2060 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2061 - var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2062 - EnumComposition var10 = class119.getEnum(var3); // L: 2063 - if (var10.outputType != 's') { // L: 2064 + if (var0 == ScriptOpcodes.ENUM_STRING) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + EnumComposition var10 = class119.getEnum(var3); + if (var10.outputType != 's') { } - for (var6 = 0; var6 < var10.outputCount; ++var6) { // L: 2065 - if (var9 == var10.keys[var6]) { // L: 2066 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var10.strVals[var6]; // L: 2067 - var10 = null; // L: 2068 + for (var6 = 0; var6 < var10.outputCount; ++var6) { + if (var9 == var10.keys[var6]) { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var10.strVals[var6]; + var10 = null; break; } } - if (var10 != null) { // L: 2072 + if (var10 != null) { Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var10.defaultStr; } - return 1; // L: 2073 - } else if (var0 != ScriptOpcodes.ENUM) { // L: 2075 - if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { // L: 2101 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2102 - EnumComposition var4 = class119.getEnum(var3); // L: 2103 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.size(); // L: 2104 - return 1; // L: 2105 + return 1; + } else if (var0 != ScriptOpcodes.ENUM) { + if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + EnumComposition var4 = class119.getEnum(var3); + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.size(); + return 1; } else { - return 2; // L: 2107 + return 2; } } else { - IsaacCipher.Interpreter_intStackSize -= 4; // L: 2076 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2077 - var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2078 - int var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 2079 - var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3]; // L: 2080 - EnumComposition var7 = class119.getEnum(var5); // L: 2081 - if (var3 == var7.inputType && var9 == var7.outputType) { // L: 2082 - for (int var8 = 0; var8 < var7.outputCount; ++var8) { // L: 2087 - if (var6 == var7.keys[var8]) { // L: 2088 - if (var9 == 115) { // L: 2089 + IsaacCipher.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + int var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; + var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3]; + EnumComposition var7 = class119.getEnum(var5); + if (var3 == var7.inputType && var9 == var7.outputType) { + for (int var8 = 0; var8 < var7.outputCount; ++var8) { + if (var6 == var7.keys[var8]) { + if (var9 == 115) { Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.strVals[var8]; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.intVals[var8]; // L: 2090 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.intVals[var8]; } - var7 = null; // L: 2091 + var7 = null; break; } } - if (var7 != null) { // L: 2095 + if (var7 != null) { if (var9 == 115) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.defaultStr; // L: 2096 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.defaultStr; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.defaultInt; // L: 2097 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.defaultInt; } } - return 1; // L: 2099 + return 1; } else { - if (var9 == 115) { // L: 2083 + if (var9 == 115) { Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = "null"; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 2084 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; } - return 1; // L: 2085 + return 1; } } } @@ -206,9 +206,9 @@ public class ReflectionCheck extends Node { garbageValue = "682246596" ) static void method664() { - if (class340.localPlayer.x >> 7 == Client.destinationX && class340.localPlayer.y >> 7 == Client.destinationY) { // L: 5435 - Client.destinationX = 0; // L: 5436 + if (class340.localPlayer.x >> 7 == Client.destinationX && class340.localPlayer.y >> 7 == Client.destinationY) { + Client.destinationX = 0; } - } // L: 5438 + } } diff --git a/runescape-client/src/main/java/Renderable.java b/runescape-client/src/main/java/Renderable.java index bcce93ead2..fdb5ff555b 100644 --- a/runescape-client/src/main/java/Renderable.java +++ b/runescape-client/src/main/java/Renderable.java @@ -20,8 +20,8 @@ public abstract class Renderable extends DualNode { public int height; protected Renderable() { - this.height = 1000; // L: 6 - } // L: 8 + this.height = 1000; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -30,19 +30,19 @@ public abstract class Renderable extends DualNode { ) @Export("getModel") protected Model getModel() { - return null; // L: 19 + return null; } @ObfuscatedName("cq") @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { - Model var11 = this.getModel(); // L: 11 - if (var11 != null) { // L: 12 - this.height = var11.height; // L: 13 - var11.draw(var1, var2, var3, var4, var5, var6, var7, var8, var9); // L: 14 + Model var11 = this.getModel(); + if (var11 != null) { + this.height = var11.height; + var11.draw(var1, var2, var3, var4, var5, var6, var7, var8, var9); } - } // L: 16 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -51,84 +51,84 @@ public abstract class Renderable extends DualNode { ) @Export("standardizeChar") static char standardizeChar(char var0, Language var1) { - if (var0 >= 192 && var0 <= 255) { // L: 117 - if (var0 >= 192 && var0 <= 198) { // L: 118 + if (var0 >= 192 && var0 <= 255) { + if (var0 >= 192 && var0 <= 198) { return 'A'; } - if (var0 == 199) { // L: 119 + if (var0 == 199) { return 'C'; } - if (var0 >= 200 && var0 <= 203) { // L: 120 + if (var0 >= 200 && var0 <= 203) { return 'E'; } - if (var0 >= 204 && var0 <= 207) { // L: 121 + if (var0 >= 204 && var0 <= 207) { return 'I'; } - if (var0 == 209 && var1 != Language.Language_ES) { // L: 122 + if (var0 == 209 && var1 != Language.Language_ES) { return 'N'; } - if (var0 >= 210 && var0 <= 214) { // L: 123 + if (var0 >= 210 && var0 <= 214) { return 'O'; } - if (var0 >= 217 && var0 <= 220) { // L: 124 + if (var0 >= 217 && var0 <= 220) { return 'U'; } - if (var0 == 221) { // L: 125 + if (var0 == 221) { return 'Y'; } - if (var0 == 223) { // L: 126 + if (var0 == 223) { return 's'; } - if (var0 >= 224 && var0 <= 230) { // L: 127 + if (var0 >= 224 && var0 <= 230) { return 'a'; } - if (var0 == 231) { // L: 128 + if (var0 == 231) { return 'c'; } - if (var0 >= 232 && var0 <= 235) { // L: 129 + if (var0 >= 232 && var0 <= 235) { return 'e'; } - if (var0 >= 236 && var0 <= 239) { // L: 130 + if (var0 >= 236 && var0 <= 239) { return 'i'; } - if (var0 == 241 && var1 != Language.Language_ES) { // L: 131 + if (var0 == 241 && var1 != Language.Language_ES) { return 'n'; } - if (var0 >= 242 && var0 <= 246) { // L: 132 + if (var0 >= 242 && var0 <= 246) { return 'o'; } - if (var0 >= 249 && var0 <= 252) { // L: 133 + if (var0 >= 249 && var0 <= 252) { return 'u'; } - if (var0 == 253 || var0 == 255) { // L: 134 + if (var0 == 253 || var0 == 255) { return 'y'; } } - if (var0 == 338) { // L: 136 + if (var0 == 338) { return 'O'; - } else if (var0 == 339) { // L: 137 + } else if (var0 == 339) { return 'o'; - } else if (var0 == 376) { // L: 138 + } else if (var0 == 376) { return 'Y'; } else { - return var0; // L: 139 + return var0; } } } diff --git a/runescape-client/src/main/java/RouteStrategy.java b/runescape-client/src/main/java/RouteStrategy.java index cfd961d163..f12f05447a 100644 --- a/runescape-client/src/main/java/RouteStrategy.java +++ b/runescape-client/src/main/java/RouteStrategy.java @@ -34,7 +34,7 @@ public abstract class RouteStrategy { public int field2114; protected RouteStrategy() { - } // L: 9 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -51,57 +51,57 @@ public abstract class RouteStrategy { ) @Export("doCheat") static final void doCheat(String var0) { - if (var0.equalsIgnoreCase("toggleroof")) { // L: 4503 - SecureRandomFuture.clientPreferences.roofsHidden = !SecureRandomFuture.clientPreferences.roofsHidden; // L: 4504 - class127.savePreferences(); // L: 4505 - if (SecureRandomFuture.clientPreferences.roofsHidden) { // L: 4506 + if (var0.equalsIgnoreCase("toggleroof")) { + SecureRandomFuture.clientPreferences.roofsHidden = !SecureRandomFuture.clientPreferences.roofsHidden; + class127.savePreferences(); + if (SecureRandomFuture.clientPreferences.roofsHidden) { class194.addGameMessage(99, "", "Roofs are now all hidden"); } else { - class194.addGameMessage(99, "", "Roofs will only be removed selectively"); // L: 4507 + class194.addGameMessage(99, "", "Roofs will only be removed selectively"); } } - if (var0.equalsIgnoreCase("displayfps")) { // L: 4509 + if (var0.equalsIgnoreCase("displayfps")) { Client.displayFps = !Client.displayFps; } - if (var0.equalsIgnoreCase("renderself")) { // L: 4510 + if (var0.equalsIgnoreCase("renderself")) { Client.renderSelf = !Client.renderSelf; } if (var0.equalsIgnoreCase("mouseovertext")) { - Client.showMouseOverText = !Client.showMouseOverText; // L: 4511 + Client.showMouseOverText = !Client.showMouseOverText; } - if (Client.staffModLevel >= 2) { // L: 4512 - if (var0.equalsIgnoreCase("errortest")) { // L: 4513 + if (Client.staffModLevel >= 2) { + if (var0.equalsIgnoreCase("errortest")) { throw new RuntimeException(); } - if (var0.equalsIgnoreCase("showcoord")) { // L: 4514 + if (var0.equalsIgnoreCase("showcoord")) { Varcs.worldMap.showCoord = !Varcs.worldMap.showCoord; } - if (var0.equalsIgnoreCase("fpson")) { // L: 4515 + if (var0.equalsIgnoreCase("fpson")) { Client.displayFps = true; } - if (var0.equalsIgnoreCase("fpsoff")) { // L: 4516 + if (var0.equalsIgnoreCase("fpsoff")) { Client.displayFps = false; } - if (var0.equalsIgnoreCase("gc")) { // L: 4517 + if (var0.equalsIgnoreCase("gc")) { System.gc(); } - if (var0.equalsIgnoreCase("clientdrop")) { // L: 4518 + if (var0.equalsIgnoreCase("clientdrop")) { Varcs.method2411(); } } - PacketBufferNode var1 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2846, Client.packetWriter.isaacCipher); // L: 4521 - var1.packetBuffer.writeByte(var0.length() + 1); // L: 4522 - var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 4523 - Client.packetWriter.addNode(var1); // L: 4524 - } // L: 4525 + PacketBufferNode var1 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2846, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(var0.length() + 1); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); + } } diff --git a/runescape-client/src/main/java/RunException.java b/runescape-client/src/main/java/RunException.java index f30bf8a52d..4b5d0e0131 100644 --- a/runescape-client/src/main/java/RunException.java +++ b/runescape-client/src/main/java/RunException.java @@ -27,7 +27,7 @@ public class RunException extends RuntimeException { Throwable throwable; RunException(Throwable var1, String var2) { - this.message = var2; // L: 27 - this.throwable = var1; // L: 28 - } // L: 29 + this.message = var2; + this.throwable = var1; + } } diff --git a/runescape-client/src/main/java/RuneLiteIterableHashTable.java b/runescape-client/src/main/java/RuneLiteIterableHashTable.java deleted file mode 100644 index ca4f181efb..0000000000 --- a/runescape-client/src/main/java/RuneLiteIterableHashTable.java +++ /dev/null @@ -1,70 +0,0 @@ -import java.util.Iterator; -import java.util.NoSuchElementException; - -public class RuneLiteIterableHashTable implements Iterator -{ - public Node node; - public final NodeHashTable nodeHashTable; - public int it; - - public RuneLiteIterableHashTable(NodeHashTable nodeHashTable) - { - this.nodeHashTable = nodeHashTable; - } - - @Override - public boolean hasNext() - { - if (this.it > 0 && this.nodeHashTable.buckets[this.it - 1] != this.node) - { - return true; - } - else - { - for (int i = this.it; i < this.nodeHashTable.size; ++i) - { - Node bucket = this.nodeHashTable.buckets[i]; - Node previous = bucket.previous; - - if (bucket != previous) - { - return true; - } - } - - return false; - } - } - - @Override - public Node next() - { - if (this.it > 0 && this.nodeHashTable.buckets[this.it - 1] != this.node) - { - Node node = this.node; - this.node = node.previous; - - return node; - } - else - { - Node node; - Node previous; - - do - { - if (this.it >= this.nodeHashTable.size) - { - throw new NoSuchElementException(); - } - - node = this.nodeHashTable.buckets[this.it++]; - previous = node.previous; - } while (node == previous); - - this.node = previous.previous; - - return previous; - } - } -} diff --git a/runescape-client/src/main/java/RuneLiteObject.java b/runescape-client/src/main/java/RuneLiteObject.java deleted file mode 100644 index e4afc402de..0000000000 --- a/runescape-client/src/main/java/RuneLiteObject.java +++ /dev/null @@ -1,45 +0,0 @@ -public class RuneLiteObject extends GraphicsObject -{ - public Model model; - public boolean loop; - - public RuneLiteObject() { - super.isFinished = true; - } - - public boolean isLooping() { - return loop; - } - - public boolean isActive() { - return !super.isFinished; - } - - public void setActive(boolean active) - { - if (super.isFinished == active) - { - super.isFinished = !active; - - if (active) - { - super.frame = 0; - super.frameCycle = 0; - Client.graphicsObjects.addFirst(this); - } - else - { - remove(); - } - - } - } - - public void setShouldLoop(boolean var1) { - this.loop = var1; - } - - public void setModel(Model var1) { - this.model = var1; - } -} diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java index 34da6cf84e..401855c49a 100644 --- a/runescape-client/src/main/java/Scene.java +++ b/runescape-client/src/main/java/Scene.java @@ -189,169 +189,169 @@ public class Scene { int[][] tileRotation2D; static { - Scene_isLowDetail = true; // L: 8 - tileUpdateCount = 0; // L: 22 - Scene_plane = 0; // L: 23 - gameObjects = new GameObject[100]; // L: 38 - checkClick = false; // L: 39 - Scene_selectedPlane = 0; // L: 40 - Scene_selectedScreenX = 0; // L: 41 - Scene_selectedScreenY = 0; // L: 42 - Scene_selectedX = -1; // L: 43 - Scene_selectedY = -1; // L: 44 - viewportWalking = false; // L: 45 - Scene_planesCount = 4; // L: 48 - Scene_planeOccluderCounts = new int[Scene_planesCount]; // L: 49 - Scene_planeOccluders = new Occluder[Scene_planesCount][500]; // L: 50 - Scene_currentOccludersCount = 0; // L: 51 - Scene_currentOccluders = new Occluder[500]; // L: 52 - Scene_tilesDeque = new NodeDeque(); // L: 53 - field2306 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; // L: 54 - field2338 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; // L: 55 - field2339 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; // L: 56 - field2323 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; // L: 57 - field2357 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; // L: 58 - field2342 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; // L: 59 - field2343 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; // L: 60 - visibilityMap = new boolean[8][32][51][51]; // L: 86 + Scene_isLowDetail = true; + tileUpdateCount = 0; + Scene_plane = 0; + gameObjects = new GameObject[100]; + checkClick = false; + Scene_selectedPlane = 0; + Scene_selectedScreenX = 0; + Scene_selectedScreenY = 0; + Scene_selectedX = -1; + Scene_selectedY = -1; + viewportWalking = false; + Scene_planesCount = 4; + Scene_planeOccluderCounts = new int[Scene_planesCount]; + Scene_planeOccluders = new Occluder[Scene_planesCount][500]; + Scene_currentOccludersCount = 0; + Scene_currentOccluders = new Occluder[500]; + Scene_tilesDeque = new NodeDeque(); + field2306 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; + field2338 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; + field2339 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; + field2323 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; + field2357 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; + field2342 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; + field2343 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; + visibilityMap = new boolean[8][32][51][51]; } public Scene(int var1, int var2, int var3, int[][][] var4) { - this.minPlane = 0; // L: 14 - this.tempGameObjectsCount = 0; // L: 15 - this.tempGameObjects = new GameObject[5000]; // L: 16 - this.tileShape2D = new int[][]{{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1}, {1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0}, {0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1}, {0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0}, {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0}, {1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1}, {1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1}, {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1}}; // L: 65 - this.tileRotation2D = new int[][]{{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}, {12, 8, 4, 0, 13, 9, 5, 1, 14, 10, 6, 2, 15, 11, 7, 3}, {15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0}, {3, 7, 11, 15, 2, 6, 10, 14, 1, 5, 9, 13, 0, 4, 8, 12}}; // L: 80 - this.planes = var1; // L: 96 - this.xSize = var2; // L: 97 - this.ySize = var3; // L: 98 - this.tiles = new Tile[var1][var2][var3]; // L: 99 - this.field2300 = new int[var1][var2 + 1][var3 + 1]; // L: 100 - this.tileHeights = var4; // L: 101 - this.clear(); // L: 102 - } // L: 103 + this.minPlane = 0; + this.tempGameObjectsCount = 0; + this.tempGameObjects = new GameObject[5000]; + this.tileShape2D = new int[][]{{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1}, {1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0}, {0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1}, {0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0}, {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0}, {1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1}, {1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1}, {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1}}; + this.tileRotation2D = new int[][]{{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}, {12, 8, 4, 0, 13, 9, 5, 1, 14, 10, 6, 2, 15, 11, 7, 3}, {15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0}, {3, 7, 11, 15, 2, 6, 10, 14, 1, 5, 9, 13, 0, 4, 8, 12}}; + this.planes = var1; + this.xSize = var2; + this.ySize = var3; + this.tiles = new Tile[var1][var2][var3]; + this.field2300 = new int[var1][var2 + 1][var3 + 1]; + this.tileHeights = var4; + this.clear(); + } @ObfuscatedName("c") @Export("clear") public void clear() { int var1; int var2; - for (var1 = 0; var1 < this.planes; ++var1) { // L: 106 - for (var2 = 0; var2 < this.xSize; ++var2) { // L: 107 - for (int var3 = 0; var3 < this.ySize; ++var3) { // L: 108 + for (var1 = 0; var1 < this.planes; ++var1) { + for (var2 = 0; var2 < this.xSize; ++var2) { + for (int var3 = 0; var3 < this.ySize; ++var3) { this.tiles[var1][var2][var3] = null; } } } - for (var1 = 0; var1 < Scene_planesCount; ++var1) { // L: 111 - for (var2 = 0; var2 < Scene_planeOccluderCounts[var1]; ++var2) { // L: 112 + for (var1 = 0; var1 < Scene_planesCount; ++var1) { + for (var2 = 0; var2 < Scene_planeOccluderCounts[var1]; ++var2) { Scene_planeOccluders[var1][var2] = null; } - Scene_planeOccluderCounts[var1] = 0; // L: 113 + Scene_planeOccluderCounts[var1] = 0; } - for (var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { // L: 115 - this.tempGameObjects[var1] = null; // L: 116 + for (var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { + this.tempGameObjects[var1] = null; } - this.tempGameObjectsCount = 0; // L: 118 + this.tempGameObjectsCount = 0; - for (var1 = 0; var1 < gameObjects.length; ++var1) { // L: 119 + for (var1 = 0; var1 < gameObjects.length; ++var1) { gameObjects[var1] = null; } - } // L: 120 + } @ObfuscatedName("b") @Export("init") public void init(int var1) { - this.minPlane = var1; // L: 123 + this.minPlane = var1; - for (int var2 = 0; var2 < this.xSize; ++var2) { // L: 124 - for (int var3 = 0; var3 < this.ySize; ++var3) { // L: 125 - if (this.tiles[var1][var2][var3] == null) { // L: 126 + for (int var2 = 0; var2 < this.xSize; ++var2) { + for (int var3 = 0; var3 < this.ySize; ++var3) { + if (this.tiles[var1][var2][var3] == null) { this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); } } } - } // L: 129 + } @ObfuscatedName("p") @Export("setLinkBelow") public void setLinkBelow(int var1, int var2) { - Tile var3 = this.tiles[0][var1][var2]; // L: 132 + Tile var3 = this.tiles[0][var1][var2]; - for (int var4 = 0; var4 < 3; ++var4) { // L: 133 - Tile var5 = this.tiles[var4][var1][var2] = this.tiles[var4 + 1][var1][var2]; // L: 134 - if (var5 != null) { // L: 135 - --var5.plane; // L: 136 + for (int var4 = 0; var4 < 3; ++var4) { + Tile var5 = this.tiles[var4][var1][var2] = this.tiles[var4 + 1][var1][var2]; + if (var5 != null) { + --var5.plane; - for (int var6 = 0; var6 < var5.gameObjectsCount; ++var6) { // L: 137 - GameObject var7 = var5.gameObjects[var6]; // L: 138 - if (ArchiveLoader.method2123(var7.tag) && var7.startX == var1 && var2 == var7.startY) { // L: 139 + for (int var6 = 0; var6 < var5.gameObjectsCount; ++var6) { + GameObject var7 = var5.gameObjects[var6]; + if (ArchiveLoader.method2123(var7.tag) && var7.startX == var1 && var2 == var7.startY) { --var7.plane; } } } } - if (this.tiles[0][var1][var2] == null) { // L: 143 + if (this.tiles[0][var1][var2] == null) { this.tiles[0][var1][var2] = new Tile(0, var1, var2); } - this.tiles[0][var1][var2].linkedBelowTile = var3; // L: 144 - this.tiles[3][var1][var2] = null; // L: 145 - } // L: 146 + this.tiles[0][var1][var2].linkedBelowTile = var3; + this.tiles[3][var1][var2] = null; + } @ObfuscatedName("t") @Export("setTileMinPlane") public void setTileMinPlane(int var1, int var2, int var3, int var4) { - Tile var5 = this.tiles[var1][var2][var3]; // L: 165 - if (var5 != null) { // L: 166 - this.tiles[var1][var2][var3].minPlane = var4; // L: 167 + Tile var5 = this.tiles[var1][var2][var3]; + if (var5 != null) { + this.tiles[var1][var2][var3].minPlane = var4; } - } // L: 168 + } @ObfuscatedName("s") @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: 171 - var21 = new SceneTilePaint(var11, var12, var13, var14, -1, var19, false); // L: 172 + if (var4 == 0) { + var21 = new SceneTilePaint(var11, var12, var13, var14, -1, var19, false); - for (var22 = var1; var22 >= 0; --var22) { // L: 173 + for (var22 = var1; var22 >= 0; --var22) { if (this.tiles[var22][var2][var3] == null) { this.tiles[var22][var2][var3] = new Tile(var22, var2, var3); } } - this.tiles[var1][var2][var3].paint = var21; // L: 174 - } else if (var4 != 1) { // L: 177 - 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 + this.tiles[var1][var2][var3].paint = var21; + } else if (var4 != 1) { + SceneTileModel var23 = new SceneTileModel(var4, var5, var6, var2, var3, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20); - for (var22 = var1; var22 >= 0; --var22) { // L: 184 + for (var22 = var1; var22 >= 0; --var22) { 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: 185 + this.tiles[var1][var2][var3].model = var23; } else { - var21 = new SceneTilePaint(var15, var16, var17, var18, var6, var20, var8 == var7 && var7 == var9 && var10 == var7); // L: 178 + var21 = new SceneTilePaint(var15, var16, var17, var18, var6, var20, var8 == var7 && var7 == var9 && var10 == var7); - for (var22 = var1; var22 >= 0; --var22) { // L: 179 + for (var22 = var1; var22 >= 0; --var22) { if (this.tiles[var22][var2][var3] == null) { this.tiles[var22][var2][var3] = new Tile(var22, var2, var3); } } - this.tiles[var1][var2][var3].paint = var21; // L: 180 + this.tiles[var1][var2][var3].paint = var21; } - } // L: 175 181 186 + } @ObfuscatedName("j") @ObfuscatedSignature( @@ -359,21 +359,21 @@ public class Scene { ) @Export("newFloorDecoration") public void newFloorDecoration(int var1, int var2, int var3, int var4, Renderable var5, long var6, int var8) { - 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.tileHeight = var4; // L: 194 - var9.tag = var6; // L: 195 - var9.flags = var8; // L: 196 - if (this.tiles[var1][var2][var3] == null) { // L: 197 + if (var5 != null) { + FloorDecoration var9 = new FloorDecoration(); + var9.renderable = var5; + var9.x = var2 * 128 + 64; + var9.y = var3 * 128 + 64; + var9.tileHeight = var4; + var9.tag = var6; + var9.flags = var8; + if (this.tiles[var1][var2][var3] == null) { this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); } - this.tiles[var1][var2][var3].floorDecoration = var9; // L: 198 + this.tiles[var1][var2][var3].floorDecoration = var9; } - } // L: 199 + } @ObfuscatedName("w") @ObfuscatedSignature( @@ -381,35 +381,35 @@ public class Scene { ) @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: 202 - var10.first = var5; // L: 203 - var10.x = var2 * 128 + 64; // L: 204 - var10.y = var3 * 128 + 64; // L: 205 - var10.tileHeight = var4; // L: 206 - var10.tag = var6; // L: 207 - var10.second = var8; // L: 208 - var10.third = var9; // L: 209 - int var11 = 0; // L: 210 - Tile var12 = this.tiles[var1][var2][var3]; // L: 211 - if (var12 != null) { // L: 212 - for (int var13 = 0; var13 < var12.gameObjectsCount; ++var13) { // L: 213 - if ((var12.gameObjects[var13].flags & 256) == 256 && var12.gameObjects[var13].renderable instanceof Model) { // L: 214 - Model var14 = (Model)var12.gameObjects[var13].renderable; // L: 215 - var14.calculateBoundsCylinder(); // L: 216 - if (var14.height > var11) { // L: 217 + ItemLayer var10 = new ItemLayer(); + var10.first = var5; + var10.x = var2 * 128 + 64; + var10.y = var3 * 128 + 64; + var10.tileHeight = var4; + var10.tag = var6; + var10.second = var8; + var10.third = var9; + int var11 = 0; + Tile var12 = this.tiles[var1][var2][var3]; + if (var12 != null) { + for (int var13 = 0; var13 < var12.gameObjectsCount; ++var13) { + if ((var12.gameObjects[var13].flags & 256) == 256 && var12.gameObjects[var13].renderable instanceof Model) { + Model var14 = (Model)var12.gameObjects[var13].renderable; + var14.calculateBoundsCylinder(); + if (var14.height > var11) { var11 = var14.height; } } } } - var10.height = var11; // L: 221 + var10.height = var11; if (this.tiles[var1][var2][var3] == null) { - this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); // L: 222 + this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); } - this.tiles[var1][var2][var3].itemLayer = var10; // L: 223 - } // L: 224 + this.tiles[var1][var2][var3].itemLayer = var10; + } @ObfuscatedName("n") @ObfuscatedSignature( @@ -417,27 +417,27 @@ public class Scene { ) @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.tileHeight = var4; // L: 233 - var12.renderable1 = var5; // L: 234 - var12.renderable2 = var6; // L: 235 - var12.orientationA = var7; // L: 236 - var12.orientationB = var8; // L: 237 + if (var5 != null || var6 != null) { + BoundaryObject var12 = new BoundaryObject(); + var12.tag = var9; + var12.flags = var11; + var12.x = var2 * 128 + 64; + var12.y = var3 * 128 + 64; + var12.tileHeight = var4; + var12.renderable1 = var5; + var12.renderable2 = var6; + var12.orientationA = var7; + var12.orientationB = var8; for (int var13 = var1; var13 >= 0; --var13) { if (this.tiles[var13][var2][var3] == null) { - this.tiles[var13][var2][var3] = new Tile(var13, var2, var3); // L: 238 + this.tiles[var13][var2][var3] = new Tile(var13, var2, var3); } } - this.tiles[var1][var2][var3].boundaryObject = var12; // L: 239 + this.tiles[var1][var2][var3].boundaryObject = var12; } - } // L: 240 + } @ObfuscatedName("r") @ObfuscatedSignature( @@ -445,41 +445,41 @@ public class Scene { ) @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.tileHeight = 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 + if (var5 != null) { + WallDecoration var14 = new WallDecoration(); + var14.tag = var11; + var14.flags = var13; + var14.x = var2 * 128 + 64; + var14.y = var3 * 128 + 64; + var14.tileHeight = var4; + var14.renderable1 = var5; + var14.renderable2 = var6; + var14.orientation = var7; + var14.orientation2 = var8; + var14.xOffset = var9; + var14.yOffset = var10; for (int var15 = var1; var15 >= 0; --var15) { if (this.tiles[var15][var2][var3] == null) { - this.tiles[var15][var2][var3] = new Tile(var15, var2, var3); // L: 256 + this.tiles[var15][var2][var3] = new Tile(var15, var2, var3); } } - this.tiles[var1][var2][var3].wallDecoration = var14; // L: 257 + this.tiles[var1][var2][var3].wallDecoration = var14; } - } // L: 258 + } @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(IIIIIILgt;IJI)Z" ) public boolean method3960(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 + if (var7 == null) { return true; } else { - int var12 = var5 * 64 + var2 * 128; // L: 262 - int var13 = var6 * 64 + var3 * 128; // L: 263 - return this.newGameObject(var1, var2, var3, var5, var6, var12, var13, var4, var7, var8, false, var9, var11); // L: 264 + int var12 = var5 * 64 + var2 * 128; + int var13 = var6 * 64 + var3 * 128; + return this.newGameObject(var1, var2, var3, var5, var6, var12, var13, var4, var7, var8, false, var9, var11); } } @@ -489,36 +489,36 @@ public class Scene { ) @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: 268 + if (var6 == null) { return true; } else { - int var11 = var2 - var5; // L: 269 - int var12 = var3 - var5; // L: 270 - int var13 = var5 + var2; // L: 271 - int var14 = var3 + var5; // L: 272 - if (var10) { // L: 273 - if (var7 > 640 && var7 < 1408) { // L: 274 + int var11 = var2 - var5; + int var12 = var3 - var5; + int var13 = var5 + var2; + int var14 = var3 + var5; + if (var10) { + if (var7 > 640 && var7 < 1408) { var14 += 128; } - if (var7 > 1152 && var7 < 1920) { // L: 275 + if (var7 > 1152 && var7 < 1920) { var13 += 128; } - if (var7 > 1664 || var7 < 384) { // L: 276 + if (var7 > 1664 || var7 < 384) { var12 -= 128; } - if (var7 > 128 && var7 < 896) { // L: 277 + if (var7 > 128 && var7 < 896) { var11 -= 128; } } - var11 /= 128; // L: 279 - var12 /= 128; // L: 280 - var13 /= 128; // L: 281 - var14 /= 128; // L: 282 - return this.newGameObject(var1, var11, var12, var13 - var11 + 1, var14 - var12 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 283 + var11 /= 128; + var12 /= 128; + var13 /= 128; + var14 /= 128; + return this.newGameObject(var1, var11, var12, var13 - var11 + 1, var14 - var12 + 1, var2, var3, var4, var6, var7, true, var8, 0); } } @@ -528,7 +528,7 @@ public class Scene { ) @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: 287 288 + return var6 == null ? true : this.newGameObject(var1, var10, var11, var12 - var10 + 1, var13 - var11 + 1, var2, var3, var4, var6, var7, true, var8, 0); } @ObfuscatedName("h") @@ -538,84 +538,84 @@ public class Scene { @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: 292 - for (var16 = var3; var16 < var3 + var5; ++var16) { // L: 293 - if (var15 < 0 || var16 < 0 || var15 >= this.xSize || var16 >= this.ySize) { // L: 294 + for (int var15 = var2; var15 < var2 + var4; ++var15) { + for (var16 = var3; var16 < var3 + var5; ++var16) { + if (var15 < 0 || var16 < 0 || var15 >= this.xSize || var16 >= this.ySize) { return false; } - Tile var23 = this.tiles[var1][var15][var16]; // L: 295 - if (var23 != null && var23.gameObjectsCount >= 5) { // L: 296 + Tile var23 = this.tiles[var1][var15][var16]; + if (var23 != null && var23.gameObjectsCount >= 5) { return false; } } } - GameObject var21 = new GameObject(); // L: 299 - var21.tag = var12; // L: 300 - var21.flags = var14; // L: 301 - var21.plane = var1; // L: 302 - var21.centerX = var6; // L: 303 - var21.centerY = var7; // L: 304 - var21.height = var8; // L: 305 - var21.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 + GameObject var21 = new GameObject(); + var21.tag = var12; + var21.flags = var14; + var21.plane = var1; + var21.centerX = var6; + var21.centerY = var7; + var21.height = var8; + var21.renderable = var9; + var21.orientation = var10; + var21.startX = var2; + var21.startY = var3; + var21.endX = var2 + var4 - 1; + var21.endY = var3 + var5 - 1; - for (var16 = var2; var16 < var2 + var4; ++var16) { // L: 312 - for (int var17 = var3; var17 < var3 + var5; ++var17) { // L: 313 - int var18 = 0; // L: 314 - if (var16 > var2) { // L: 315 + for (var16 = var2; var16 < var2 + var4; ++var16) { + for (int var17 = var3; var17 < var3 + var5; ++var17) { + int var18 = 0; + if (var16 > var2) { ++var18; } - if (var16 < var2 + var4 - 1) { // L: 316 + if (var16 < var2 + var4 - 1) { var18 += 4; } - if (var17 > var3) { // L: 317 + if (var17 > var3) { var18 += 8; } - if (var17 < var3 + var5 - 1) { // L: 318 + if (var17 < var3 + var5 - 1) { var18 += 2; } for (int var19 = var1; var19 >= 0; --var19) { if (this.tiles[var19][var16][var17] == null) { - this.tiles[var19][var16][var17] = new Tile(var19, var16, var17); // L: 319 + this.tiles[var19][var16][var17] = new Tile(var19, var16, var17); } } - Tile var22 = this.tiles[var1][var16][var17]; // L: 320 - var22.gameObjects[var22.gameObjectsCount] = var21; // L: 321 - var22.gameObjectEdgeMasks[var22.gameObjectsCount] = var18; // L: 322 - var22.gameObjectsEdgeMask |= var18; // L: 324 - ++var22.gameObjectsCount; // L: 325 + Tile var22 = this.tiles[var1][var16][var17]; + var22.gameObjects[var22.gameObjectsCount] = var21; + var22.gameObjectEdgeMasks[var22.gameObjectsCount] = var18; + var22.gameObjectsEdgeMask |= var18; + ++var22.gameObjectsCount; } } - if (var11) { // L: 328 + if (var11) { this.tempGameObjects[this.tempGameObjectsCount++] = var21; } - return true; // L: 329 + return true; } @ObfuscatedName("g") @Export("clearTempGameObjects") public void clearTempGameObjects() { - for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { // L: 333 - GameObject var2 = this.tempGameObjects[var1]; // L: 334 - this.removeGameObject(var2); // L: 335 - this.tempGameObjects[var1] = null; // L: 336 + for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { + GameObject var2 = this.tempGameObjects[var1]; + this.removeGameObject(var2); + this.tempGameObjects[var1] = null; } - this.tempGameObjectsCount = 0; // L: 338 - } // L: 339 + this.tempGameObjectsCount = 0; + } @ObfuscatedName("e") @ObfuscatedSignature( @@ -623,107 +623,107 @@ public class Scene { ) @Export("removeGameObject") void removeGameObject(GameObject var1) { - for (int var2 = var1.startX; var2 <= var1.endX; ++var2) { // L: 342 - for (int var3 = var1.startY; var3 <= var1.endY; ++var3) { // L: 343 - Tile var4 = this.tiles[var1.plane][var2][var3]; // L: 344 - if (var4 != null) { // L: 345 + for (int var2 = var1.startX; var2 <= var1.endX; ++var2) { + for (int var3 = var1.startY; var3 <= var1.endY; ++var3) { + Tile var4 = this.tiles[var1.plane][var2][var3]; + if (var4 != null) { int var5; - for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 346 - if (var4.gameObjects[var5] == var1) { // L: 347 - --var4.gameObjectsCount; // L: 348 + for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { + if (var4.gameObjects[var5] == var1) { + --var4.gameObjectsCount; - for (int var6 = var5; var6 < var4.gameObjectsCount; ++var6) { // L: 349 - var4.gameObjects[var6] = var4.gameObjects[var6 + 1]; // L: 350 - var4.gameObjectEdgeMasks[var6] = var4.gameObjectEdgeMasks[var6 + 1]; // L: 351 + for (int var6 = var5; var6 < var4.gameObjectsCount; ++var6) { + var4.gameObjects[var6] = var4.gameObjects[var6 + 1]; + var4.gameObjectEdgeMasks[var6] = var4.gameObjectEdgeMasks[var6 + 1]; } - var4.gameObjects[var4.gameObjectsCount] = null; // L: 353 + var4.gameObjects[var4.gameObjectsCount] = null; break; } } - var4.gameObjectsEdgeMask = 0; // L: 357 + var4.gameObjectsEdgeMask = 0; - for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 358 - var4.gameObjectsEdgeMask |= var4.gameObjectEdgeMasks[var5]; // L: 360 + for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { + var4.gameObjectsEdgeMask |= var4.gameObjectEdgeMasks[var5]; } } } } - } // L: 365 + } @ObfuscatedName("a") public void method3966(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 + Tile var5 = this.tiles[var1][var2][var3]; + if (var5 != null) { + WallDecoration var6 = var5.wallDecoration; + if (var6 != null) { + var6.xOffset = var4 * var6.xOffset / 16; + var6.yOffset = var4 * var6.yOffset / 16; } } - } // L: 374 + } @ObfuscatedName("u") @Export("removeBoundaryObject") public void removeBoundaryObject(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 377 + Tile var4 = this.tiles[var1][var2][var3]; if (var4 != null) { - var4.boundaryObject = null; // L: 379 + var4.boundaryObject = null; } - } // L: 378 380 + } @ObfuscatedName("k") @Export("removeWallDecoration") public void removeWallDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 383 + Tile var4 = this.tiles[var1][var2][var3]; if (var4 != null) { - var4.wallDecoration = null; // L: 385 + var4.wallDecoration = null; } - } // L: 384 386 + } @ObfuscatedName("f") @Export("removeGameObject") public void removeGameObject(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 389 - if (var4 != null) { // L: 390 - for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 391 - GameObject var6 = var4.gameObjects[var5]; // L: 392 - if (ArchiveLoader.method2123(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 393 - this.removeGameObject(var6); // L: 394 - return; // L: 395 + Tile var4 = this.tiles[var1][var2][var3]; + if (var4 != null) { + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { + GameObject var6 = var4.gameObjects[var5]; + if (ArchiveLoader.method2123(var6.tag) && var2 == var6.startX && var3 == var6.startY) { + this.removeGameObject(var6); + return; } } } - } // L: 398 + } @ObfuscatedName("l") @Export("removeFloorDecoration") public void removeFloorDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 401 + Tile var4 = this.tiles[var1][var2][var3]; if (var4 != null) { - var4.floorDecoration = null; // L: 403 + var4.floorDecoration = null; } - } // L: 402 404 + } @ObfuscatedName("q") @Export("removeGroundItemPile") public void removeGroundItemPile(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 407 + Tile var4 = this.tiles[var1][var2][var3]; if (var4 != null) { - var4.itemLayer = null; // L: 409 + var4.itemLayer = null; } - } // L: 408 410 + } @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(III)Lhg;" ) public BoundaryObject method4105(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 413 - return var4 == null ? null : var4.boundaryObject; // L: 414 415 + Tile var4 = this.tiles[var1][var2][var3]; + return var4 == null ? null : var4.boundaryObject; } @ObfuscatedName("z") @@ -731,8 +731,8 @@ public class Scene { descriptor = "(III)Lhp;" ) public WallDecoration method3973(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 419 - return var4 == null ? null : var4.wallDecoration; // L: 420 421 + Tile var4 = this.tiles[var1][var2][var3]; + return var4 == null ? null : var4.wallDecoration; } @ObfuscatedName("i") @@ -741,18 +741,18 @@ public class Scene { ) @Export("getGameObject") public GameObject getGameObject(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 425 - if (var4 == null) { // L: 426 + Tile var4 = this.tiles[var1][var2][var3]; + if (var4 == null) { return null; } else { - for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 427 - GameObject var6 = var4.gameObjects[var5]; // L: 428 - if (ArchiveLoader.method2123(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 429 + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { + GameObject var6 = var4.gameObjects[var5]; + if (ArchiveLoader.method2123(var6.tag) && var2 == var6.startX && var3 == var6.startY) { return var6; } } - return null; // L: 431 + return null; } } @@ -762,115 +762,115 @@ public class Scene { ) @Export("getFloorDecoration") public FloorDecoration getFloorDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 435 - return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; // L: 436 437 + Tile var4 = this.tiles[var1][var2][var3]; + return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; } @ObfuscatedName("ah") @Export("getBoundaryObjectTag") public long getBoundaryObjectTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 441 - return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; // L: 442 443 + Tile var4 = this.tiles[var1][var2][var3]; + return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; } @ObfuscatedName("ao") @Export("getWallDecorationTag") public long getWallDecorationTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 447 - return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; // L: 448 449 + Tile var4 = this.tiles[var1][var2][var3]; + return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; } @ObfuscatedName("ab") @Export("getGameObjectTag") public long getGameObjectTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 453 - if (var4 == null) { // L: 454 + Tile var4 = this.tiles[var1][var2][var3]; + if (var4 == null) { return 0L; } else { - for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 455 - GameObject var6 = var4.gameObjects[var5]; // L: 456 - if (ArchiveLoader.method2123(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 457 + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { + GameObject var6 = var4.gameObjects[var5]; + if (ArchiveLoader.method2123(var6.tag) && var2 == var6.startX && var3 == var6.startY) { return var6.tag; } } - return 0L; // L: 459 + return 0L; } } @ObfuscatedName("an") @Export("getFloorDecorationTag") public long getFloorDecorationTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 463 - return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; // L: 464 465 + Tile var4 = this.tiles[var1][var2][var3]; + return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; } @ObfuscatedName("ax") @Export("getObjectFlags") public int getObjectFlags(int var1, int var2, int var3, long var4) { - Tile var6 = this.tiles[var1][var2][var3]; // L: 469 - if (var6 == null) { // L: 470 + Tile var6 = this.tiles[var1][var2][var3]; + if (var6 == null) { return -1; - } else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) { // L: 471 + } else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) { return var6.boundaryObject.flags & 255; - } else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) { // L: 472 + } else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) { return var6.wallDecoration.flags & 255; - } else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) { // L: 473 + } else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) { return var6.floorDecoration.flags & 255; } else { - for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) { // L: 474 - if (var6.gameObjects[var7].tag == var4) { // L: 475 + for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) { + if (var6.gameObjects[var7].tag == var4) { return var6.gameObjects[var7].flags & 255; } } - return -1; // L: 477 + return -1; } } @ObfuscatedName("am") public void method3981(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 + for (int var4 = 0; var4 < this.planes; ++var4) { + for (int var5 = 0; var5 < this.xSize; ++var5) { + for (int var6 = 0; var6 < this.ySize; ++var6) { + Tile var7 = this.tiles[var4][var5][var6]; + if (var7 != null) { + BoundaryObject var8 = var7.boundaryObject; ModelData var10; - if (var8 != null && var8.renderable1 instanceof ModelData) { // L: 487 - ModelData var9 = (ModelData)var8.renderable1; // L: 488 - this.method3976(var9, var4, var5, var6, 1, 1); // L: 489 - if (var8.renderable2 instanceof ModelData) { // L: 490 - var10 = (ModelData)var8.renderable2; // L: 491 - this.method3976(var10, var4, var5, var6, 1, 1); // L: 492 - ModelData.method3812(var9, var10, 0, 0, 0, false); // L: 493 - var8.renderable2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 494 + if (var8 != null && var8.renderable1 instanceof ModelData) { + ModelData var9 = (ModelData)var8.renderable1; + this.method3976(var9, var4, var5, var6, 1, 1); + if (var8.renderable2 instanceof ModelData) { + var10 = (ModelData)var8.renderable2; + this.method3976(var10, var4, var5, var6, 1, 1); + ModelData.method3812(var9, var10, 0, 0, 0, false); + var8.renderable2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); } - var8.renderable1 = var9.toModel(var9.ambient, var9.contrast, var1, var2, var3); // L: 496 + var8.renderable1 = var9.toModel(var9.ambient, var9.contrast, var1, var2, var3); } - 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.method3976(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 + for (int var12 = 0; var12 < var7.gameObjectsCount; ++var12) { + GameObject var14 = var7.gameObjects[var12]; + if (var14 != null && var14.renderable instanceof ModelData) { + ModelData var11 = (ModelData)var14.renderable; + this.method3976(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); + var14.renderable = var11.toModel(var11.ambient, var11.contrast, var1, var2, var3); } } - FloorDecoration var13 = var7.floorDecoration; // L: 506 - if (var13 != null && var13.renderable instanceof ModelData) { // L: 507 - var10 = (ModelData)var13.renderable; // L: 508 - this.method3982(var10, var4, var5, var6); // L: 509 - var13.renderable = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 510 + FloorDecoration var13 = var7.floorDecoration; + if (var13 != null && var13.renderable instanceof ModelData) { + var10 = (ModelData)var13.renderable; + this.method3982(var10, var4, var5, var6); + var13.renderable = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); } } } } } - } // L: 516 + } @ObfuscatedName("az") @ObfuscatedSignature( @@ -879,81 +879,81 @@ public class Scene { void method3982(ModelData var1, int var2, int var3, int var4) { Tile var5; ModelData var6; - if (var3 < this.xSize) { // L: 519 - var5 = this.tiles[var2][var3 + 1][var4]; // L: 520 - if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 521 - var6 = (ModelData)var5.floorDecoration.renderable; // L: 522 - ModelData.method3812(var1, var6, 128, 0, 0, true); // L: 523 + if (var3 < this.xSize) { + var5 = this.tiles[var2][var3 + 1][var4]; + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { + var6 = (ModelData)var5.floorDecoration.renderable; + ModelData.method3812(var1, var6, 128, 0, 0, true); } } - 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.method3812(var1, var6, 0, 0, 128, true); // L: 530 + if (var4 < this.xSize) { + var5 = this.tiles[var2][var3][var4 + 1]; + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { + var6 = (ModelData)var5.floorDecoration.renderable; + ModelData.method3812(var1, var6, 0, 0, 128, true); } } - 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.method3812(var1, var6, 128, 0, 128, true); // L: 537 + if (var3 < this.xSize && var4 < this.ySize) { + var5 = this.tiles[var2][var3 + 1][var4 + 1]; + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { + var6 = (ModelData)var5.floorDecoration.renderable; + ModelData.method3812(var1, var6, 128, 0, 128, true); } } - 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.method3812(var1, var6, 128, 0, -128, true); // L: 544 + if (var3 < this.xSize && var4 > 0) { + var5 = this.tiles[var2][var3 + 1][var4 - 1]; + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { + var6 = (ModelData)var5.floorDecoration.renderable; + ModelData.method3812(var1, var6, 128, 0, -128, true); } } - } // L: 547 + } @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(Lge;IIIII)V" ) void method3976(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 + boolean var7 = true; + int var8 = var3; + int var9 = var3 + var5; + int var10 = var4 - 1; + int var11 = var4 + var6; - for (int var12 = var2; var12 <= var2 + 1; ++var12) { // L: 555 - if (var12 != this.planes) { // L: 556 - for (int var13 = var8; var13 <= var9; ++var13) { // L: 557 - if (var13 >= 0 && var13 < this.xSize) { // L: 558 - for (int var14 = var10; var14 <= var11; ++var14) { // L: 559 - if (var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) { // L: 560 561 - Tile var15 = this.tiles[var12][var13][var14]; // L: 562 - if (var15 != null) { // L: 563 - int var16 = (this.tileHeights[var12][var13 + 1][var14] + this.tileHeights[var12][var13 + 1][var14 + 1] + this.tileHeights[var12][var13][var14] + this.tileHeights[var12][var13][var14 + 1]) / 4 - (this.tileHeights[var2][var3 + 1][var4] + this.tileHeights[var2][var3][var4] + this.tileHeights[var2][var3 + 1][var4 + 1] + this.tileHeights[var2][var3][var4 + 1]) / 4; // L: 564 - BoundaryObject var17 = var15.boundaryObject; // L: 565 - if (var17 != null) { // L: 566 + for (int var12 = var2; var12 <= var2 + 1; ++var12) { + if (var12 != this.planes) { + for (int var13 = var8; var13 <= var9; ++var13) { + if (var13 >= 0 && var13 < this.xSize) { + for (int var14 = var10; var14 <= var11; ++var14) { + if (var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) { + Tile var15 = this.tiles[var12][var13][var14]; + if (var15 != null) { + int var16 = (this.tileHeights[var12][var13 + 1][var14] + this.tileHeights[var12][var13 + 1][var14 + 1] + this.tileHeights[var12][var13][var14] + this.tileHeights[var12][var13][var14 + 1]) / 4 - (this.tileHeights[var2][var3 + 1][var4] + this.tileHeights[var2][var3][var4] + this.tileHeights[var2][var3 + 1][var4 + 1] + this.tileHeights[var2][var3][var4 + 1]) / 4; + BoundaryObject var17 = var15.boundaryObject; + if (var17 != null) { ModelData var18; - if (var17.renderable1 instanceof ModelData) { // L: 567 - var18 = (ModelData)var17.renderable1; // L: 568 - ModelData.method3812(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 569 + if (var17.renderable1 instanceof ModelData) { + var18 = (ModelData)var17.renderable1; + ModelData.method3812(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); } - if (var17.renderable2 instanceof ModelData) { // L: 571 - var18 = (ModelData)var17.renderable2; // L: 572 - ModelData.method3812(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 573 + if (var17.renderable2 instanceof ModelData) { + var18 = (ModelData)var17.renderable2; + ModelData.method3812(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); } } - 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.method3812(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); // L: 582 + for (int var23 = 0; var23 < var15.gameObjectsCount; ++var23) { + GameObject var19 = var15.gameObjects[var23]; + if (var19 != null && var19.renderable instanceof ModelData) { + ModelData var20 = (ModelData)var19.renderable; + int var21 = var19.endX - var19.startX + 1; + int var22 = var19.endY - var19.startY + 1; + ModelData.method3812(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); } } } @@ -962,179 +962,179 @@ public class Scene { } } - --var8; // L: 587 - var7 = false; // L: 588 + --var8; + var7 = false; } } - } // L: 590 + } @ObfuscatedName("av") @Export("drawTileMinimap") public void drawTileMinimap(int[] var1, int var2, int var3, int var4, int var5, int var6) { - Tile var7 = this.tiles[var4][var5][var6]; // L: 593 - if (var7 != null) { // L: 594 - SceneTilePaint var8 = var7.paint; // L: 595 + Tile var7 = this.tiles[var4][var5][var6]; + if (var7 != null) { + SceneTilePaint var8 = var7.paint; int var10; - if (var8 != null) { // L: 596 - int var18 = var8.rgb; // L: 597 - if (var18 != 0) { // L: 598 - for (var10 = 0; var10 < 4; ++var10) { // L: 599 - var1[var2] = var18; // L: 600 - var1[var2 + 1] = var18; // L: 601 - var1[var2 + 2] = var18; // L: 602 - var1[var2 + 3] = var18; // L: 603 - var2 += var3; // L: 604 + if (var8 != null) { + int var18 = var8.rgb; + if (var18 != 0) { + for (var10 = 0; var10 < 4; ++var10) { + var1[var2] = var18; + var1[var2 + 1] = var18; + var1[var2 + 2] = var18; + var1[var2 + 3] = var18; + var2 += var3; } } } else { - 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 + SceneTileModel var9 = var7.model; + if (var9 != null) { + var10 = var9.shape; + int var11 = var9.rotation; + int var12 = var9.underlayRgb; + int var13 = var9.overlayRgb; + int[] var14 = this.tileShape2D[var10]; + int[] var15 = this.tileRotation2D[var11]; + int var16 = 0; int var17; - if (var12 != 0) { // L: 617 - for (var17 = 0; var17 < 4; ++var17) { // L: 618 - var1[var2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 619 - var1[var2 + 1] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 620 - var1[var2 + 2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 621 - var1[var2 + 3] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 622 - var2 += var3; // L: 623 + if (var12 != 0) { + for (var17 = 0; var17 < 4; ++var17) { + var1[var2] = var14[var15[var16++]] == 0 ? var12 : var13; + var1[var2 + 1] = var14[var15[var16++]] == 0 ? var12 : var13; + var1[var2 + 2] = var14[var15[var16++]] == 0 ? var12 : var13; + var1[var2 + 3] = var14[var15[var16++]] == 0 ? var12 : var13; + var2 += var3; } } else { - for (var17 = 0; var17 < 4; ++var17) { // L: 627 - if (var14[var15[var16++]] != 0) { // L: 628 + for (var17 = 0; var17 < 4; ++var17) { + if (var14[var15[var16++]] != 0) { var1[var2] = var13; } - if (var14[var15[var16++]] != 0) { // L: 629 + if (var14[var15[var16++]] != 0) { var1[var2 + 1] = var13; } - if (var14[var15[var16++]] != 0) { // L: 630 + if (var14[var15[var16++]] != 0) { var1[var2 + 2] = var13; } - if (var14[var15[var16++]] != 0) { // L: 631 + if (var14[var15[var16++]] != 0) { var1[var2 + 3] = var13; } - var2 += var3; // L: 632 + var2 += var3; } } } } } - } // L: 606 635 + } @ObfuscatedName("aj") @Export("menuOpen") public void menuOpen(int var1, int var2, int var3, boolean var4) { - if (!shouldSendWalk() || var4) { // L: 714 - checkClick = true; // L: 715 - viewportWalking = var4; // L: 716 - Scene_selectedPlane = var1; // L: 717 - Scene_selectedScreenX = var2; // L: 718 - Scene_selectedScreenY = var3; // L: 719 - Scene_selectedX = -1; // L: 720 - Scene_selectedY = -1; // L: 721 + if (!shouldSendWalk() || var4) { + checkClick = true; + viewportWalking = var4; + Scene_selectedPlane = var1; + Scene_selectedScreenX = var2; + Scene_selectedScreenY = var3; + Scene_selectedX = -1; + Scene_selectedY = -1; } - } // L: 722 + } @ObfuscatedName("af") @Export("setViewportWalking") public void setViewportWalking() { - viewportWalking = true; // L: 725 - } // L: 726 + viewportWalking = true; + } @ObfuscatedName("al") @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { - if (var1 < 0) { // L: 738 + if (var1 < 0) { var1 = 0; - } else if (var1 >= this.xSize * 128) { // L: 739 + } else if (var1 >= this.xSize * 128) { var1 = this.xSize * 128 - 1; } - if (var3 < 0) { // L: 740 + if (var3 < 0) { var3 = 0; - } else if (var3 >= this.ySize * 128) { // L: 741 + } else if (var3 >= this.ySize * 128) { var3 = this.ySize * 128 - 1; } - if (var4 < 128) { // L: 742 + if (var4 < 128) { var4 = 128; - } else if (var4 > 383) { // L: 743 + } else if (var4 > 383) { var4 = 383; } - ++Scene_drawnCount; // L: 744 - Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 745 - Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var4]; // L: 746 - Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var5]; // L: 747 - Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var5]; // L: 748 - visibleTiles = visibilityMap[(var4 - 128) / 32][var5 / 64]; // L: 749 - Scene_cameraX = var1; // L: 750 - Scene_cameraY = var2; // L: 751 - Scene_cameraZ = var3; // L: 752 - Scene_cameraXTile = var1 / 128; // L: 753 - Scene_cameraYTile = var3 / 128; // L: 754 - Scene_plane = var6; // L: 755 - Scene_cameraXTileMin = Scene_cameraXTile - 25; // L: 756 - if (Scene_cameraXTileMin < 0) { // L: 757 + ++Scene_drawnCount; + Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var4]; + Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var4]; + Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var5]; + Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var5]; + visibleTiles = visibilityMap[(var4 - 128) / 32][var5 / 64]; + Scene_cameraX = var1; + Scene_cameraY = var2; + Scene_cameraZ = var3; + Scene_cameraXTile = var1 / 128; + Scene_cameraYTile = var3 / 128; + Scene_plane = var6; + Scene_cameraXTileMin = Scene_cameraXTile - 25; + if (Scene_cameraXTileMin < 0) { Scene_cameraXTileMin = 0; } - Scene_cameraYTileMin = Scene_cameraYTile - 25; // L: 758 - if (Scene_cameraYTileMin < 0) { // L: 759 + Scene_cameraYTileMin = Scene_cameraYTile - 25; + if (Scene_cameraYTileMin < 0) { Scene_cameraYTileMin = 0; } - Scene_cameraXTileMax = Scene_cameraXTile + 25; // L: 760 - if (Scene_cameraXTileMax > this.xSize) { // L: 761 + Scene_cameraXTileMax = Scene_cameraXTile + 25; + if (Scene_cameraXTileMax > this.xSize) { Scene_cameraXTileMax = this.xSize; } - Scene_cameraYTileMax = Scene_cameraYTile + 25; // L: 762 - if (Scene_cameraYTileMax > this.ySize) { // L: 763 + Scene_cameraYTileMax = Scene_cameraYTile + 25; + if (Scene_cameraYTileMax > this.ySize) { Scene_cameraYTileMax = this.ySize; } - this.occlude(); // L: 764 - tileUpdateCount = 0; // L: 765 + this.occlude(); + tileUpdateCount = 0; int var7; Tile[][] var8; int var9; int var10; - for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 766 - var8 = this.tiles[var7]; // L: 767 + for (var7 = this.minPlane; var7 < this.planes; ++var7) { + var8 = this.tiles[var7]; - 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 + for (var9 = Scene_cameraXTileMin; var9 < Scene_cameraXTileMax; ++var9) { + for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) { + Tile var16 = var8[var9][var10]; + if (var16 != null) { + if (var16.minPlane <= var6 && (visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] || this.tileHeights[var7][var9][var10] - var2 >= 2000)) { + var16.drawPrimary = true; + var16.drawSecondary = true; + if (var16.gameObjectsCount > 0) { var16.drawGameObjects = true; } else { - var16.drawGameObjects = false; // L: 781 + var16.drawGameObjects = false; } - ++tileUpdateCount; // L: 782 + ++tileUpdateCount; } else { - var16.drawPrimary = false; // L: 773 - var16.drawSecondary = false; // L: 774 - var16.drawGameObjectEdges = 0; // L: 775 + var16.drawPrimary = false; + var16.drawSecondary = false; + var16.drawGameObjectEdges = 0; } } } @@ -1146,110 +1146,110 @@ public class Scene { int var13; int var14; Tile var15; - for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 788 - var8 = this.tiles[var7]; // L: 789 + for (var7 = this.minPlane; var7 < this.planes; ++var7) { + var8 = this.tiles[var7]; - 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: 802 - var15 = var8[var10][var14]; // L: 803 - if (var15 != null && var15.drawPrimary) { // L: 804 - this.drawTile(var15, true); - } - } - } - - if (var11 < Scene_cameraXTileMax) { // L: 807 - if (var13 >= Scene_cameraYTileMin) { // L: 808 - var15 = var8[var11][var13]; // L: 809 - if (var15 != null && var15.drawPrimary) { // L: 810 - this.drawTile(var15, true); - } - } - - 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: 817 - checkClick = false; // L: 818 - return; // L: 819 - } - } - } - } - } - - for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 825 - var8 = this.tiles[var7]; // L: 826 - - 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: 839 - var15 = var8[var10][var14]; // L: 840 + for (var9 = -25; var9 <= 0; ++var9) { + var10 = var9 + Scene_cameraXTile; + var11 = Scene_cameraXTile - var9; + if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { + for (var12 = -25; var12 <= 0; ++var12) { + var13 = var12 + Scene_cameraYTile; + var14 = Scene_cameraYTile - var12; + if (var10 >= Scene_cameraXTileMin) { + if (var13 >= Scene_cameraYTileMin) { + var15 = var8[var10][var13]; if (var15 != null && var15.drawPrimary) { - this.drawTile(var15, false); // L: 841 + this.drawTile(var15, true); + } + } + + if (var14 < Scene_cameraYTileMax) { + var15 = var8[var10][var14]; + if (var15 != null && var15.drawPrimary) { + this.drawTile(var15, true); } } } - 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 (var11 < Scene_cameraXTileMax) { + if (var13 >= Scene_cameraYTileMin) { + var15 = var8[var11][var13]; + if (var15 != null && var15.drawPrimary) { + this.drawTile(var15, true); } } - if (var14 < Scene_cameraYTileMax) { // L: 849 - var15 = var8[var11][var14]; // L: 850 - if (var15 != null && var15.drawPrimary) { // L: 851 - this.drawTile(var15, false); + if (var14 < Scene_cameraYTileMax) { + var15 = var8[var11][var14]; + if (var15 != null && var15.drawPrimary) { + this.drawTile(var15, true); } } } - if (tileUpdateCount == 0) { // L: 854 - checkClick = false; // L: 855 - return; // L: 856 + if (tileUpdateCount == 0) { + checkClick = false; + return; } } } } } - checkClick = false; // L: 862 - } // L: 863 + for (var7 = this.minPlane; var7 < this.planes; ++var7) { + var8 = this.tiles[var7]; + + for (var9 = -25; var9 <= 0; ++var9) { + var10 = var9 + Scene_cameraXTile; + var11 = Scene_cameraXTile - var9; + if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { + for (var12 = -25; var12 <= 0; ++var12) { + var13 = var12 + Scene_cameraYTile; + var14 = Scene_cameraYTile - var12; + if (var10 >= Scene_cameraXTileMin) { + if (var13 >= Scene_cameraYTileMin) { + var15 = var8[var10][var13]; + if (var15 != null && var15.drawPrimary) { + this.drawTile(var15, false); + } + } + + if (var14 < Scene_cameraYTileMax) { + var15 = var8[var10][var14]; + if (var15 != null && var15.drawPrimary) { + this.drawTile(var15, false); + } + } + } + + if (var11 < Scene_cameraXTileMax) { + if (var13 >= Scene_cameraYTileMin) { + var15 = var8[var11][var13]; + if (var15 != null && var15.drawPrimary) { + this.drawTile(var15, false); + } + } + + if (var14 < Scene_cameraYTileMax) { + var15 = var8[var11][var14]; + if (var15 != null && var15.drawPrimary) { + this.drawTile(var15, false); + } + } + } + + if (tileUpdateCount == 0) { + checkClick = false; + return; + } + } + } + } + } + + checkClick = false; + } @ObfuscatedName("aa") @ObfuscatedSignature( @@ -1257,7 +1257,7 @@ public class Scene { ) @Export("drawTile") void drawTile(Tile var1, boolean var2) { - Scene_tilesDeque.addFirst(var1); // L: 866 + Scene_tilesDeque.addFirst(var1); while (true) { Tile var3; @@ -1289,227 +1289,227 @@ public class Scene { Tile var36; while (true) { do { - var3 = (Tile)Scene_tilesDeque.removeLast(); // L: 868 - if (var3 == null) { // L: 869 + var3 = (Tile)Scene_tilesDeque.removeLast(); + if (var3 == null) { return; } - } while(!var3.drawSecondary); // L: 870 + } while(!var3.drawSecondary); - var4 = var3.x; // L: 871 - var5 = var3.y; // L: 872 - var6 = var3.plane; // L: 873 - var7 = var3.originalPlane; // L: 874 - var8 = this.tiles[var6]; // L: 875 - if (!var3.drawPrimary) { // L: 876 + var4 = var3.x; + var5 = var3.y; + var6 = var3.plane; + var7 = var3.originalPlane; + var8 = this.tiles[var6]; + if (!var3.drawPrimary) { break; } - if (var2) { // L: 877 - if (var6 > 0) { // L: 878 - var9 = this.tiles[var6 - 1][var4][var5]; // L: 879 - if (var9 != null && var9.drawSecondary) { // L: 880 + if (var2) { + if (var6 > 0) { + var9 = this.tiles[var6 - 1][var4][var5]; + if (var9 != null && var9.drawSecondary) { continue; } } - if (var4 <= Scene_cameraXTile && var4 > Scene_cameraXTileMin) { // L: 882 - var9 = var8[var4 - 1][var5]; // L: 883 - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 1) == 0)) { // L: 884 + if (var4 <= Scene_cameraXTile && var4 > Scene_cameraXTileMin) { + var9 = var8[var4 - 1][var5]; + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 1) == 0)) { continue; } } - if (var4 >= Scene_cameraXTile && var4 < Scene_cameraXTileMax - 1) { // L: 886 - var9 = var8[var4 + 1][var5]; // L: 887 - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 4) == 0)) { // L: 888 + if (var4 >= Scene_cameraXTile && var4 < Scene_cameraXTileMax - 1) { + var9 = var8[var4 + 1][var5]; + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 4) == 0)) { continue; } } - if (var5 <= Scene_cameraYTile && var5 > Scene_cameraYTileMin) { // L: 890 - var9 = var8[var4][var5 - 1]; // L: 891 - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 8) == 0)) { // L: 892 + if (var5 <= Scene_cameraYTile && var5 > Scene_cameraYTileMin) { + var9 = var8[var4][var5 - 1]; + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 8) == 0)) { continue; } } - if (var5 >= Scene_cameraYTile && var5 < Scene_cameraYTileMax - 1) { // L: 894 - var9 = var8[var4][var5 + 1]; // L: 895 - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 2) == 0)) { // L: 896 + if (var5 >= Scene_cameraYTile && var5 < Scene_cameraYTileMax - 1) { + var9 = var8[var4][var5 + 1]; + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 2) == 0)) { continue; } } } else { - var2 = true; // L: 899 + var2 = true; } - var3.drawPrimary = false; // L: 900 - if (var3.linkedBelowTile != null) { // L: 901 - var9 = var3.linkedBelowTile; // L: 902 - if (var9.paint != null) { // L: 903 - if (!this.method3998(0, var4, var5)) { // L: 904 + var3.drawPrimary = false; + if (var3.linkedBelowTile != null) { + var9 = var3.linkedBelowTile; + if (var9.paint != null) { + if (!this.method3998(0, var4, var5)) { this.drawTileUnderlay(var9.paint, 0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - } else if (var9.model != null && !this.method3998(0, var4, var5)) { // L: 906 907 + } else if (var9.model != null && !this.method3998(0, var4, var5)) { this.drawTileOverlay(var9.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - var10 = var9.boundaryObject; // L: 909 - if (var10 != null) { // L: 910 + var10 = var9.boundaryObject; + if (var10 != null) { var10.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag); } - for (var11 = 0; var11 < var9.gameObjectsCount; ++var11) { // L: 911 - var12 = var9.gameObjects[var11]; // L: 912 - if (var12 != null) { // L: 913 + for (var11 = 0; var11 < var9.gameObjectsCount; ++var11) { + var12 = var9.gameObjects[var11]; + if (var12 != null) { var12.renderable.draw(var12.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var12.centerX - Scene_cameraX, var12.height - Scene_cameraY, var12.centerY - Scene_cameraZ, var12.tag); } } } - var20 = false; // L: 916 - if (var3.paint != null) { // L: 917 - if (!this.method3998(var7, var4, var5)) { // L: 918 - var20 = true; // L: 919 - if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { // L: 920 + var20 = false; + if (var3.paint != null) { + if (!this.method3998(var7, var4, var5)) { + var20 = true; + if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { this.drawTileUnderlay(var3.paint, var7, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } } - } else if (var3.model != null && !this.method3998(var7, var4, var5)) { // L: 923 924 - var20 = true; // L: 925 - this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); // L: 926 + } else if (var3.model != null && !this.method3998(var7, var4, var5)) { + var20 = true; + this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - var21 = 0; // L: 929 - var11 = 0; // L: 930 - BoundaryObject var31 = var3.boundaryObject; // L: 931 - WallDecoration var13 = var3.wallDecoration; // L: 932 - if (var31 != null || var13 != null) { // L: 933 - if (var4 == Scene_cameraXTile) { // L: 934 + var21 = 0; + var11 = 0; + BoundaryObject var31 = var3.boundaryObject; + WallDecoration var13 = var3.wallDecoration; + if (var31 != null || var13 != null) { + if (var4 == Scene_cameraXTile) { ++var21; - } else if (Scene_cameraXTile < var4) { // L: 935 + } else if (Scene_cameraXTile < var4) { var21 += 2; } - if (var5 == Scene_cameraYTile) { // L: 936 + if (var5 == Scene_cameraYTile) { var21 += 3; - } else if (Scene_cameraYTile > var5) { // L: 937 + } else if (Scene_cameraYTile > var5) { var21 += 6; } - var11 = field2306[var21]; // L: 938 - var3.field2236 = field2339[var21]; // L: 939 + var11 = field2306[var21]; + var3.field2236 = field2339[var21]; } - if (var31 != null) { // L: 941 - if ((var31.orientationA & field2338[var21]) != 0) { // L: 942 - if (var31.orientationA == 16) { // L: 943 - var3.drawGameObjectEdges = 3; // L: 944 - var3.field2246 = field2323[var21]; // L: 945 - var3.field2247 = 3 - var3.field2246; // L: 946 - } else if (var31.orientationA == 32) { // L: 948 - var3.drawGameObjectEdges = 6; // L: 949 - var3.field2246 = field2357[var21]; // L: 950 - var3.field2247 = 6 - var3.field2246; // L: 951 - } else if (var31.orientationA == 64) { // L: 953 - var3.drawGameObjectEdges = 12; // L: 954 - var3.field2246 = field2342[var21]; // L: 955 - var3.field2247 = 12 - var3.field2246; // L: 956 + if (var31 != null) { + if ((var31.orientationA & field2338[var21]) != 0) { + if (var31.orientationA == 16) { + var3.drawGameObjectEdges = 3; + var3.field2246 = field2323[var21]; + var3.field2247 = 3 - var3.field2246; + } else if (var31.orientationA == 32) { + var3.drawGameObjectEdges = 6; + var3.field2246 = field2357[var21]; + var3.field2247 = 6 - var3.field2246; + } else if (var31.orientationA == 64) { + var3.drawGameObjectEdges = 12; + var3.field2246 = field2342[var21]; + var3.field2247 = 12 - var3.field2246; } else { - var3.drawGameObjectEdges = 9; // L: 959 - var3.field2246 = field2343[var21]; // L: 960 - var3.field2247 = 9 - var3.field2246; // L: 961 + var3.drawGameObjectEdges = 9; + var3.field2246 = field2343[var21]; + var3.field2247 = 9 - var3.field2246; } } else { - var3.drawGameObjectEdges = 0; // L: 964 + var3.drawGameObjectEdges = 0; } - if ((var31.orientationA & var11) != 0 && !this.method3958(var7, var4, var5, var31.orientationA)) { // L: 965 + if ((var31.orientationA & var11) != 0 && !this.method3958(var7, var4, var5, var31.orientationA)) { var31.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); } - if ((var31.orientationB & var11) != 0 && !this.method3958(var7, var4, var5, var31.orientationB)) { // L: 966 + if ((var31.orientationB & var11) != 0 && !this.method3958(var7, var4, var5, var31.orientationB)) { var31.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); } } - if (var13 != null && !this.method4000(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.tileHeight - Scene_cameraY, var13.y - Scene_cameraZ + var13.yOffset, var13.tag); // L: 970 - } else if (var13.orientation == 256) { // L: 972 - var14 = var13.x - Scene_cameraX; // L: 973 - var15 = var13.tileHeight - Scene_cameraY; // L: 974 - var16 = var13.y - Scene_cameraZ; // L: 975 - var17 = var13.orientation2; // L: 976 - if (var17 != 1 && var17 != 2) { // L: 978 - var18 = var14; // L: 979 + if (var13 != null && !this.method4000(var7, var4, var5, var13.renderable1.height)) { + if ((var13.orientation & var11) != 0) { + var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.x - Scene_cameraX + var13.xOffset, var13.tileHeight - Scene_cameraY, var13.y - Scene_cameraZ + var13.yOffset, var13.tag); + } else if (var13.orientation == 256) { + var14 = var13.x - Scene_cameraX; + var15 = var13.tileHeight - Scene_cameraY; + var16 = var13.y - Scene_cameraZ; + var17 = var13.orientation2; + if (var17 != 1 && var17 != 2) { + var18 = var14; } else { var18 = -var14; } int var19; - if (var17 != 2 && var17 != 3) { // L: 981 - var19 = var16; // L: 982 + if (var17 != 2 && var17 != 3) { + var19 = var16; } else { var19 = -var16; } - 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 (var19 < var18) { + var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14 + var13.xOffset, var15, var16 + var13.yOffset, var13.tag); + } else if (var13.renderable2 != null) { + var13.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14, var15, var16, var13.tag); } } } - if (var20) { // L: 991 - FloorDecoration var22 = var3.floorDecoration; // L: 992 - if (var22 != null) { // L: 993 + if (var20) { + FloorDecoration var22 = var3.floorDecoration; + if (var22 != null) { var22.renderable.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var22.x - Scene_cameraX, var22.tileHeight - Scene_cameraY, var22.y - Scene_cameraZ, var22.tag); } - ItemLayer var23 = var3.itemLayer; // L: 994 - if (var23 != null && var23.height == 0) { // L: 995 - if (var23.second != null) { // L: 996 + ItemLayer var23 = var3.itemLayer; + if (var23 != null && var23.height == 0) { + if (var23.second != null) { var23.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); } - if (var23.third != null) { // L: 997 + if (var23.third != null) { var23.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); } - if (var23.first != null) { // L: 998 + if (var23.first != null) { var23.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); } } } - var14 = var3.gameObjectsEdgeMask; // L: 1001 - if (var14 != 0) { // L: 1002 - if (var4 < Scene_cameraXTile && (var14 & 4) != 0) { // L: 1003 - var36 = var8[var4 + 1][var5]; // L: 1004 - if (var36 != null && var36.drawSecondary) { // L: 1005 + var14 = var3.gameObjectsEdgeMask; + if (var14 != 0) { + if (var4 < Scene_cameraXTile && (var14 & 4) != 0) { + var36 = var8[var4 + 1][var5]; + if (var36 != null && var36.drawSecondary) { Scene_tilesDeque.addFirst(var36); } } - if (var5 < Scene_cameraYTile && (var14 & 2) != 0) { // L: 1007 - var36 = var8[var4][var5 + 1]; // L: 1008 - if (var36 != null && var36.drawSecondary) { // L: 1009 + if (var5 < Scene_cameraYTile && (var14 & 2) != 0) { + var36 = var8[var4][var5 + 1]; + if (var36 != null && var36.drawSecondary) { Scene_tilesDeque.addFirst(var36); } } - if (var4 > Scene_cameraXTile && (var14 & 1) != 0) { // L: 1011 - var36 = var8[var4 - 1][var5]; // L: 1012 - if (var36 != null && var36.drawSecondary) { // L: 1013 + if (var4 > Scene_cameraXTile && (var14 & 1) != 0) { + var36 = var8[var4 - 1][var5]; + if (var36 != null && var36.drawSecondary) { Scene_tilesDeque.addFirst(var36); } } - if (var5 > Scene_cameraYTile && (var14 & 8) != 0) { // L: 1015 - var36 = var8[var4][var5 - 1]; // L: 1016 - if (var36 != null && var36.drawSecondary) { // L: 1017 + if (var5 > Scene_cameraYTile && (var14 & 8) != 0) { + var36 = var8[var4][var5 - 1]; + if (var36 != null && var36.drawSecondary) { Scene_tilesDeque.addFirst(var36); } } @@ -1517,264 +1517,264 @@ public class Scene { break; } - if (var3.drawGameObjectEdges != 0) { // L: 1021 - var20 = true; // L: 1022 + if (var3.drawGameObjectEdges != 0) { + var20 = true; - for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { // L: 1023 - if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field2246) { // L: 1024 - var20 = false; // L: 1025 - break; // L: 1026 + for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { + if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field2246) { + var20 = false; + break; } } - if (var20) { // L: 1029 - var10 = var3.boundaryObject; // L: 1030 - if (!this.method3958(var7, var4, var5, var10.orientationA)) { // L: 1031 + if (var20) { + var10 = var3.boundaryObject; + if (!this.method3958(var7, var4, var5, var10.orientationA)) { var10.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag); } - var3.drawGameObjectEdges = 0; // L: 1032 + var3.drawGameObjectEdges = 0; } } - if (!var3.drawGameObjects) { // L: 1035 + if (!var3.drawGameObjects) { break; } try { - int var34 = var3.gameObjectsCount; // L: 1037 - var3.drawGameObjects = false; // L: 1038 - var21 = 0; // L: 1039 + int var34 = var3.gameObjectsCount; + var3.drawGameObjects = false; + var21 = 0; label563: - for (var11 = 0; var11 < var34; ++var11) { // L: 1040 - var12 = var3.gameObjects[var11]; // L: 1041 - if (var12.lastDrawn != Scene_drawnCount) { // L: 1042 - for (var24 = var12.startX; var24 <= var12.endX; ++var24) { // L: 1043 - for (var14 = var12.startY; var14 <= var12.endY; ++var14) { // L: 1044 - var36 = var8[var24][var14]; // L: 1045 - if (var36.drawPrimary) { // L: 1046 - var3.drawGameObjects = true; // L: 1047 - continue label563; // L: 1048 + for (var11 = 0; var11 < var34; ++var11) { + var12 = var3.gameObjects[var11]; + if (var12.lastDrawn != Scene_drawnCount) { + for (var24 = var12.startX; var24 <= var12.endX; ++var24) { + for (var14 = var12.startY; var14 <= var12.endY; ++var14) { + var36 = var8[var24][var14]; + if (var36.drawPrimary) { + var3.drawGameObjects = true; + continue label563; } - if (var36.drawGameObjectEdges != 0) { // L: 1050 - var16 = 0; // L: 1051 - if (var24 > var12.startX) { // L: 1052 + if (var36.drawGameObjectEdges != 0) { + var16 = 0; + if (var24 > var12.startX) { ++var16; } - if (var24 < var12.endX) { // L: 1053 + if (var24 < var12.endX) { var16 += 4; } - if (var14 > var12.startY) { // L: 1054 + if (var14 > var12.startY) { var16 += 8; } - if (var14 < var12.endY) { // L: 1055 + if (var14 < var12.endY) { var16 += 2; } - if ((var16 & var36.drawGameObjectEdges) == var3.field2247) { // L: 1056 - var3.drawGameObjects = true; // L: 1057 - continue label563; // L: 1058 + if ((var16 & var36.drawGameObjectEdges) == var3.field2247) { + var3.drawGameObjects = true; + continue label563; } } } } - gameObjects[var21++] = var12; // L: 1063 - var24 = Scene_cameraXTile - var12.startX; // L: 1064 - var14 = var12.endX - Scene_cameraXTile; // L: 1065 - if (var14 > var24) { // L: 1066 + gameObjects[var21++] = var12; + var24 = Scene_cameraXTile - var12.startX; + var14 = var12.endX - Scene_cameraXTile; + if (var14 > var24) { var24 = var14; } - var15 = Scene_cameraYTile - var12.startY; // L: 1067 - var16 = var12.endY - Scene_cameraYTile; // L: 1068 - if (var16 > var15) { // L: 1069 + var15 = Scene_cameraYTile - var12.startY; + var16 = var12.endY - Scene_cameraYTile; + if (var16 > var15) { var12.field2548 = var24 + var16; } else { - var12.field2548 = var24 + var15; // L: 1070 + var12.field2548 = var24 + var15; } } } - while (var21 > 0) { // L: 1073 - var11 = -50; // L: 1074 - var25 = -1; // L: 1075 + while (var21 > 0) { + var11 = -50; + var25 = -1; - for (var24 = 0; var24 < var21; ++var24) { // L: 1076 - GameObject var35 = gameObjects[var24]; // L: 1077 - if (var35.lastDrawn != Scene_drawnCount) { // L: 1078 - if (var35.field2548 > var11) { // L: 1079 - var11 = var35.field2548; // L: 1080 - var25 = var24; // L: 1081 - } else if (var11 == var35.field2548) { // L: 1083 - var15 = var35.centerX - Scene_cameraX; // L: 1084 - var16 = var35.centerY - Scene_cameraZ; // L: 1085 - var17 = gameObjects[var25].centerX - Scene_cameraX; // L: 1086 - var18 = gameObjects[var25].centerY - Scene_cameraZ; // L: 1087 - if (var15 * var15 + var16 * var16 > var17 * var17 + var18 * var18) { // L: 1088 + for (var24 = 0; var24 < var21; ++var24) { + GameObject var35 = gameObjects[var24]; + if (var35.lastDrawn != Scene_drawnCount) { + if (var35.field2548 > var11) { + var11 = var35.field2548; + var25 = var24; + } else if (var11 == var35.field2548) { + var15 = var35.centerX - Scene_cameraX; + var16 = var35.centerY - Scene_cameraZ; + var17 = gameObjects[var25].centerX - Scene_cameraX; + var18 = gameObjects[var25].centerY - Scene_cameraZ; + if (var15 * var15 + var16 * var16 > var17 * var17 + var18 * var18) { var25 = var24; } } } } - if (var25 == -1) { // L: 1092 + if (var25 == -1) { break; } - GameObject var33 = gameObjects[var25]; // L: 1093 - var33.lastDrawn = Scene_drawnCount; // L: 1094 - if (!this.method4001(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.height - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); // L: 1096 + GameObject var33 = gameObjects[var25]; + var33.lastDrawn = Scene_drawnCount; + if (!this.method4001(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.renderable.height)) { + var33.renderable.draw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.height - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); } - for (var14 = var33.startX; var14 <= var33.endX; ++var14) { // L: 1098 - for (var15 = var33.startY; var15 <= var33.endY; ++var15) { // L: 1099 - Tile var26 = var8[var14][var15]; // L: 1100 - if (var26.drawGameObjectEdges != 0) { // L: 1101 + for (var14 = var33.startX; var14 <= var33.endX; ++var14) { + for (var15 = var33.startY; var15 <= var33.endY; ++var15) { + Tile var26 = var8[var14][var15]; + if (var26.drawGameObjectEdges != 0) { Scene_tilesDeque.addFirst(var26); - } else if ((var14 != var4 || var15 != var5) && var26.drawSecondary) { // L: 1102 + } else if ((var14 != var4 || var15 != var5) && var26.drawSecondary) { Scene_tilesDeque.addFirst(var26); } } } } - if (!var3.drawGameObjects) { // L: 1106 + if (!var3.drawGameObjects) { break; } - } catch (Exception var28) { // L: 1108 - var3.drawGameObjects = false; // L: 1109 + } catch (Exception var28) { + var3.drawGameObjects = false; break; } } - } while(!var3.drawSecondary); // L: 1112 - } while(var3.drawGameObjectEdges != 0); // L: 1113 + } while(!var3.drawSecondary); + } while(var3.drawGameObjectEdges != 0); - if (var4 > Scene_cameraXTile || var4 <= Scene_cameraXTileMin) { // L: 1114 + if (var4 > Scene_cameraXTile || var4 <= Scene_cameraXTileMin) { break; } - var9 = var8[var4 - 1][var5]; // L: 1115 - } while(var9 != null && var9.drawSecondary); // L: 1116 + var9 = var8[var4 - 1][var5]; + } while(var9 != null && var9.drawSecondary); - if (var4 < Scene_cameraXTile || var4 >= Scene_cameraXTileMax - 1) { // L: 1118 + if (var4 < Scene_cameraXTile || var4 >= Scene_cameraXTileMax - 1) { break; } - var9 = var8[var4 + 1][var5]; // L: 1119 - } while(var9 != null && var9.drawSecondary); // L: 1120 + var9 = var8[var4 + 1][var5]; + } while(var9 != null && var9.drawSecondary); - if (var5 > Scene_cameraYTile || var5 <= Scene_cameraYTileMin) { // L: 1122 + if (var5 > Scene_cameraYTile || var5 <= Scene_cameraYTileMin) { break; } - var9 = var8[var4][var5 - 1]; // L: 1123 - } while(var9 != null && var9.drawSecondary); // L: 1124 + var9 = var8[var4][var5 - 1]; + } while(var9 != null && var9.drawSecondary); - if (var5 < Scene_cameraYTile || var5 >= Scene_cameraYTileMax - 1) { // L: 1126 + if (var5 < Scene_cameraYTile || var5 >= Scene_cameraYTileMax - 1) { break; } - var9 = var8[var4][var5 + 1]; // L: 1127 - } while(var9 != null && var9.drawSecondary); // L: 1128 + var9 = var8[var4][var5 + 1]; + } while(var9 != null && var9.drawSecondary); - 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 + var3.drawSecondary = false; + --tileUpdateCount; + ItemLayer var32 = var3.itemLayer; + if (var32 != null && var32.height != 0) { + if (var32.second != null) { var32.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag); } - if (var32.third != null) { // L: 1135 + if (var32.third != null) { var32.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag); } - if (var32.first != null) { // L: 1136 + if (var32.first != null) { var32.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag); } } - if (var3.field2236 != 0) { // L: 1138 - WallDecoration var29 = var3.wallDecoration; // L: 1139 - if (var29 != null && !this.method4000(var7, var4, var5, var29.renderable1.height)) { // L: 1140 - if ((var29.orientation & var3.field2236) != 0) { // L: 1141 - var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.tileHeight - Scene_cameraY, var29.y - Scene_cameraZ + var29.yOffset, var29.tag); // L: 1142 - } else if (var29.orientation == 256) { // L: 1144 - var11 = var29.x - Scene_cameraX; // L: 1145 - var25 = var29.tileHeight - Scene_cameraY; // L: 1146 - var24 = var29.y - Scene_cameraZ; // L: 1147 - var14 = var29.orientation2; // L: 1148 - if (var14 != 1 && var14 != 2) { // L: 1150 - var15 = var11; // L: 1151 + if (var3.field2236 != 0) { + WallDecoration var29 = var3.wallDecoration; + if (var29 != null && !this.method4000(var7, var4, var5, var29.renderable1.height)) { + if ((var29.orientation & var3.field2236) != 0) { + var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.tileHeight - Scene_cameraY, var29.y - Scene_cameraZ + var29.yOffset, var29.tag); + } else if (var29.orientation == 256) { + var11 = var29.x - Scene_cameraX; + var25 = var29.tileHeight - Scene_cameraY; + var24 = var29.y - Scene_cameraZ; + var14 = var29.orientation2; + if (var14 != 1 && var14 != 2) { + var15 = var11; } else { var15 = -var11; } - if (var14 != 2 && var14 != 3) { // L: 1153 - var16 = var24; // L: 1154 + if (var14 != 2 && var14 != 3) { + var16 = var24; } else { var16 = -var24; } - 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 + if (var16 >= var15) { + var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var29.xOffset, var25, var24 + var29.yOffset, var29.tag); + } else if (var29.renderable2 != null) { + var29.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var25, var24, var29.tag); } } } - BoundaryObject var27 = var3.boundaryObject; // L: 1163 - if (var27 != null) { // L: 1164 - if ((var27.orientationB & var3.field2236) != 0 && !this.method3958(var7, var4, var5, var27.orientationB)) { // L: 1165 + BoundaryObject var27 = var3.boundaryObject; + if (var27 != null) { + if ((var27.orientationB & var3.field2236) != 0 && !this.method3958(var7, var4, var5, var27.orientationB)) { var27.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag); } - if ((var27.orientationA & var3.field2236) != 0 && !this.method3958(var7, var4, var5, var27.orientationA)) { // L: 1166 + if ((var27.orientationA & var3.field2236) != 0 && !this.method3958(var7, var4, var5, var27.orientationA)) { var27.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag); } } } Tile var30; - if (var6 < this.planes - 1) { // L: 1169 - var30 = this.tiles[var6 + 1][var4][var5]; // L: 1170 - if (var30 != null && var30.drawSecondary) { // L: 1171 + if (var6 < this.planes - 1) { + var30 = this.tiles[var6 + 1][var4][var5]; + if (var30 != null && var30.drawSecondary) { Scene_tilesDeque.addFirst(var30); } } - if (var4 < Scene_cameraXTile) { // L: 1173 - var30 = var8[var4 + 1][var5]; // L: 1174 - if (var30 != null && var30.drawSecondary) { // L: 1175 + if (var4 < Scene_cameraXTile) { + var30 = var8[var4 + 1][var5]; + if (var30 != null && var30.drawSecondary) { Scene_tilesDeque.addFirst(var30); } } - if (var5 < Scene_cameraYTile) { // L: 1177 - var30 = var8[var4][var5 + 1]; // L: 1178 - if (var30 != null && var30.drawSecondary) { // L: 1179 + if (var5 < Scene_cameraYTile) { + var30 = var8[var4][var5 + 1]; + if (var30 != null && var30.drawSecondary) { Scene_tilesDeque.addFirst(var30); } } - if (var4 > Scene_cameraXTile) { // L: 1181 - var30 = var8[var4 - 1][var5]; // L: 1182 - if (var30 != null && var30.drawSecondary) { // L: 1183 + if (var4 > Scene_cameraXTile) { + var30 = var8[var4 - 1][var5]; + if (var30 != null && var30.drawSecondary) { Scene_tilesDeque.addFirst(var30); } } - if (var5 > Scene_cameraYTile) { // L: 1185 - var30 = var8[var4][var5 - 1]; // L: 1186 - if (var30 != null && var30.drawSecondary) { // L: 1187 + if (var5 > Scene_cameraYTile) { + var30 = var8[var4][var5 - 1]; + if (var30 != null && var30.drawSecondary) { Scene_tilesDeque.addFirst(var30); } } @@ -1788,101 +1788,101 @@ public class Scene { @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: 1195 + int var10 = var9 = (var7 << 7) - Scene_cameraX; int var11; - int var12 = var11 = (var8 << 7) - Scene_cameraZ; // L: 1197 + int var12 = var11 = (var8 << 7) - Scene_cameraZ; int var13; - int var14 = var13 = var10 + 128; // L: 1199 + int var14 = var13 = var10 + 128; int var15; - int var16 = var15 = var12 + 128; // L: 1201 - int var17 = this.tileHeights[var2][var7][var8] - Scene_cameraY; // L: 1202 - int var18 = this.tileHeights[var2][var7 + 1][var8] - Scene_cameraY; // L: 1203 - int var19 = this.tileHeights[var2][var7 + 1][var8 + 1] - Scene_cameraY; // L: 1204 - int var20 = this.tileHeights[var2][var7][var8 + 1] - Scene_cameraY; // L: 1205 - int var21 = var10 * var6 + var5 * var12 >> 16; // L: 1206 - var12 = var12 * var6 - var5 * var10 >> 16; // L: 1207 - var10 = var21; // L: 1208 - var21 = var17 * var4 - var3 * var12 >> 16; // L: 1209 - var12 = var3 * var17 + var12 * var4 >> 16; // L: 1210 - var17 = var21; // L: 1211 - if (var12 >= 50) { // L: 1212 - var21 = var14 * var6 + var5 * var11 >> 16; // L: 1213 - var11 = var11 * var6 - var5 * var14 >> 16; // L: 1214 - var14 = var21; // L: 1215 - var21 = var18 * var4 - var3 * var11 >> 16; // L: 1216 - var11 = var3 * var18 + var11 * var4 >> 16; // L: 1217 - var18 = var21; // L: 1218 - if (var11 >= 50) { // L: 1219 - var21 = var13 * var6 + var5 * var16 >> 16; // L: 1220 - var16 = var16 * var6 - var5 * var13 >> 16; // L: 1221 - var13 = var21; // L: 1222 - var21 = var19 * var4 - var3 * var16 >> 16; // L: 1223 - var16 = var3 * var19 + var16 * var4 >> 16; // L: 1224 - var19 = var21; // L: 1225 - if (var16 >= 50) { // L: 1226 - var21 = var9 * var6 + var5 * var15 >> 16; // L: 1227 - var15 = var15 * var6 - var5 * var9 >> 16; // L: 1228 - var9 = var21; // L: 1229 - var21 = var20 * var4 - var3 * var15 >> 16; // L: 1230 - var15 = var3 * var20 + var15 * var4 >> 16; // L: 1231 - if (var15 >= 50) { // L: 1233 - int var22 = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1234 - int var23 = var17 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1235 - int var24 = var14 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1236 - int var25 = var18 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1237 - int var26 = var13 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1238 - int var27 = var19 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1239 - int var28 = var9 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1240 - int var29 = var21 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1241 - Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1242 + int var16 = var15 = var12 + 128; + int var17 = this.tileHeights[var2][var7][var8] - Scene_cameraY; + int var18 = this.tileHeights[var2][var7 + 1][var8] - Scene_cameraY; + int var19 = this.tileHeights[var2][var7 + 1][var8 + 1] - Scene_cameraY; + int var20 = this.tileHeights[var2][var7][var8 + 1] - Scene_cameraY; + int var21 = var10 * var6 + var5 * var12 >> 16; + var12 = var12 * var6 - var5 * var10 >> 16; + var10 = var21; + var21 = var17 * var4 - var3 * var12 >> 16; + var12 = var3 * var17 + var12 * var4 >> 16; + var17 = var21; + if (var12 >= 50) { + var21 = var14 * var6 + var5 * var11 >> 16; + var11 = var11 * var6 - var5 * var14 >> 16; + var14 = var21; + var21 = var18 * var4 - var3 * var11 >> 16; + var11 = var3 * var18 + var11 * var4 >> 16; + var18 = var21; + if (var11 >= 50) { + var21 = var13 * var6 + var5 * var16 >> 16; + var16 = var16 * var6 - var5 * var13 >> 16; + var13 = var21; + var21 = var19 * var4 - var3 * var16 >> 16; + var16 = var3 * var19 + var16 * var4 >> 16; + var19 = var21; + if (var16 >= 50) { + var21 = var9 * var6 + var5 * var15 >> 16; + var15 = var15 * var6 - var5 * var9 >> 16; + var9 = var21; + var21 = var20 * var4 - var3 * var15 >> 16; + var15 = var3 * var20 + var15 * var4 >> 16; + if (var15 >= 50) { + int var22 = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; + int var23 = var17 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; + int var24 = var14 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidX; + int var25 = var18 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidY; + int var26 = var13 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidX; + int var27 = var19 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidY; + int var28 = var9 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidX; + int var29 = var21 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidY; + Rasterizer3D.Rasterizer3D_alpha = 0; int var30; - if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { // L: 1243 - Rasterizer3D.field2253 = false; // L: 1244 - if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1245 + if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { + Rasterizer3D.field2253 = false; + if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { Rasterizer3D.field2253 = true; } - if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { // L: 1246 - Scene_selectedX = var7; // L: 1247 - Scene_selectedY = var8; // L: 1248 + if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { + Scene_selectedX = var7; + Scene_selectedY = var8; } - if (var1.texture == -1) { // L: 1250 - if (var1.neColor != 12345678) { // L: 1251 + if (var1.texture == -1) { + if (var1.neColor != 12345678) { Rasterizer3D.method3854(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); } - } else if (!Scene_isLowDetail) { // L: 1253 - if (var1.isFlat) { // L: 1254 + } else if (!Scene_isLowDetail) { + if (var1.isFlat) { Rasterizer3D.drawTexturedTile(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); } else { - Rasterizer3D.drawTexturedTile(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture); // L: 1255 + Rasterizer3D.drawTexturedTile(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture); } } else { - var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1258 - Rasterizer3D.method3854(var27, var29, var25, var26, var28, var24, method4073(var30, var1.neColor), method4073(var30, var1.nwColor), method4073(var30, var1.seColor)); // L: 1259 + var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); + Rasterizer3D.method3854(var27, var29, var25, var26, var28, var24, method4073(var30, var1.neColor), method4073(var30, var1.nwColor), method4073(var30, var1.seColor)); } } - if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { // L: 1262 - Rasterizer3D.field2253 = false; // L: 1263 - if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1264 + if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { + Rasterizer3D.field2253 = false; + if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { Rasterizer3D.field2253 = true; } - if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { // L: 1265 - Scene_selectedX = var7; // L: 1266 - Scene_selectedY = var8; // L: 1267 + if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { + Scene_selectedX = var7; + Scene_selectedY = var8; } - if (var1.texture == -1) { // L: 1269 - if (var1.swColor != 12345678) { // L: 1270 + if (var1.texture == -1) { + if (var1.swColor != 12345678) { Rasterizer3D.method3854(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor); } - } else if (!Scene_isLowDetail) { // L: 1272 - Rasterizer3D.drawTexturedTile(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); // L: 1273 + } else if (!Scene_isLowDetail) { + Rasterizer3D.drawTexturedTile(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); } else { - var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1276 - Rasterizer3D.method3854(var23, var25, var29, var22, var24, var28, method4073(var30, var1.swColor), method4073(var30, var1.seColor), method4073(var30, var1.nwColor)); // L: 1277 + var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); + Rasterizer3D.method3854(var23, var25, var29, var22, var24, var28, method4073(var30, var1.swColor), method4073(var30, var1.seColor), method4073(var30, var1.nwColor)); } } @@ -1890,7 +1890,7 @@ public class Scene { } } } - } // L: 1280 + } @ObfuscatedName("at") @ObfuscatedSignature( @@ -1898,413 +1898,413 @@ public class Scene { ) @Export("drawTileOverlay") void drawTileOverlay(SceneTileModel var1, int var2, int var3, int var4, int var5, int var6, int var7) { - int var8 = var1.vertexX.length; // L: 1283 + int var8 = var1.vertexX.length; int var9; int var10; int var11; int var12; int var13; - for (var9 = 0; var9 < var8; ++var9) { // L: 1284 - var10 = var1.vertexX[var9] - Scene_cameraX; // L: 1285 - var11 = var1.vertexY[var9] - Scene_cameraY; // L: 1286 - var12 = var1.vertexZ[var9] - Scene_cameraZ; // L: 1287 - var13 = var12 * var4 + var5 * var10 >> 16; // L: 1288 - var12 = var5 * var12 - var10 * var4 >> 16; // L: 1289 - var10 = var13; // L: 1290 - var13 = var3 * var11 - var12 * var2 >> 16; // L: 1291 - var12 = var11 * var2 + var3 * var12 >> 16; // L: 1292 - if (var12 < 50) { // L: 1294 + for (var9 = 0; var9 < var8; ++var9) { + var10 = var1.vertexX[var9] - Scene_cameraX; + var11 = var1.vertexY[var9] - Scene_cameraY; + var12 = var1.vertexZ[var9] - Scene_cameraZ; + var13 = var12 * var4 + var5 * var10 >> 16; + var12 = var5 * var12 - var10 * var4 >> 16; + var10 = var13; + var13 = var3 * var11 - var12 * var2 >> 16; + var12 = var11 * var2 + var3 * var12 >> 16; + if (var12 < 50) { return; } - if (var1.triangleTextureId != null) { // L: 1295 - SceneTileModel.field2414[var9] = var10; // L: 1296 - SceneTileModel.field2415[var9] = var13; // L: 1297 - SceneTileModel.field2416[var9] = var12; // L: 1298 + if (var1.triangleTextureId != null) { + SceneTileModel.field2414[var9] = var10; + SceneTileModel.field2415[var9] = var13; + SceneTileModel.field2416[var9] = var12; } - SceneTileModel.field2399[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1300 - SceneTileModel.field2413[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1301 + SceneTileModel.field2399[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; + SceneTileModel.field2413[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; } - Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1303 - var8 = var1.faceX.length; // L: 1304 + Rasterizer3D.Rasterizer3D_alpha = 0; + var8 = var1.faceX.length; - 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.field2399[var10]; // L: 1309 - int var14 = SceneTileModel.field2399[var11]; // L: 1310 - int var15 = SceneTileModel.field2399[var12]; // L: 1311 - int var16 = SceneTileModel.field2413[var10]; // L: 1312 - int var17 = SceneTileModel.field2413[var11]; // L: 1313 - int var18 = SceneTileModel.field2413[var12]; // L: 1314 - if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { // L: 1315 - Rasterizer3D.field2253 = false; // L: 1316 - if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1317 + for (var9 = 0; var9 < var8; ++var9) { + var10 = var1.faceX[var9]; + var11 = var1.faceY[var9]; + var12 = var1.faceZ[var9]; + var13 = SceneTileModel.field2399[var10]; + int var14 = SceneTileModel.field2399[var11]; + int var15 = SceneTileModel.field2399[var12]; + int var16 = SceneTileModel.field2413[var10]; + int var17 = SceneTileModel.field2413[var11]; + int var18 = SceneTileModel.field2413[var12]; + if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { + Rasterizer3D.field2253 = false; + if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { Rasterizer3D.field2253 = true; } - if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { // L: 1318 - Scene_selectedX = var6; // L: 1319 - Scene_selectedY = var7; // L: 1320 + if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { + Scene_selectedX = var6; + Scene_selectedY = var7; } - if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) { // L: 1322 - if (!Scene_isLowDetail) { // L: 1326 - if (var1.isFlat) { // L: 1327 + if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) { + if (!Scene_isLowDetail) { + if (var1.isFlat) { Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2414[0], SceneTileModel.field2414[1], SceneTileModel.field2414[3], SceneTileModel.field2415[0], SceneTileModel.field2415[1], SceneTileModel.field2415[3], SceneTileModel.field2416[0], SceneTileModel.field2416[1], SceneTileModel.field2416[3], var1.triangleTextureId[var9]); } else { - Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2414[var10], SceneTileModel.field2414[var11], SceneTileModel.field2414[var12], SceneTileModel.field2415[var10], SceneTileModel.field2415[var11], SceneTileModel.field2415[var12], SceneTileModel.field2416[var10], SceneTileModel.field2416[var11], SceneTileModel.field2416[var12], var1.triangleTextureId[var9]); // L: 1328 + Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2414[var10], SceneTileModel.field2414[var11], SceneTileModel.field2414[var12], SceneTileModel.field2415[var10], SceneTileModel.field2415[var11], SceneTileModel.field2415[var12], SceneTileModel.field2416[var10], SceneTileModel.field2416[var11], SceneTileModel.field2416[var12], var1.triangleTextureId[var9]); } } else { - int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); // L: 1331 - Rasterizer3D.method3854(var16, var17, var18, var13, var14, var15, method4073(var19, var1.triangleColorA[var9]), method4073(var19, var1.triangleColorB[var9]), method4073(var19, var1.triangleColorC[var9])); // L: 1332 + int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); + Rasterizer3D.method3854(var16, var17, var18, var13, var14, var15, method4073(var19, var1.triangleColorA[var9]), method4073(var19, var1.triangleColorB[var9]), method4073(var19, var1.triangleColorC[var9])); } - } else if (var1.triangleColorA[var9] != 12345678) { // L: 1323 + } else if (var1.triangleColorA[var9] != 12345678) { Rasterizer3D.method3854(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); } } } - } // L: 1337 + } @ObfuscatedName("aw") @Export("occlude") void occlude() { - int var1 = Scene_planeOccluderCounts[Scene_plane]; // L: 1364 - Occluder[] var2 = Scene_planeOccluders[Scene_plane]; // L: 1365 - Scene_currentOccludersCount = 0; // L: 1366 + int var1 = Scene_planeOccluderCounts[Scene_plane]; + Occluder[] var2 = Scene_planeOccluders[Scene_plane]; + Scene_currentOccludersCount = 0; - for (int var3 = 0; var3 < var1; ++var3) { // L: 1367 - Occluder var4 = var2[var3]; // L: 1368 + for (int var3 = 0; var3 < var1; ++var3) { + Occluder var4 = var2[var3]; int var5; int var6; int var7; int var9; boolean var13; - if (var4.type == 1) { // L: 1369 - var5 = var4.minTileX - Scene_cameraXTile + 25; // L: 1370 - if (var5 >= 0 && var5 <= 50) { // L: 1371 - var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1372 - if (var6 < 0) { // L: 1373 + if (var4.type == 1) { + var5 = var4.minTileX - Scene_cameraXTile + 25; + if (var5 >= 0 && var5 <= 50) { + var6 = var4.minTileY - Scene_cameraYTile + 25; + if (var6 < 0) { var6 = 0; } - var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1374 - if (var7 > 50) { // L: 1375 + var7 = var4.maxTileY - Scene_cameraYTile + 25; + if (var7 > 50) { var7 = 50; } - var13 = false; // L: 1376 + var13 = false; - while (var6 <= var7) { // L: 1377 - if (visibleTiles[var5][var6++]) { // L: 1378 - var13 = true; // L: 1379 + while (var6 <= var7) { + if (visibleTiles[var5][var6++]) { + var13 = true; break; } } - if (var13) { // L: 1383 - var9 = Scene_cameraX - var4.minX; // L: 1384 - if (var9 > 32) { // L: 1385 + if (var13) { + var9 = Scene_cameraX - var4.minX; + if (var9 > 32) { var4.field2378 = 1; } else { - if (var9 >= -32) { // L: 1386 + if (var9 >= -32) { continue; } - var4.field2378 = 2; // L: 1387 - var9 = -var9; // L: 1388 + var4.field2378 = 2; + var9 = -var9; } - var4.field2381 = (var4.minZ - Scene_cameraZ << 8) / var9; // L: 1391 - var4.field2368 = (var4.maxZ - Scene_cameraZ << 8) / var9; // L: 1392 - var4.field2383 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1393 - var4.field2367 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1394 - Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1395 + var4.field2381 = (var4.minZ - Scene_cameraZ << 8) / var9; + var4.field2368 = (var4.maxZ - Scene_cameraZ << 8) / var9; + var4.field2383 = (var4.minY - Scene_cameraY << 8) / var9; + var4.field2367 = (var4.maxY - Scene_cameraY << 8) / var9; + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } - } else if (var4.type == 2) { // L: 1398 - var5 = var4.minTileY - Scene_cameraYTile + 25; // L: 1399 - if (var5 >= 0 && var5 <= 50) { // L: 1400 - var6 = var4.minTileX - Scene_cameraXTile + 25; // L: 1401 - if (var6 < 0) { // L: 1402 + } else if (var4.type == 2) { + var5 = var4.minTileY - Scene_cameraYTile + 25; + if (var5 >= 0 && var5 <= 50) { + var6 = var4.minTileX - Scene_cameraXTile + 25; + if (var6 < 0) { var6 = 0; } - var7 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1403 - if (var7 > 50) { // L: 1404 + var7 = var4.maxTileX - Scene_cameraXTile + 25; + if (var7 > 50) { var7 = 50; } - var13 = false; // L: 1405 + var13 = false; - while (var6 <= var7) { // L: 1406 - if (visibleTiles[var6++][var5]) { // L: 1407 - var13 = true; // L: 1408 + while (var6 <= var7) { + if (visibleTiles[var6++][var5]) { + var13 = true; break; } } - if (var13) { // L: 1412 - var9 = Scene_cameraZ - var4.minZ; // L: 1413 - if (var9 > 32) { // L: 1414 + if (var13) { + var9 = Scene_cameraZ - var4.minZ; + if (var9 > 32) { var4.field2378 = 3; } else { - if (var9 >= -32) { // L: 1415 + if (var9 >= -32) { continue; } - var4.field2378 = 4; // L: 1416 - var9 = -var9; // L: 1417 + var4.field2378 = 4; + var9 = -var9; } - var4.field2369 = (var4.minX - Scene_cameraX << 8) / var9; // L: 1420 - var4.field2380 = (var4.maxX - Scene_cameraX << 8) / var9; // L: 1421 - var4.field2383 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1422 - var4.field2367 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1423 - Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1424 + var4.field2369 = (var4.minX - Scene_cameraX << 8) / var9; + var4.field2380 = (var4.maxX - Scene_cameraX << 8) / var9; + var4.field2383 = (var4.minY - Scene_cameraY << 8) / var9; + var4.field2367 = (var4.maxY - Scene_cameraY << 8) / var9; + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } - } else if (var4.type == 4) { // L: 1427 - var5 = var4.minY - Scene_cameraY; // L: 1428 - if (var5 > 128) { // L: 1429 - var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1430 - if (var6 < 0) { // L: 1431 + } else if (var4.type == 4) { + var5 = var4.minY - Scene_cameraY; + if (var5 > 128) { + var6 = var4.minTileY - Scene_cameraYTile + 25; + if (var6 < 0) { var6 = 0; } - var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1432 - if (var7 > 50) { // L: 1433 + var7 = var4.maxTileY - Scene_cameraYTile + 25; + if (var7 > 50) { var7 = 50; } - if (var6 <= var7) { // L: 1434 - int var8 = var4.minTileX - Scene_cameraXTile + 25; // L: 1435 - if (var8 < 0) { // L: 1436 + if (var6 <= var7) { + int var8 = var4.minTileX - Scene_cameraXTile + 25; + if (var8 < 0) { var8 = 0; } - var9 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1437 - if (var9 > 50) { // L: 1438 + var9 = var4.maxTileX - Scene_cameraXTile + 25; + if (var9 > 50) { var9 = 50; } - boolean var10 = false; // L: 1439 + boolean var10 = false; label150: - for (int var11 = var8; var11 <= var9; ++var11) { // L: 1440 - for (int var12 = var6; var12 <= var7; ++var12) { // L: 1441 - if (visibleTiles[var11][var12]) { // L: 1442 - var10 = true; // L: 1443 + for (int var11 = var8; var11 <= var9; ++var11) { + for (int var12 = var6; var12 <= var7; ++var12) { + if (visibleTiles[var11][var12]) { + var10 = true; break label150; } } } - if (var10) { // L: 1448 - var4.field2378 = 5; // L: 1449 - var4.field2369 = (var4.minX - Scene_cameraX << 8) / var5; // L: 1450 - var4.field2380 = (var4.maxX - Scene_cameraX << 8) / var5; // L: 1451 - var4.field2381 = (var4.minZ - Scene_cameraZ << 8) / var5; // L: 1452 - var4.field2368 = (var4.maxZ - Scene_cameraZ << 8) / var5; // L: 1453 - Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1454 + if (var10) { + var4.field2378 = 5; + var4.field2369 = (var4.minX - Scene_cameraX << 8) / var5; + var4.field2380 = (var4.maxX - Scene_cameraX << 8) / var5; + var4.field2381 = (var4.minZ - Scene_cameraZ << 8) / var5; + var4.field2368 = (var4.maxZ - Scene_cameraZ << 8) / var5; + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } } } } - } // L: 1458 + } @ObfuscatedName("ay") boolean method3998(int var1, int var2, int var3) { - int var4 = this.field2300[var1][var2][var3]; // L: 1461 - if (var4 == -Scene_drawnCount) { // L: 1462 + int var4 = this.field2300[var1][var2][var3]; + if (var4 == -Scene_drawnCount) { return false; - } else if (var4 == Scene_drawnCount) { // L: 1463 + } else if (var4 == Scene_drawnCount) { return true; } else { - int var5 = var2 << 7; // L: 1464 - int var6 = var3 << 7; // L: 1465 - if (this.method4086(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method4086(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method4086(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method4086(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { // L: 1466 - this.field2300[var1][var2][var3] = Scene_drawnCount; // L: 1467 - return true; // L: 1468 + int var5 = var2 << 7; + int var6 = var3 << 7; + if (this.method4086(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method4086(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method4086(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method4086(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { + this.field2300[var1][var2][var3] = Scene_drawnCount; + return true; } else { - this.field2300[var1][var2][var3] = -Scene_drawnCount; // L: 1471 - return false; // L: 1472 + this.field2300[var1][var2][var3] = -Scene_drawnCount; + return false; } } } @ObfuscatedName("ae") boolean method3958(int var1, int var2, int var3, int var4) { - if (!this.method3998(var1, var2, var3)) { // L: 1477 + if (!this.method3998(var1, var2, var3)) { 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.method4086(var5, var7, var6)) { // L: 1487 + int var5 = var2 << 7; + int var6 = var3 << 7; + int var7 = this.tileHeights[var1][var2][var3] - 1; + int var8 = var7 - 120; + int var9 = var7 - 230; + int var10 = var7 - 238; + if (var4 < 16) { + if (var4 == 1) { + if (var5 > Scene_cameraX) { + if (!this.method4086(var5, var7, var6)) { return false; } - if (!this.method4086(var5, var7, var6 + 128)) { // L: 1488 + if (!this.method4086(var5, var7, var6 + 128)) { return false; } } - if (var1 > 0) { // L: 1490 - if (!this.method4086(var5, var8, var6)) { // L: 1491 + if (var1 > 0) { + if (!this.method4086(var5, var8, var6)) { return false; } - if (!this.method4086(var5, var8, var6 + 128)) { // L: 1492 + if (!this.method4086(var5, var8, var6 + 128)) { return false; } } - if (!this.method4086(var5, var9, var6)) { // L: 1494 + if (!this.method4086(var5, var9, var6)) { return false; } - if (!this.method4086(var5, var9, var6 + 128)) { // L: 1495 + if (!this.method4086(var5, var9, var6 + 128)) { return false; } - return true; // L: 1496 + return true; } - if (var4 == 2) { // L: 1498 - if (var6 < Scene_cameraZ) { // L: 1499 - if (!this.method4086(var5, var7, var6 + 128)) { // L: 1500 + if (var4 == 2) { + if (var6 < Scene_cameraZ) { + if (!this.method4086(var5, var7, var6 + 128)) { return false; } - if (!this.method4086(var5 + 128, var7, var6 + 128)) { // L: 1501 + if (!this.method4086(var5 + 128, var7, var6 + 128)) { return false; } } - if (var1 > 0) { // L: 1503 - if (!this.method4086(var5, var8, var6 + 128)) { // L: 1504 + if (var1 > 0) { + if (!this.method4086(var5, var8, var6 + 128)) { return false; } - if (!this.method4086(var5 + 128, var8, var6 + 128)) { // L: 1505 + if (!this.method4086(var5 + 128, var8, var6 + 128)) { return false; } } - if (!this.method4086(var5, var9, var6 + 128)) { // L: 1507 + if (!this.method4086(var5, var9, var6 + 128)) { return false; } - if (!this.method4086(var5 + 128, var9, var6 + 128)) { // L: 1508 + if (!this.method4086(var5 + 128, var9, var6 + 128)) { return false; } - return true; // L: 1509 + return true; } - if (var4 == 4) { // L: 1511 - if (var5 < Scene_cameraX) { // L: 1512 - if (!this.method4086(var5 + 128, var7, var6)) { // L: 1513 + if (var4 == 4) { + if (var5 < Scene_cameraX) { + if (!this.method4086(var5 + 128, var7, var6)) { return false; } - if (!this.method4086(var5 + 128, var7, var6 + 128)) { // L: 1514 + if (!this.method4086(var5 + 128, var7, var6 + 128)) { return false; } } - if (var1 > 0) { // L: 1516 - if (!this.method4086(var5 + 128, var8, var6)) { // L: 1517 + if (var1 > 0) { + if (!this.method4086(var5 + 128, var8, var6)) { return false; } - if (!this.method4086(var5 + 128, var8, var6 + 128)) { // L: 1518 + if (!this.method4086(var5 + 128, var8, var6 + 128)) { return false; } } - if (!this.method4086(var5 + 128, var9, var6)) { // L: 1520 + if (!this.method4086(var5 + 128, var9, var6)) { return false; } - if (!this.method4086(var5 + 128, var9, var6 + 128)) { // L: 1521 + if (!this.method4086(var5 + 128, var9, var6 + 128)) { return false; } - return true; // L: 1522 + return true; } - if (var4 == 8) { // L: 1524 - if (var6 > Scene_cameraZ) { // L: 1525 - if (!this.method4086(var5, var7, var6)) { // L: 1526 + if (var4 == 8) { + if (var6 > Scene_cameraZ) { + if (!this.method4086(var5, var7, var6)) { return false; } - if (!this.method4086(var5 + 128, var7, var6)) { // L: 1527 + if (!this.method4086(var5 + 128, var7, var6)) { return false; } } - if (var1 > 0) { // L: 1529 - if (!this.method4086(var5, var8, var6)) { // L: 1530 + if (var1 > 0) { + if (!this.method4086(var5, var8, var6)) { return false; } - if (!this.method4086(var5 + 128, var8, var6)) { // L: 1531 + if (!this.method4086(var5 + 128, var8, var6)) { return false; } } - if (!this.method4086(var5, var9, var6)) { // L: 1533 + if (!this.method4086(var5, var9, var6)) { return false; } - if (!this.method4086(var5 + 128, var9, var6)) { // L: 1534 + if (!this.method4086(var5 + 128, var9, var6)) { return false; } - return true; // L: 1535 + return true; } } - if (!this.method4086(var5 + 64, var10, var6 + 64)) { // L: 1538 + if (!this.method4086(var5 + 64, var10, var6 + 64)) { return false; - } else if (var4 == 16) { // L: 1539 - return this.method4086(var5, var9, var6 + 128); // L: 1540 - } else if (var4 == 32) { // L: 1543 - return this.method4086(var5 + 128, var9, var6 + 128); // L: 1544 - } else if (var4 == 64) { // L: 1547 - return this.method4086(var5 + 128, var9, var6); // L: 1548 - } else if (var4 == 128) { // L: 1551 - return this.method4086(var5, var9, var6); // L: 1552 + } else if (var4 == 16) { + return this.method4086(var5, var9, var6 + 128); + } else if (var4 == 32) { + return this.method4086(var5 + 128, var9, var6 + 128); + } else if (var4 == 64) { + return this.method4086(var5 + 128, var9, var6); + } else if (var4 == 128) { + return this.method4086(var5, var9, var6); } else { - return true; // L: 1555 + return true; } } } @ObfuscatedName("ak") boolean method4000(int var1, int var2, int var3, int var4) { - if (!this.method3998(var1, var2, var3)) { // L: 1559 + if (!this.method3998(var1, var2, var3)) { return false; } else { - int var5 = var2 << 7; // L: 1560 - int var6 = var3 << 7; // L: 1561 - return this.method4086(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method4086(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method4086(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method4086(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); // L: 1562 + int var5 = var2 << 7; + int var6 = var3 << 7; + return this.method4086(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method4086(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method4086(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method4086(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); } } @@ -2312,40 +2312,40 @@ public class Scene { boolean method4001(int var1, int var2, int var3, int var4, int var5, int var6) { int var7; int var8; - if (var3 == var2 && var5 == var4) { // L: 1567 - if (!this.method3998(var1, var2, var4)) { // L: 1568 + if (var3 == var2 && var5 == var4) { + if (!this.method3998(var1, var2, var4)) { return false; } else { - var7 = var2 << 7; // L: 1569 - var8 = var4 << 7; // L: 1570 - return this.method4086(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method4086(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method4086(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method4086(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); // L: 1571 + var7 = var2 << 7; + var8 = var4 << 7; + return this.method4086(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method4086(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method4086(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method4086(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); } } else { - for (var7 = var2; var7 <= var3; ++var7) { // L: 1574 - for (var8 = var4; var8 <= var5; ++var8) { // L: 1575 - if (this.field2300[var1][var7][var8] == -Scene_drawnCount) { // L: 1576 + for (var7 = var2; var7 <= var3; ++var7) { + for (var8 = var4; var8 <= var5; ++var8) { + if (this.field2300[var1][var7][var8] == -Scene_drawnCount) { return false; } } } - var7 = (var2 << 7) + 1; // L: 1579 - var8 = (var4 << 7) + 2; // L: 1580 - int var9 = this.tileHeights[var1][var2][var4] - var6; // L: 1581 - if (!this.method4086(var7, var9, var8)) { // L: 1582 + var7 = (var2 << 7) + 1; + var8 = (var4 << 7) + 2; + int var9 = this.tileHeights[var1][var2][var4] - var6; + if (!this.method4086(var7, var9, var8)) { return false; } else { - int var10 = (var3 << 7) - 1; // L: 1583 - if (!this.method4086(var10, var9, var8)) { // L: 1584 + int var10 = (var3 << 7) - 1; + if (!this.method4086(var10, var9, var8)) { return false; } else { - int var11 = (var5 << 7) - 1; // L: 1585 - if (!this.method4086(var7, var9, var11)) { // L: 1586 + int var11 = (var5 << 7) - 1; + if (!this.method4086(var7, var9, var11)) { return false; - } else if (!this.method4086(var10, var9, var11)) { // L: 1587 + } else if (!this.method4086(var10, var9, var11)) { return false; } else { - return true; // L: 1588 + return true; } } } @@ -2354,102 +2354,102 @@ public class Scene { @ObfuscatedName("bp") boolean method4086(int var1, int var2, int var3) { - for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { // L: 1592 - Occluder var5 = Scene_currentOccluders[var4]; // L: 1593 + for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { + Occluder var5 = Scene_currentOccluders[var4]; int var6; int var7; int var8; int var9; int var10; - if (var5.field2378 == 1) { // L: 1594 - var6 = var5.minX - var1; // L: 1595 - if (var6 > 0) { // L: 1596 - var7 = (var6 * var5.field2381 >> 8) + var5.minZ; // L: 1597 - var8 = (var6 * var5.field2368 >> 8) + var5.maxZ; // L: 1598 - var9 = (var6 * var5.field2383 >> 8) + var5.minY; // L: 1599 - var10 = (var6 * var5.field2367 >> 8) + var5.maxY; // L: 1600 - if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1601 + if (var5.field2378 == 1) { + var6 = var5.minX - var1; + if (var6 > 0) { + var7 = (var6 * var5.field2381 >> 8) + var5.minZ; + var8 = (var6 * var5.field2368 >> 8) + var5.maxZ; + var9 = (var6 * var5.field2383 >> 8) + var5.minY; + var10 = (var6 * var5.field2367 >> 8) + var5.maxY; + if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field2378 == 2) { // L: 1605 - var6 = var1 - var5.minX; // L: 1606 - if (var6 > 0) { // L: 1607 - var7 = (var6 * var5.field2381 >> 8) + var5.minZ; // L: 1608 - var8 = (var6 * var5.field2368 >> 8) + var5.maxZ; // L: 1609 - var9 = (var6 * var5.field2383 >> 8) + var5.minY; // L: 1610 - var10 = (var6 * var5.field2367 >> 8) + var5.maxY; // L: 1611 - if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1612 + } else if (var5.field2378 == 2) { + var6 = var1 - var5.minX; + if (var6 > 0) { + var7 = (var6 * var5.field2381 >> 8) + var5.minZ; + var8 = (var6 * var5.field2368 >> 8) + var5.maxZ; + var9 = (var6 * var5.field2383 >> 8) + var5.minY; + var10 = (var6 * var5.field2367 >> 8) + var5.maxY; + if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field2378 == 3) { // L: 1616 - var6 = var5.minZ - var3; // L: 1617 - if (var6 > 0) { // L: 1618 - var7 = (var6 * var5.field2369 >> 8) + var5.minX; // L: 1619 - var8 = (var6 * var5.field2380 >> 8) + var5.maxX; // L: 1620 - var9 = (var6 * var5.field2383 >> 8) + var5.minY; // L: 1621 - var10 = (var6 * var5.field2367 >> 8) + var5.maxY; // L: 1622 - if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1623 + } else if (var5.field2378 == 3) { + var6 = var5.minZ - var3; + if (var6 > 0) { + var7 = (var6 * var5.field2369 >> 8) + var5.minX; + var8 = (var6 * var5.field2380 >> 8) + var5.maxX; + var9 = (var6 * var5.field2383 >> 8) + var5.minY; + var10 = (var6 * var5.field2367 >> 8) + var5.maxY; + if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field2378 == 4) { // L: 1627 - var6 = var3 - var5.minZ; // L: 1628 - if (var6 > 0) { // L: 1629 - var7 = (var6 * var5.field2369 >> 8) + var5.minX; // L: 1630 - var8 = (var6 * var5.field2380 >> 8) + var5.maxX; // L: 1631 - var9 = (var6 * var5.field2383 >> 8) + var5.minY; // L: 1632 - var10 = (var6 * var5.field2367 >> 8) + var5.maxY; // L: 1633 - if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1634 + } else if (var5.field2378 == 4) { + var6 = var3 - var5.minZ; + if (var6 > 0) { + var7 = (var6 * var5.field2369 >> 8) + var5.minX; + var8 = (var6 * var5.field2380 >> 8) + var5.maxX; + var9 = (var6 * var5.field2383 >> 8) + var5.minY; + var10 = (var6 * var5.field2367 >> 8) + var5.maxY; + if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field2378 == 5) { // L: 1638 - var6 = var2 - var5.minY; // L: 1639 - if (var6 > 0) { // L: 1640 - var7 = (var6 * var5.field2369 >> 8) + var5.minX; // L: 1641 - var8 = (var6 * var5.field2380 >> 8) + var5.maxX; // L: 1642 - var9 = (var6 * var5.field2381 >> 8) + var5.minZ; // L: 1643 - var10 = (var6 * var5.field2368 >> 8) + var5.maxZ; // L: 1644 - if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { // L: 1645 + } else if (var5.field2378 == 5) { + var6 = var2 - var5.minY; + if (var6 > 0) { + var7 = (var6 * var5.field2369 >> 8) + var5.minX; + var8 = (var6 * var5.field2380 >> 8) + var5.maxX; + var9 = (var6 * var5.field2381 >> 8) + var5.minZ; + var10 = (var6 * var5.field2368 >> 8) + var5.maxZ; + if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { return true; } } } } - return false; // L: 1650 + return false; } @ObfuscatedName("m") @Export("Scene_addOccluder") public static void Scene_addOccluder(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - Occluder var8 = new Occluder(); // L: 149 - var8.minTileX = var2 / 128; // L: 150 - var8.maxTileX = var3 / 128; // L: 151 - var8.minTileY = var4 / 128; // L: 152 - var8.maxTileY = var5 / 128; // L: 153 - var8.type = var1; // L: 154 - var8.minX = var2; // L: 155 - var8.maxX = var3; // L: 156 - var8.minZ = var4; // L: 157 - var8.maxZ = var5; // L: 158 - var8.minY = var6; // L: 159 - var8.maxY = var7; // L: 160 - Scene_planeOccluders[var0][Scene_planeOccluderCounts[var0]++] = var8; // L: 161 - } // L: 162 + Occluder var8 = new Occluder(); + var8.minTileX = var2 / 128; + var8.maxTileX = var3 / 128; + var8.minTileY = var4 / 128; + var8.maxTileY = var5 / 128; + var8.type = var1; + var8.minX = var2; + var8.maxX = var3; + var8.minZ = var4; + var8.maxZ = var5; + var8.minY = var6; + var8.maxY = var7; + Scene_planeOccluders[var0][Scene_planeOccluderCounts[var0]++] = var8; + } @ObfuscatedName("ap") @Export("Scene_buildVisiblityMap") public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int var3, int var4) { - Scene_viewportXMin = 0; // L: 638 - Scene_viewportYMin = 0; // L: 639 - Scene_viewportXMax = var3; // L: 640 - Scene_viewportYMax = var4; // L: 641 - Scene_viewportXCenter = var3 / 2; // L: 642 - Scene_viewportYCenter = var4 / 2; // L: 643 - boolean[][][][] var5 = new boolean[var0.length][32][53][53]; // L: 644 + Scene_viewportXMin = 0; + Scene_viewportYMin = 0; + Scene_viewportXMax = var3; + Scene_viewportYMax = var4; + Scene_viewportXCenter = var3 / 2; + Scene_viewportYCenter = var4 / 2; + boolean[][][][] var5 = new boolean[var0.length][32][53][53]; int var6; int var7; @@ -2457,135 +2457,135 @@ public class Scene { int var9; int var11; int var12; - for (var6 = 128; var6 <= 383; var6 += 32) { // L: 645 - for (var7 = 0; var7 < 2048; var7 += 64) { // L: 646 - Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 647 - Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 648 - Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 649 - Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 650 - var8 = (var6 - 128) / 32; // L: 651 - var9 = var7 / 64; // L: 652 + for (var6 = 128; var6 <= 383; var6 += 32) { + for (var7 = 0; var7 < 2048; var7 += 64) { + Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var6]; + Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var6]; + Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var7]; + Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var7]; + var8 = (var6 - 128) / 32; + var9 = var7 / 64; - for (int var10 = -26; var10 < 26; ++var10) { // L: 653 - for (var11 = -26; var11 < 26; ++var11) { // L: 654 - var12 = var10 * 128; // L: 655 - int var13 = var11 * 128; // L: 656 - boolean var14 = false; // L: 657 + for (int var10 = -26; var10 < 26; ++var10) { + for (var11 = -26; var11 < 26; ++var11) { + var12 = var10 * 128; + int var13 = var11 * 128; + boolean var14 = false; - for (int var15 = -var1; var15 <= var2; var15 += 128) { // L: 658 - if (method3986(var12, var0[var8] + var15, var13)) { // L: 659 - var14 = true; // L: 660 + for (int var15 = -var1; var15 <= var2; var15 += 128) { + if (method3986(var12, var0[var8] + var15, var13)) { + var14 = true; break; } } - var5[var8][var9][var10 + 1 + 25][var11 + 1 + 25] = var14; // L: 664 + var5[var8][var9][var10 + 1 + 25][var11 + 1 + 25] = var14; } } } } - for (var6 = 0; var6 < 8; ++var6) { // L: 669 - for (var7 = 0; var7 < 32; ++var7) { // L: 670 - for (var8 = -25; var8 < 25; ++var8) { // L: 671 - for (var9 = -25; var9 < 25; ++var9) { // L: 672 - boolean var16 = false; // L: 673 + for (var6 = 0; var6 < 8; ++var6) { + for (var7 = 0; var7 < 32; ++var7) { + for (var8 = -25; var8 < 25; ++var8) { + for (var9 = -25; var9 < 25; ++var9) { + boolean var16 = false; label84: - 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 + for (var11 = -1; var11 <= 1; ++var11) { + for (var12 = -1; var12 <= 1; ++var12) { + if (var5[var6][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { + var16 = true; break label84; } - if (var5[var6][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 680 - var16 = true; // L: 681 - break label84; // L: 682 + if (var5[var6][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { + var16 = true; + break label84; } - if (var5[var6 + 1][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 684 - var16 = true; // L: 685 - break label84; // L: 686 + if (var5[var6 + 1][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { + var16 = true; + break label84; } - if (var5[var6 + 1][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 688 - var16 = true; // L: 689 - break label84; // L: 690 + if (var5[var6 + 1][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { + var16 = true; + break label84; } } } - visibilityMap[var6][var7][var8 + 25][var9 + 25] = var16; // L: 694 + visibilityMap[var6][var7][var8 + 25][var9 + 25] = var16; } } } } - } // L: 699 + } @ObfuscatedName("ac") static boolean method3986(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 + int var3 = var0 * Scene_cameraYawCosine + var2 * Scene_cameraYawSine >> 16; + int var4 = var2 * Scene_cameraYawCosine - var0 * Scene_cameraYawSine >> 16; + int var5 = var4 * Scene_cameraPitchCosine + Scene_cameraPitchSine * var1 >> 16; + int var6 = Scene_cameraPitchCosine * var1 - var4 * Scene_cameraPitchSine >> 16; + if (var5 >= 50 && var5 <= 3500) { + int var7 = var3 * 128 / var5 + Scene_viewportXCenter; + int var8 = var6 * 128 / var5 + Scene_viewportYCenter; + return var7 >= Scene_viewportXMin && var7 <= Scene_viewportXMax && var8 >= Scene_viewportYMin && var8 <= Scene_viewportYMax; } else { - return false; // L: 710 + return false; } } @ObfuscatedName("ar") @Export("shouldSendWalk") public static boolean shouldSendWalk() { - return viewportWalking && Scene_selectedX != -1; // L: 729 + return viewportWalking && Scene_selectedX != -1; } @ObfuscatedName("ag") public static void method3990() { - Scene_selectedX = -1; // L: 733 - viewportWalking = false; // L: 734 - } // L: 735 + Scene_selectedX = -1; + viewportWalking = false; + } @ObfuscatedName("ai") static final int method4073(int var0, int var1) { - var1 = (var0 & 127) * var1 >> 7; // L: 1340 - if (var1 < 2) { // L: 1341 + var1 = (var0 & 127) * var1 >> 7; + if (var1 < 2) { var1 = 2; - } else if (var1 > 126) { // L: 1342 + } else if (var1 > 126) { var1 = 126; } - return (var0 & 65408) + var1; // L: 1343 + return (var0 & 65408) + var1; } @ObfuscatedName("aq") @Export("containsBounds") static boolean containsBounds(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (var1 < var2 && var1 < var3 && var1 < var4) { // L: 1347 + if (var1 < var2 && var1 < var3 && var1 < var4) { return false; - } else if (var1 > var2 && var1 > var3 && var1 > var4) { // L: 1348 + } else if (var1 > var2 && var1 > var3 && var1 > var4) { return false; - } else if (var0 < var5 && var0 < var6 && var0 < var7) { // L: 1349 + } else if (var0 < var5 && var0 < var6 && var0 < var7) { return false; - } else if (var0 > var5 && var0 > var6 && var0 > var7) { // L: 1350 + } else if (var0 > var5 && var0 > var6 && var0 > var7) { return false; } else { - int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2); // L: 1351 - int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3); // L: 1352 - int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7); // L: 1353 - if (var8 == 0) { // L: 1354 - if (var9 != 0) { // L: 1357 - return var9 < 0 ? var10 <= 0 : var10 >= 0; // L: 1358 + int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2); + int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3); + int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7); + if (var8 == 0) { + if (var9 != 0) { + return var9 < 0 ? var10 <= 0 : var10 >= 0; } else { - return true; // L: 1360 + return true; } } else { - return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0; // L: 1355 + return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0; } } } diff --git a/runescape-client/src/main/java/SceneTileModel.java b/runescape-client/src/main/java/SceneTileModel.java index 24a876bee6..dea211d6e2 100644 --- a/runescape-client/src/main/java/SceneTileModel.java +++ b/runescape-client/src/main/java/SceneTileModel.java @@ -66,38 +66,38 @@ public final class SceneTileModel { int overlayRgb; static { - field2399 = new int[6]; // L: 21 - field2413 = new int[6]; // L: 22 - field2414 = new int[6]; // L: 23 - field2415 = new int[6]; // L: 24 - field2416 = new int[6]; // L: 25 - field2401 = 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 - field2397 = 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 + field2399 = new int[6]; + field2413 = new int[6]; + field2414 = new int[6]; + field2415 = new int[6]; + field2416 = new int[6]; + field2401 = 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}}; + field2397 = 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}}; } 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) { - this.isFlat = true; // L: 16 - if (var7 != var6 || var8 != var6 || var9 != var6) { // L: 58 + this.isFlat = true; + if (var7 != var6 || var8 != var6 || var9 != var6) { this.isFlat = false; } - this.shape = var1; // L: 59 - this.rotation = var2; // L: 60 - this.underlayRgb = var18; // L: 61 - this.overlayRgb = var19; // L: 62 - short var20 = 128; // L: 63 - int var21 = var20 / 2; // L: 64 - int var22 = var20 / 4; // L: 65 - int var23 = var20 * 3 / 4; // L: 66 - int[] var24 = field2401[var1]; // L: 67 - int var25 = var24.length; // L: 68 - this.vertexX = new int[var25]; // L: 69 - this.vertexY = new int[var25]; // L: 70 - this.vertexZ = new int[var25]; // L: 71 - int[] var26 = new int[var25]; // L: 72 - int[] var27 = new int[var25]; // L: 73 - int var28 = var20 * var4; // L: 74 - int var29 = var5 * var20; // L: 75 + this.shape = var1; + this.rotation = var2; + this.underlayRgb = var18; + this.overlayRgb = var19; + short var20 = 128; + int var21 = var20 / 2; + int var22 = var20 / 4; + int var23 = var20 * 3 / 4; + int[] var24 = field2401[var1]; + int var25 = var24.length; + this.vertexX = new int[var25]; + this.vertexY = new int[var25]; + this.vertexZ = new int[var25]; + int[] var26 = new int[var25]; + int[] var27 = new int[var25]; + int var28 = var20 * var4; + int var29 = var5 * var20; int var31; int var32; @@ -105,204 +105,204 @@ public final class SceneTileModel { int var34; int var35; int var36; - for (int var30 = 0; var30 < var25; ++var30) { // L: 76 - var31 = var24[var30]; // L: 77 - if ((var31 & 1) == 0 && var31 <= 8) { // L: 78 + for (int var30 = 0; var30 < var25; ++var30) { + var31 = var24[var30]; + if ((var31 & 1) == 0 && var31 <= 8) { var31 = (var31 - var2 - var2 - 1 & 7) + 1; } - if (var31 > 8 && var31 <= 12) { // L: 79 + if (var31 > 8 && var31 <= 12) { var31 = (var31 - 9 - var2 & 3) + 9; } - if (var31 > 12 && var31 <= 16) { // L: 80 + if (var31 > 12 && var31 <= 16) { var31 = (var31 - 13 - var2 & 3) + 13; } - if (var31 == 1) { // L: 86 - var32 = var28; // L: 87 - var33 = var29; // L: 88 - var34 = var6; // L: 89 - var35 = var10; // L: 90 - var36 = var14; // L: 91 - } else if (var31 == 2) { // L: 93 - var32 = var28 + var21; // L: 94 - var33 = var29; // L: 95 - var34 = var7 + var6 >> 1; // L: 96 - var35 = var11 + var10 >> 1; // L: 97 - var36 = var15 + var14 >> 1; // L: 98 - } else if (var31 == 3) { // L: 100 - var32 = var28 + var20; // L: 101 - var33 = var29; // L: 102 - var34 = var7; // L: 103 - var35 = var11; // L: 104 - var36 = var15; // L: 105 - } else if (var31 == 4) { // L: 107 - var32 = var28 + var20; // L: 108 - var33 = var29 + var21; // L: 109 - var34 = var8 + var7 >> 1; // L: 110 - var35 = var11 + var12 >> 1; // L: 111 - var36 = var15 + var16 >> 1; // L: 112 - } else if (var31 == 5) { // L: 114 - var32 = var28 + var20; // L: 115 - var33 = var29 + var20; // L: 116 - var34 = var8; // L: 117 - var35 = var12; // L: 118 - var36 = var16; // L: 119 - } else if (var31 == 6) { // L: 121 - var32 = var28 + var21; // L: 122 - var33 = var29 + var20; // L: 123 - var34 = var8 + var9 >> 1; // L: 124 - var35 = var13 + var12 >> 1; // L: 125 - var36 = var17 + var16 >> 1; // L: 126 - } else if (var31 == 7) { // L: 128 - var32 = var28; // L: 129 - var33 = var29 + var20; // L: 130 - var34 = var9; // L: 131 - var35 = var13; // L: 132 - var36 = var17; // L: 133 - } else if (var31 == 8) { // L: 135 - var32 = var28; // L: 136 - var33 = var29 + var21; // L: 137 - var34 = var9 + var6 >> 1; // L: 138 - var35 = var13 + var10 >> 1; // L: 139 - var36 = var17 + var14 >> 1; // L: 140 - } else if (var31 == 9) { // L: 142 - var32 = var28 + var21; // L: 143 - var33 = var29 + var22; // L: 144 - var34 = var7 + var6 >> 1; // L: 145 - var35 = var11 + var10 >> 1; // L: 146 - var36 = var15 + var14 >> 1; // L: 147 - } else if (var31 == 10) { // L: 149 - var32 = var28 + var23; // L: 150 - var33 = var29 + var21; // L: 151 - var34 = var8 + var7 >> 1; // L: 152 - var35 = var11 + var12 >> 1; // L: 153 - var36 = var15 + var16 >> 1; // L: 154 - } else if (var31 == 11) { // L: 156 - var32 = var28 + var21; // L: 157 - var33 = var29 + var23; // L: 158 - var34 = var8 + var9 >> 1; // L: 159 - var35 = var13 + var12 >> 1; // L: 160 - var36 = var17 + var16 >> 1; // L: 161 - } else if (var31 == 12) { // L: 163 - var32 = var28 + var22; // L: 164 - var33 = var29 + var21; // L: 165 - var34 = var9 + var6 >> 1; // L: 166 - var35 = var13 + var10 >> 1; // L: 167 - var36 = var17 + var14 >> 1; // L: 168 - } else if (var31 == 13) { // L: 170 - var32 = var28 + var22; // L: 171 - var33 = var29 + var22; // L: 172 - var34 = var6; // L: 173 - var35 = var10; // L: 174 - var36 = var14; // L: 175 - } else if (var31 == 14) { // L: 177 - var32 = var28 + var23; // L: 178 - var33 = var29 + var22; // L: 179 - var34 = var7; // L: 180 - var35 = var11; // L: 181 - var36 = var15; // L: 182 - } else if (var31 == 15) { // L: 184 - var32 = var28 + var23; // L: 185 - var33 = var29 + var23; // L: 186 - var34 = var8; // L: 187 - var35 = var12; // L: 188 - var36 = var16; // L: 189 + if (var31 == 1) { + var32 = var28; + var33 = var29; + var34 = var6; + var35 = var10; + var36 = var14; + } else if (var31 == 2) { + var32 = var28 + var21; + var33 = var29; + var34 = var7 + var6 >> 1; + var35 = var11 + var10 >> 1; + var36 = var15 + var14 >> 1; + } else if (var31 == 3) { + var32 = var28 + var20; + var33 = var29; + var34 = var7; + var35 = var11; + var36 = var15; + } else if (var31 == 4) { + var32 = var28 + var20; + var33 = var29 + var21; + var34 = var8 + var7 >> 1; + var35 = var11 + var12 >> 1; + var36 = var15 + var16 >> 1; + } else if (var31 == 5) { + var32 = var28 + var20; + var33 = var29 + var20; + var34 = var8; + var35 = var12; + var36 = var16; + } else if (var31 == 6) { + var32 = var28 + var21; + var33 = var29 + var20; + var34 = var8 + var9 >> 1; + var35 = var13 + var12 >> 1; + var36 = var17 + var16 >> 1; + } else if (var31 == 7) { + var32 = var28; + var33 = var29 + var20; + var34 = var9; + var35 = var13; + var36 = var17; + } else if (var31 == 8) { + var32 = var28; + var33 = var29 + var21; + var34 = var9 + var6 >> 1; + var35 = var13 + var10 >> 1; + var36 = var17 + var14 >> 1; + } else if (var31 == 9) { + var32 = var28 + var21; + var33 = var29 + var22; + var34 = var7 + var6 >> 1; + var35 = var11 + var10 >> 1; + var36 = var15 + var14 >> 1; + } else if (var31 == 10) { + var32 = var28 + var23; + var33 = var29 + var21; + var34 = var8 + var7 >> 1; + var35 = var11 + var12 >> 1; + var36 = var15 + var16 >> 1; + } else if (var31 == 11) { + var32 = var28 + var21; + var33 = var29 + var23; + var34 = var8 + var9 >> 1; + var35 = var13 + var12 >> 1; + var36 = var17 + var16 >> 1; + } else if (var31 == 12) { + var32 = var28 + var22; + var33 = var29 + var21; + var34 = var9 + var6 >> 1; + var35 = var13 + var10 >> 1; + var36 = var17 + var14 >> 1; + } else if (var31 == 13) { + var32 = var28 + var22; + var33 = var29 + var22; + var34 = var6; + var35 = var10; + var36 = var14; + } else if (var31 == 14) { + var32 = var28 + var23; + var33 = var29 + var22; + var34 = var7; + var35 = var11; + var36 = var15; + } else if (var31 == 15) { + var32 = var28 + var23; + var33 = var29 + var23; + var34 = var8; + var35 = var12; + var36 = var16; } else { - var32 = var28 + var22; // L: 192 - var33 = var29 + var23; // L: 193 - var34 = var9; // L: 194 - var35 = var13; // L: 195 - var36 = var17; // L: 196 + var32 = var28 + var22; + var33 = var29 + var23; + var34 = var9; + var35 = var13; + var36 = var17; } - this.vertexX[var30] = var32; // L: 198 - this.vertexY[var30] = var34; // L: 199 - this.vertexZ[var30] = var33; // L: 200 - var26[var30] = var35; // L: 201 - var27[var30] = var36; // L: 202 + this.vertexX[var30] = var32; + this.vertexY[var30] = var34; + this.vertexZ[var30] = var33; + var26[var30] = var35; + var27[var30] = var36; } - int[] var38 = field2397[var1]; // L: 204 - var31 = var38.length / 4; // L: 205 - this.faceX = new int[var31]; // L: 206 - this.faceY = new int[var31]; // L: 207 - this.faceZ = new int[var31]; // L: 208 - this.triangleColorA = new int[var31]; // L: 209 - this.triangleColorB = new int[var31]; // L: 210 - this.triangleColorC = new int[var31]; // L: 211 - if (var3 != -1) { // L: 212 + int[] var38 = field2397[var1]; + var31 = var38.length / 4; + this.faceX = new int[var31]; + this.faceY = new int[var31]; + this.faceZ = new int[var31]; + this.triangleColorA = new int[var31]; + this.triangleColorB = new int[var31]; + this.triangleColorC = new int[var31]; + if (var3 != -1) { this.triangleTextureId = new int[var31]; } - var32 = 0; // L: 213 + var32 = 0; - for (var33 = 0; var33 < var31; ++var33) { // L: 214 - var34 = var38[var32]; // L: 215 - var35 = var38[var32 + 1]; // L: 216 - var36 = var38[var32 + 2]; // L: 217 - int var37 = var38[var32 + 3]; // L: 218 - var32 += 4; // L: 219 - if (var35 < 4) { // L: 220 + for (var33 = 0; var33 < var31; ++var33) { + var34 = var38[var32]; + var35 = var38[var32 + 1]; + var36 = var38[var32 + 2]; + int var37 = var38[var32 + 3]; + var32 += 4; + if (var35 < 4) { var35 = var35 - var2 & 3; } - if (var36 < 4) { // L: 221 + if (var36 < 4) { var36 = var36 - var2 & 3; } - if (var37 < 4) { // L: 222 + if (var37 < 4) { var37 = var37 - var2 & 3; } - this.faceX[var33] = var35; // L: 223 - this.faceY[var33] = var36; // L: 224 - this.faceZ[var33] = var37; // L: 225 - if (var34 == 0) { // L: 226 - this.triangleColorA[var33] = var26[var35]; // L: 227 - this.triangleColorB[var33] = var26[var36]; // L: 228 - this.triangleColorC[var33] = var26[var37]; // L: 229 - if (this.triangleTextureId != null) { // L: 230 + this.faceX[var33] = var35; + this.faceY[var33] = var36; + this.faceZ[var33] = var37; + if (var34 == 0) { + this.triangleColorA[var33] = var26[var35]; + this.triangleColorB[var33] = var26[var36]; + this.triangleColorC[var33] = var26[var37]; + if (this.triangleTextureId != null) { this.triangleTextureId[var33] = -1; } } else { - this.triangleColorA[var33] = var27[var35]; // L: 233 - this.triangleColorB[var33] = var27[var36]; // L: 234 - this.triangleColorC[var33] = var27[var37]; // L: 235 - if (this.triangleTextureId != null) { // L: 236 + this.triangleColorA[var33] = var27[var35]; + this.triangleColorB[var33] = var27[var36]; + this.triangleColorC[var33] = var27[var37]; + if (this.triangleTextureId != null) { this.triangleTextureId[var33] = var3; } } } - var33 = var6; // L: 239 - var34 = var7; // L: 240 - if (var7 < var6) { // L: 241 + var33 = var6; + var34 = var7; + if (var7 < var6) { var33 = var7; } - if (var7 > var7) { // L: 242 + if (var7 > var7) { var34 = var7; } - if (var8 < var33) { // L: 243 + if (var8 < var33) { var33 = var8; } - if (var8 > var34) { // L: 244 + if (var8 > var34) { var34 = var8; } - if (var9 < var33) { // L: 245 + if (var9 < var33) { var33 = var9; } - if (var9 > var34) { // L: 246 + if (var9 > var34) { var34 = var9; } - var33 /= 14; // L: 247 - var34 /= 14; // L: 248 - } // L: 249 + var33 /= 14; + var34 /= 14; + } } diff --git a/runescape-client/src/main/java/SceneTilePaint.java b/runescape-client/src/main/java/SceneTilePaint.java index 6f07910eed..6341c8b055 100644 --- a/runescape-client/src/main/java/SceneTilePaint.java +++ b/runescape-client/src/main/java/SceneTilePaint.java @@ -47,13 +47,13 @@ public final class SceneTilePaint { int rgb; SceneTilePaint(int var1, int var2, int var3, int var4, int var5, int var6, boolean var7) { - this.isFlat = true; // L: 9 - this.swColor = var1; // L: 13 - this.seColor = var2; // L: 14 - this.neColor = var3; // L: 15 - this.nwColor = var4; // L: 16 - this.texture = var5; // L: 17 - this.rgb = var6; // L: 18 - this.isFlat = var7; // L: 19 - } // L: 20 + this.isFlat = true; + this.swColor = var1; + this.seColor = var2; + this.neColor = var3; + this.nwColor = var4; + this.texture = var5; + this.rgb = var6; + this.isFlat = var7; + } } diff --git a/runescape-client/src/main/java/Script.java b/runescape-client/src/main/java/Script.java index 7b6522effc..8ad806b7b6 100644 --- a/runescape-client/src/main/java/Script.java +++ b/runescape-client/src/main/java/Script.java @@ -56,11 +56,11 @@ public class Script extends DualNode { IterableNodeHashTable[] switches; static { - Script_cached = new EvictingDualNodeHashTable(128); // L: 12 + Script_cached = new EvictingDualNodeHashTable(128); } Script() { - } // L: 23 + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -69,7 +69,7 @@ public class Script extends DualNode { ) @Export("newIterableNodeHashTable") IterableNodeHashTable[] newIterableNodeHashTable(int var1) { - return new IterableNodeHashTable[var1]; // L: 155 + return new IterableNodeHashTable[var1]; } @ObfuscatedName("m") @@ -78,14 +78,14 @@ public class Script extends DualNode { garbageValue = "62" ) public static void method2040(int var0, AbstractArchive var1, String var2, String var3, int var4, boolean var5) { - int var6 = var1.getGroupId(var2); // L: 48 - int var7 = var1.getFileId(var6, var3); // L: 49 - class260.musicPlayerStatus = 1; // L: 51 - class124.musicTrackArchive = var1; // L: 52 - VarcInt.musicTrackGroupId = var6; // L: 53 - class260.musicTrackFileId = var7; // L: 54 - ChatChannel.musicTrackVolume = var4; // L: 55 - DynamicObject.musicTrackBoolean = var5; // L: 56 - class260.pcmSampleLength = var0; // L: 57 - } // L: 59 + int var6 = var1.getGroupId(var2); + int var7 = var1.getFileId(var6, var3); + class260.musicPlayerStatus = 1; + class124.musicTrackArchive = var1; + VarcInt.musicTrackGroupId = var6; + class260.musicTrackFileId = var7; + ChatChannel.musicTrackVolume = var4; + DynamicObject.musicTrackBoolean = var5; + class260.pcmSampleLength = var0; + } } diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java index 5aa682e8ae..062101cd07 100644 --- a/runescape-client/src/main/java/ScriptEvent.java +++ b/runescape-client/src/main/java/ScriptEvent.java @@ -77,7 +77,7 @@ public class ScriptEvent extends Node { int type; public ScriptEvent() { - this.type = 76; // L: 19 + this.type = 76; } @ObfuscatedName("c") @@ -87,8 +87,8 @@ public class ScriptEvent extends Node { ) @Export("setArgs") public void setArgs(Object[] var1) { - this.args = var1; // L: 22 - } // L: 23 + this.args = var1; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -97,8 +97,8 @@ public class ScriptEvent extends Node { ) @Export("setType") public void setType(int var1) { - this.type = var1; // L: 26 - } // L: 27 + this.type = var1; + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -106,12 +106,12 @@ public class ScriptEvent extends Node { garbageValue = "665811152" ) static class114 method2154(int var0) { - class114 var1 = (class114)class130.findEnumerated(LoginScreenAnimation.method2251(), var0); // L: 138 + class114 var1 = (class114)class130.findEnumerated(LoginScreenAnimation.method2251(), var0); if (var1 == null) { - var1 = class114.field1390; // L: 139 + var1 = class114.field1390; } - return var1; // L: 140 + return var1; } @ObfuscatedName("n") @@ -120,10 +120,10 @@ public class ScriptEvent extends Node { garbageValue = "-37" ) static final void method2152() { - Object var10000 = null; // L: 108 + Object var10000 = null; String var0 = "Your friend list is full. Max of 200 for free users, and 400 for members"; - class194.addGameMessage(30, "", var0); // L: 110 - } // L: 112 + class194.addGameMessage(30, "", var0); + } @ObfuscatedName("jt") @ObfuscatedSignature( @@ -131,42 +131,42 @@ public class ScriptEvent extends Node { garbageValue = "95" ) static final void method2147(int var0, int var1, int var2, int var3, int var4, int var5) { - int var6 = var2 - var0; // L: 10850 - int var7 = var3 - var1; // L: 10851 - int var8 = var6 >= 0 ? var6 : -var6; // L: 10852 - int var9 = var7 >= 0 ? var7 : -var7; // L: 10853 - int var10 = var8; // L: 10854 - if (var8 < var9) { // L: 10855 + int var6 = var2 - var0; + int var7 = var3 - var1; + int var8 = var6 >= 0 ? var6 : -var6; + int var9 = var7 >= 0 ? var7 : -var7; + int var10 = var8; + if (var8 < var9) { var10 = var9; } - if (var10 != 0) { // L: 10856 - int var11 = (var6 << 16) / var10; // L: 10857 - int var12 = (var7 << 16) / var10; // L: 10858 - if (var12 <= var11) { // L: 10859 + if (var10 != 0) { + int var11 = (var6 << 16) / var10; + int var12 = (var7 << 16) / var10; + if (var12 <= var11) { var11 = -var11; } else { - var12 = -var12; // L: 10860 + var12 = -var12; } - int var13 = var5 * var12 >> 17; // L: 10861 - int var14 = var5 * var12 + 1 >> 17; // L: 10862 - int var15 = var5 * var11 >> 17; // L: 10863 - int var16 = var5 * var11 + 1 >> 17; // L: 10864 - var0 -= Rasterizer2D.Rasterizer2D_xClipStart; // L: 10865 - var1 -= Rasterizer2D.Rasterizer2D_yClipStart; // L: 10866 - int var17 = var0 + var13; // L: 10867 - int var18 = var0 - var14; // L: 10868 - int var19 = var0 + var6 - var14; // L: 10869 - int var20 = var0 + var6 + var13; // L: 10870 - int var21 = var15 + var1; // L: 10871 - int var22 = var1 - var16; // L: 10872 - int var23 = var7 + var1 - var16; // L: 10873 - int var24 = var7 + var15 + var1; // L: 10874 - Rasterizer3D.method3853(var17, var18, var19); // L: 10875 - Rasterizer3D.method3856(var21, var22, var23, var17, var18, var19, var4); // L: 10876 - Rasterizer3D.method3853(var17, var19, var20); // L: 10877 - Rasterizer3D.method3856(var21, var23, var24, var17, var19, var20, var4); // L: 10878 + int var13 = var5 * var12 >> 17; + int var14 = var5 * var12 + 1 >> 17; + int var15 = var5 * var11 >> 17; + int var16 = var5 * var11 + 1 >> 17; + var0 -= Rasterizer2D.Rasterizer2D_xClipStart; + var1 -= Rasterizer2D.Rasterizer2D_yClipStart; + int var17 = var0 + var13; + int var18 = var0 - var14; + int var19 = var0 + var6 - var14; + int var20 = var0 + var6 + var13; + int var21 = var15 + var1; + int var22 = var1 - var16; + int var23 = var7 + var1 - var16; + int var24 = var7 + var15 + var1; + Rasterizer3D.method3853(var17, var18, var19); + Rasterizer3D.method3856(var21, var22, var23, var17, var18, var19, var4); + Rasterizer3D.method3853(var17, var19, var20); + Rasterizer3D.method3856(var21, var23, var24, var17, var19, var20, var4); } - } // L: 10879 + } } diff --git a/runescape-client/src/main/java/ScriptFrame.java b/runescape-client/src/main/java/ScriptFrame.java index 4958584002..4ad2c307e7 100644 --- a/runescape-client/src/main/java/ScriptFrame.java +++ b/runescape-client/src/main/java/ScriptFrame.java @@ -44,8 +44,8 @@ public class ScriptFrame { String[] stringLocals; ScriptFrame() { - this.pc = -1; // L: 5 - } // L: 9 + this.pc = -1; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -54,56 +54,56 @@ public class ScriptFrame { ) @Export("runScript") static void runScript(ScriptEvent var0, int var1, int var2) { - Object[] var3 = var0.args; // L: 114 + Object[] var3 = var0.args; Script var4; int var20; - if (ClanMate.isWorldMapEvent(var0.type)) { // L: 116 - FileSystem.worldMapEvent = (WorldMapEvent)var3[0]; // L: 117 - WorldMapElement var5 = class78.WorldMapElement_get(FileSystem.worldMapEvent.mapElement); // L: 118 - var4 = Skeleton.getWorldMapScript(var0.type, var5.objectId, var5.category); // L: 119 + if (ClanMate.isWorldMapEvent(var0.type)) { + FileSystem.worldMapEvent = (WorldMapEvent)var3[0]; + WorldMapElement var5 = class78.WorldMapElement_get(FileSystem.worldMapEvent.mapElement); + var4 = Skeleton.getWorldMapScript(var0.type, var5.objectId, var5.category); } else { - var20 = (Integer)var3[0]; // L: 122 - var4 = class410.getScript(var20); // L: 123 + var20 = (Integer)var3[0]; + var4 = class410.getScript(var20); } - if (var4 != null) { // L: 125 - IsaacCipher.Interpreter_intStackSize = 0; // L: 128 + if (var4 != null) { + IsaacCipher.Interpreter_intStackSize = 0; class13.Interpreter_stringStackSize = 0; var20 = -1; int[] var6 = var4.opcodes; int[] var7 = var4.intOperands; - byte var8 = -1; // L: 133 - Interpreter.Interpreter_frameDepth = 0; // L: 134 + byte var8 = -1; + Interpreter.Interpreter_frameDepth = 0; Interpreter.field818 = false; boolean var9 = false; int var10 = 0; boolean var30 = false; - label955: { - label956: { + label956: { + label957: { try { int var13; try { var30 = true; SoundCache.Interpreter_intLocals = new int[var4.localIntCount]; int var11 = 0; - AbstractUserComparator.Interpreter_stringLocals = new String[var4.localStringCount]; // L: 142 + AbstractUserComparator.Interpreter_stringLocals = new String[var4.localStringCount]; int var12 = 0; int var14; String var21; - for (var13 = 1; var13 < var3.length; ++var13) { // L: 143 + for (var13 = 1; var13 < var3.length; ++var13) { if (var3[var13] instanceof Integer) { - var14 = (Integer)var3[var13]; // L: 145 + var14 = (Integer)var3[var13]; if (var14 == -2147483647) { var14 = var0.mouseX; } - if (var14 == -2147483646) { // L: 147 + if (var14 == -2147483646) { var14 = var0.mouseY; } - if (var14 == -2147483645) { // L: 148 + if (var14 == -2147483645) { var14 = var0.widget != null ? var0.widget.id * 1695982371 * 2075239563 : -1; } @@ -127,270 +127,274 @@ public class ScriptFrame { var14 = var0.keyTyped; } - if (var14 == -2147483639) { // L: 154 + if (var14 == -2147483639) { var14 = var0.keyPressed; } - SoundCache.Interpreter_intLocals[var11++] = var14; // L: 155 + SoundCache.Interpreter_intLocals[var11++] = var14; } else if (var3[var13] instanceof String) { var21 = (String)var3[var13]; if (var21.equals("event_opbase")) { var21 = var0.targetName; } - AbstractUserComparator.Interpreter_stringLocals[var12++] = var21; // L: 160 + AbstractUserComparator.Interpreter_stringLocals[var12++] = var21; } } - Interpreter.field815 = var0.field1018; // L: 164 + Interpreter.field815 = var0.field1018; while (true) { ++var10; - if (var10 > var1) { // L: 167 + if (var10 > var1) { throw new RuntimeException(); } - ++var20; // L: 168 + ++var20; int var33 = var6[var20]; - if (var33 >= 100) { // L: 169 + if (var33 >= 100) { boolean var35; - if (var4.intOperands[var20] == 1) { // L: 387 + if (var4.intOperands[var20] == 1) { var35 = true; } else { - var35 = false; // L: 388 + var35 = false; } - var14 = class112.method2560(var33, var4, var35); // L: 389 - switch(var14) { // L: 390 + var14 = class112.method2560(var33, var4, var35); + switch(var14) { case 0: var30 = false; - break label955; + break label956; case 1: default: break; case 2: - throw new IllegalStateException(); // L: 393 + throw new IllegalStateException(); } - } else if (var33 == ScriptOpcodes.ICONST) { // L: 170 + } else if (var33 == ScriptOpcodes.ICONST) { Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7[var20]; } else if (var33 == ScriptOpcodes.GET_VARP) { - var13 = var7[var20]; // L: 175 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Varps.Varps_main[var13]; // L: 176 - } else if (var33 == ScriptOpcodes.SET_VARP) { // L: 179 var13 = var7[var20]; - Varps.Varps_main[var13] = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 181 - class281.changeGameOptions(var13); // L: 182 - } else if (var33 == ScriptOpcodes.SCONST) { // L: 185 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.stringOperands[var20]; // L: 186 - } else if (var33 == ScriptOpcodes.JUMP) { // L: 189 - var20 += var7[var20]; // L: 190 - } else if (var33 == ScriptOpcodes.IF_ICMPNE) { // L: 193 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 194 - if (Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]) { // L: 195 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Varps.Varps_main[var13]; + } else if (var33 == ScriptOpcodes.SET_VARP) { + var13 = var7[var20]; + Varps.Varps_main[var13] = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + class281.changeGameOptions(var13); + } else if (var33 == ScriptOpcodes.SCONST) { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.stringOperands[var20]; + } else if (var33 == ScriptOpcodes.JUMP) { + var20 += var7[var20]; + } else if (var33 == ScriptOpcodes.IF_ICMPNE) { + IsaacCipher.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]) { var20 += var7[var20]; } - } else if (var33 == ScriptOpcodes.IF_ICMPEQ) { // L: 198 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 199 - if (Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]) { // L: 200 + } else if (var33 == ScriptOpcodes.IF_ICMPEQ) { + IsaacCipher.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]) { var20 += var7[var20]; } - } else if (var33 == ScriptOpcodes.IF_ICMPLT) { // L: 203 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 204 - if (Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]) { // L: 205 + } else if (var33 == ScriptOpcodes.IF_ICMPLT) { + IsaacCipher.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]) { var20 += var7[var20]; } - } else if (var33 == ScriptOpcodes.IF_ICMPGT) { // L: 208 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 209 - if (Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]) { // L: 210 + } else if (var33 == ScriptOpcodes.IF_ICMPGT) { + IsaacCipher.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]) { var20 += var7[var20]; } - } else if (var33 == ScriptOpcodes.RETURN) { // L: 213 + } else if (var33 == ScriptOpcodes.RETURN) { if (Interpreter.Interpreter_frameDepth == 0) { var30 = false; - break; + break label957; } - ScriptFrame var40 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; // L: 215 - var4 = var40.script; // L: 216 - var6 = var4.opcodes; // L: 217 - var7 = var4.intOperands; // L: 218 - var20 = var40.pc; // L: 219 - SoundCache.Interpreter_intLocals = var40.intLocals; // L: 220 - AbstractUserComparator.Interpreter_stringLocals = var40.stringLocals; // L: 221 - } else if (var33 == ScriptOpcodes.GET_VARBIT) { // L: 224 - var13 = var7[var20]; // L: 225 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class273.getVarbit(var13); // L: 226 - } else if (var33 == ScriptOpcodes.SET_VARBIT) { // L: 229 - var13 = var7[var20]; // L: 230 - Tile.method3843(var13, Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 231 - } else if (var33 == ScriptOpcodes.IF_ICMPLE) { // L: 234 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 235 - if (Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]) { // L: 236 + ScriptFrame var40 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; + var4 = var40.script; + var6 = var4.opcodes; + var7 = var4.intOperands; + var20 = var40.pc; + SoundCache.Interpreter_intLocals = var40.intLocals; + AbstractUserComparator.Interpreter_stringLocals = var40.stringLocals; + } else if (var33 == ScriptOpcodes.GET_VARBIT) { + var13 = var7[var20]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class273.getVarbit(var13); + } else if (var33 == ScriptOpcodes.SET_VARBIT) { + var13 = var7[var20]; + Tile.method3843(var13, Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); + } else if (var33 == ScriptOpcodes.IF_ICMPLE) { + IsaacCipher.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]) { var20 += var7[var20]; } - } else if (var33 == ScriptOpcodes.IF_ICMPGE) { // L: 239 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 240 - if (Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]) { // L: 241 + } else if (var33 == ScriptOpcodes.IF_ICMPGE) { + IsaacCipher.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]) { var20 += var7[var20]; } - } else if (var33 == ScriptOpcodes.ILOAD) { // L: 244 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = SoundCache.Interpreter_intLocals[var7[var20]]; // L: 245 - } else if (var33 == ScriptOpcodes.ISTORE) { // L: 248 - SoundCache.Interpreter_intLocals[var7[var20]] = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 249 - } else if (var33 == ScriptOpcodes.SLOAD) { // L: 252 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = AbstractUserComparator.Interpreter_stringLocals[var7[var20]]; // L: 253 - } else if (var33 == ScriptOpcodes.SSTORE) { // L: 256 - AbstractUserComparator.Interpreter_stringLocals[var7[var20]] = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 257 - } else if (var33 == ScriptOpcodes.JOIN_STRING) { // L: 260 - var13 = var7[var20]; // L: 261 - class13.Interpreter_stringStackSize -= var13; // L: 262 - var21 = class112.method2565(Interpreter.Interpreter_stringStack, class13.Interpreter_stringStackSize, var13); // L: 263 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var21; // L: 264 - } else if (var33 == ScriptOpcodes.POP_INT) { // L: 267 - --IsaacCipher.Interpreter_intStackSize; // L: 268 - } else if (var33 == ScriptOpcodes.POP_STRING) { // L: 271 - --class13.Interpreter_stringStackSize; // L: 272 + } else if (var33 == ScriptOpcodes.ILOAD) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = SoundCache.Interpreter_intLocals[var7[var20]]; + } else if (var33 == ScriptOpcodes.ISTORE) { + SoundCache.Interpreter_intLocals[var7[var20]] = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + } else if (var33 == ScriptOpcodes.SLOAD) { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = AbstractUserComparator.Interpreter_stringLocals[var7[var20]]; + } else if (var33 == ScriptOpcodes.SSTORE) { + AbstractUserComparator.Interpreter_stringLocals[var7[var20]] = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + } else if (var33 == ScriptOpcodes.JOIN_STRING) { + var13 = var7[var20]; + class13.Interpreter_stringStackSize -= var13; + var21 = class112.method2565(Interpreter.Interpreter_stringStack, class13.Interpreter_stringStackSize, var13); + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var21; + } else if (var33 == ScriptOpcodes.POP_INT) { + --IsaacCipher.Interpreter_intStackSize; + } else if (var33 == ScriptOpcodes.POP_STRING) { + --class13.Interpreter_stringStackSize; } else { int var17; - if (var33 != ScriptOpcodes.INVOKE) { // L: 275 - if (var33 == ScriptOpcodes.GET_VARC_INT) { // L: 298 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class339.varcs.getInt(var7[var20]); // L: 299 - } else if (var33 == ScriptOpcodes.SET_VARC_INT) { // L: 302 - class339.varcs.setInt(var7[var20], Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 303 - } else if (var33 == ScriptOpcodes.DEFINE_ARRAY) { // L: 306 - var13 = var7[var20] >> 16; // L: 307 - var14 = var7[var20] & 65535; // L: 308 - int var24 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 309 - if (var24 < 0 || var24 > 5000) { // L: 310 - throw new RuntimeException(); // L: 311 + if (var33 != ScriptOpcodes.INVOKE) { + if (var33 == ScriptOpcodes.GET_VARC_INT) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class339.varcs.getInt(var7[var20]); + } else if (var33 == ScriptOpcodes.SET_VARC_INT) { + class339.varcs.setInt(var7[var20], Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); + } else if (var33 == ScriptOpcodes.DEFINE_ARRAY) { + var13 = var7[var20] >> 16; + var14 = var7[var20] & 65535; + int var24 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + if (var24 < 0 || var24 > 5000) { + throw new RuntimeException(); } - Interpreter.Interpreter_arrayLengths[var13] = var24; // L: 313 - byte var25 = -1; // L: 314 - if (var14 == 105) { // L: 315 + Interpreter.Interpreter_arrayLengths[var13] = var24; + byte var25 = -1; + if (var14 == 105) { var25 = 0; } - for (var17 = 0; var17 < var24; ++var17) { // L: 316 + for (var17 = 0; var17 < var24; ++var17) { Interpreter.Interpreter_arrays[var13][var17] = var25; } - } else if (var33 == ScriptOpcodes.GET_ARRAY_INT) { // L: 319 - var13 = var7[var20]; // L: 320 - var14 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 321 - if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 322 - throw new RuntimeException(); // L: 323 + } else if (var33 == ScriptOpcodes.GET_ARRAY_INT) { + var13 = var7[var20]; + var14 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { + throw new RuntimeException(); } - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var13][var14]; // L: 325 - } else if (var33 == ScriptOpcodes.SET_ARRAY_INT) { // L: 328 - var13 = var7[var20]; // L: 329 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 330 - var14 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 331 - if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 332 - throw new RuntimeException(); // L: 333 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var13][var14]; + } else if (var33 == ScriptOpcodes.SET_ARRAY_INT) { + var13 = var7[var20]; + IsaacCipher.Interpreter_intStackSize -= 2; + var14 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { + throw new RuntimeException(); } - Interpreter.Interpreter_arrays[var13][var14] = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 335 + Interpreter.Interpreter_arrays[var13][var14] = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; } else { String var22; - if (var33 == ScriptOpcodes.GET_VARC_STRING_OLD) { // L: 338 - var22 = class339.varcs.getStringOld(var7[var20]); // L: 339 - if (var22 == null) { // L: 340 + if (var33 == ScriptOpcodes.GET_VARC_STRING_OLD) { + var22 = class339.varcs.getStringOld(var7[var20]); + if (var22 == null) { var22 = "null"; } - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var22; // L: 341 - } else if (var33 == ScriptOpcodes.SET_VARC_STRING_OLD) { // L: 344 - class339.varcs.setStringOld(var7[var20], Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]); // L: 345 - } else if (var33 == ScriptOpcodes.GET_VARC_STRING) { // L: 348 - var22 = class339.varcs.getString(var7[var20]); // L: 349 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var22; // L: 350 - } else if (var33 == ScriptOpcodes.SET_VARC_STRING) { // L: 353 - class339.varcs.setString(var7[var20], Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]); // L: 354 - } else if (var33 == ScriptOpcodes.SWITCH) { // L: 357 - IterableNodeHashTable var38 = var4.switches[var7[var20]]; // L: 358 - IntegerNode var37 = (IntegerNode)var38.get((long)Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 359 - if (var37 != null) { // L: 360 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var22; + } else if (var33 == ScriptOpcodes.SET_VARC_STRING_OLD) { + class339.varcs.setStringOld(var7[var20], Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]); + } else if (var33 == ScriptOpcodes.GET_VARC_STRING) { + var22 = class339.varcs.getString(var7[var20]); + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var22; + } else if (var33 == ScriptOpcodes.SET_VARC_STRING) { + class339.varcs.setString(var7[var20], Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]); + } else if (var33 == ScriptOpcodes.SWITCH) { + IterableNodeHashTable var38 = var4.switches[var7[var20]]; + IntegerNode var37 = (IntegerNode)var38.get((long)Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); + if (var37 != null) { var20 += var37.integer; } } else { Integer var39; - if (var33 == ScriptOpcodes.GET_VARCLANSETTING) { // L: 363 - var39 = Friend.field4084.getTitleGroupValue(var7[var20]); // L: 364 - if (var39 == null) { // L: 365 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 366 + if (var33 == ScriptOpcodes.GET_VARCLANSETTING) { + var39 = Friend.field4084.getTitleGroupValue(var7[var20]); + if (var39 == null) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var39; // L: 369 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var39; } } else { - if (var33 != ScriptOpcodes.GET_VARCLAN) { // L: 373 - throw new IllegalStateException(); // L: 383 + if (var33 != ScriptOpcodes.GET_VARCLAN) { + throw new IllegalStateException(); } - var39 = BuddyRankComparator.field1342.method6757(var7[var20]); // L: 374 - if (var39 == null) { // L: 375 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 376 + var39 = BuddyRankComparator.field1342.method6757(var7[var20]); + if (var39 == null) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var39; // L: 379 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var39; } } } } } else { - var13 = var7[var20]; // L: 276 - Script var36 = class410.getScript(var13); // L: 277 - int[] var15 = new int[var36.localIntCount]; // L: 278 - String[] var16 = new String[var36.localStringCount]; // L: 279 + var13 = var7[var20]; + Script var36 = class410.getScript(var13); + int[] var15 = new int[var36.localIntCount]; + String[] var16 = new String[var36.localStringCount]; - for (var17 = 0; var17 < var36.intArgumentCount; ++var17) { // L: 280 + for (var17 = 0; var17 < var36.intArgumentCount; ++var17) { var15[var17] = Interpreter.Interpreter_intStack[var17 + (IsaacCipher.Interpreter_intStackSize - var36.intArgumentCount)]; } - for (var17 = 0; var17 < var36.stringArgumentCount; ++var17) { // L: 281 + for (var17 = 0; var17 < var36.stringArgumentCount; ++var17) { var16[var17] = Interpreter.Interpreter_stringStack[var17 + (class13.Interpreter_stringStackSize - var36.stringArgumentCount)]; } - IsaacCipher.Interpreter_intStackSize -= var36.intArgumentCount; // L: 282 - class13.Interpreter_stringStackSize -= var36.stringArgumentCount; // L: 283 - ScriptFrame var23 = new ScriptFrame(); // L: 284 - var23.script = var4; // L: 285 - var23.pc = var20; // L: 286 - var23.intLocals = SoundCache.Interpreter_intLocals; // L: 287 - var23.stringLocals = AbstractUserComparator.Interpreter_stringLocals; // L: 288 - Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var23; // L: 289 - var4 = var36; // L: 290 - var6 = var36.opcodes; // L: 291 - var7 = var36.intOperands; // L: 292 - var20 = -1; // L: 293 - SoundCache.Interpreter_intLocals = var15; // L: 294 - AbstractUserComparator.Interpreter_stringLocals = var16; // L: 295 + IsaacCipher.Interpreter_intStackSize -= var36.intArgumentCount; + class13.Interpreter_stringStackSize -= var36.stringArgumentCount; + ScriptFrame var23 = new ScriptFrame(); + var23.script = var4; + var23.pc = var20; + var23.intLocals = SoundCache.Interpreter_intLocals; + var23.stringLocals = AbstractUserComparator.Interpreter_stringLocals; + Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var23; + var4 = var36; + var6 = var36.opcodes; + var7 = var36.intOperands; + var20 = -1; + SoundCache.Interpreter_intLocals = var15; + AbstractUserComparator.Interpreter_stringLocals = var16; } } } - } catch (Exception var31) { // L: 403 - var9 = true; // L: 404 - StringBuilder var27 = new StringBuilder(30); // L: 406 - var27.append("").append(var4.key).append(" "); // L: 407 + } catch (Exception var31) { + var9 = true; + StringBuilder var27 = new StringBuilder(30); + var27.append("").append(var4.key).append(" "); + var13 = Interpreter.Interpreter_frameDepth - 1; + + while (true) { + if (var13 < 0) { + var27.append("").append(var8); + AccessFile.RunException_sendStackTrace(var27.toString(), var31); + var30 = false; + break; + } - for (var13 = Interpreter.Interpreter_frameDepth - 1; var13 >= 0; --var13) { // L: 408 var27.append("").append(Interpreter.Interpreter_frames[var13].script.key).append(" "); + --var13; } - - var27.append("").append(var8); // L: 409 - AccessFile.RunException_sendStackTrace(var27.toString(), var31); // L: 410 - var30 = false; - break label956; } } finally { if (var30) { while (Interpreter.field817.size() > 0) { - class92 var19 = (class92)Interpreter.field817.remove(0); // L: 415 + class92 var19 = (class92)Interpreter.field817.remove(0); SoundCache.widgetDefaultMenuAction(var19.method2340(), var19.method2339(), var19.method2341(), var19.method2348(), ""); } - if (Interpreter.field818) { // L: 418 - Interpreter.field818 = false; // L: 419 - class4.method28(); // L: 420 + if (Interpreter.field818) { + Interpreter.field818 = false; + class4.method28(); } if (!var9 && var2 > 0 && var10 >= var2) { @@ -401,8 +405,8 @@ public class ScriptFrame { } while (Interpreter.field817.size() > 0) { - class92 var41 = (class92)Interpreter.field817.remove(0); - SoundCache.widgetDefaultMenuAction(var41.method2340(), var41.method2339(), var41.method2341(), var41.method2348(), ""); + class92 var26 = (class92)Interpreter.field817.remove(0); + SoundCache.widgetDefaultMenuAction(var26.method2340(), var26.method2339(), var26.method2341(), var26.method2348(), ""); } if (Interpreter.field818) { @@ -414,12 +418,12 @@ public class ScriptFrame { AccessFile.RunException_sendStackTrace("Warning: Script " + var4.field937 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); } - return; // L: 214 + return; } - while (Interpreter.field817.size() > 0) { // L: 414 - class92 var26 = (class92)Interpreter.field817.remove(0); - SoundCache.widgetDefaultMenuAction(var26.method2340(), var26.method2339(), var26.method2341(), var26.method2348(), ""); + while (Interpreter.field817.size() > 0) { + class92 var41 = (class92)Interpreter.field817.remove(0); + SoundCache.widgetDefaultMenuAction(var41.method2340(), var41.method2339(), var41.method2341(), var41.method2348(), ""); } if (Interpreter.field818) { @@ -431,12 +435,12 @@ public class ScriptFrame { AccessFile.RunException_sendStackTrace("Warning: Script " + var4.field937 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); } - return; // L: 426 + return; } while (Interpreter.field817.size() > 0) { class92 var34 = (class92)Interpreter.field817.remove(0); - SoundCache.widgetDefaultMenuAction(var34.method2340(), var34.method2339(), var34.method2341(), var34.method2348(), ""); // L: 416 + SoundCache.widgetDefaultMenuAction(var34.method2340(), var34.method2339(), var34.method2341(), var34.method2348(), ""); } if (Interpreter.field818) { @@ -444,12 +448,12 @@ public class ScriptFrame { class4.method28(); } - if (!var9 && var2 > 0 && var10 >= var2) { // L: 422 - AccessFile.RunException_sendStackTrace("Warning: Script " + var4.field937 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); // L: 423 + if (!var9 && var2 > 0 && var10 >= var2) { + AccessFile.RunException_sendStackTrace("Warning: Script " + var4.field937 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); } } - } // L: 396 + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -459,74 +463,74 @@ public class ScriptFrame { @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: 126 - Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 127 + if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { + Tiles.Tiles_renderFlags[var1][var2][var3] = 0; while (true) { - var7 = var0.readUnsignedByte(); // L: 129 - if (var7 == 0) { // L: 130 - if (var1 == 0) { // L: 131 - int[] var14 = Tiles.Tiles_heights[0][var2]; // L: 132 - int var11 = var2 + var4 + 932731; // L: 135 + var7 = var0.readUnsignedByte(); + if (var7 == 0) { + if (var1 == 0) { + int[] var14 = Tiles.Tiles_heights[0][var2]; + int var11 = var2 + var4 + 932731; int var12 = var3 + var5 + 556238; - int var13 = class260.method5069(var11 + 45365, var12 + 91923, 4) - 128 + (class260.method5069(10294 + var11, 37821 + var12, 2) - 128 >> 1) + (class260.method5069(var11, var12, 1) - 128 >> 2); // L: 138 - var13 = (int)((double)var13 * 0.3D) + 35; // L: 139 - if (var13 < 10) { // L: 140 + int var13 = class260.method5069(var11 + 45365, var12 + 91923, 4) - 128 + (class260.method5069(10294 + var11, 37821 + var12, 2) - 128 >> 1) + (class260.method5069(var11, var12, 1) - 128 >> 2); + var13 = (int)((double)var13 * 0.3D) + 35; + if (var13 < 10) { var13 = 10; - } else if (var13 > 60) { // L: 141 + } else if (var13 > 60) { var13 = 60; } - var14[var3] = -var13 * 8; // L: 144 + var14[var3] = -var13 * 8; } else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; // L: 146 + Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; } break; } - if (var7 == 1) { // L: 149 - int var8 = var0.readUnsignedByte(); // L: 150 - if (var8 == 1) { // L: 151 + if (var7 == 1) { + int var8 = var0.readUnsignedByte(); + if (var8 == 1) { var8 = 0; } - if (var1 == 0) { // L: 152 + if (var1 == 0) { Tiles.Tiles_heights[0][var2][var3] = -var8 * 8; } else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var8 * 8; // L: 153 + Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var8 * 8; } break; } - if (var7 <= 49) { // L: 156 - Tiles.Tiles_overlays[var1][var2][var3] = var0.readByte(); // L: 157 - Tiles.Tiles_shapes[var1][var2][var3] = (byte)((var7 - 2) / 4); // L: 158 - WorldMapLabelSize.field2580[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); // L: 159 - } else if (var7 <= 81) { // L: 162 - Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); // L: 163 + if (var7 <= 49) { + Tiles.Tiles_overlays[var1][var2][var3] = var0.readByte(); + Tiles.Tiles_shapes[var1][var2][var3] = (byte)((var7 - 2) / 4); + WorldMapLabelSize.field2580[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); + } else if (var7 <= 81) { + Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); } else { - Tiles.Tiles_underlays[var1][var2][var3] = (byte)(var7 - 81); // L: 166 + Tiles.Tiles_underlays[var1][var2][var3] = (byte)(var7 - 81); } } } else { while (true) { - var7 = var0.readUnsignedByte(); // L: 171 - if (var7 == 0) { // L: 172 + var7 = var0.readUnsignedByte(); + if (var7 == 0) { break; } - if (var7 == 1) { // L: 173 - var0.readUnsignedByte(); // L: 174 + if (var7 == 1) { + var0.readUnsignedByte(); break; } - if (var7 <= 49) { // L: 177 + if (var7 <= 49) { var0.readUnsignedByte(); } } } - } // L: 180 + } @ObfuscatedName("n") @ObfuscatedSignature( @@ -534,6 +538,6 @@ public class ScriptFrame { garbageValue = "1370934798" ) public static void method1110() { - KitDefinition.KitDefinition_cached.clear(); // L: 136 - } // L: 137 + KitDefinition.KitDefinition_cached.clear(); + } } diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java index e4ce8460c1..724780afc2 100644 --- a/runescape-client/src/main/java/SecureRandomCallable.java +++ b/runescape-client/src/main/java/SecureRandomCallable.java @@ -8,10 +8,10 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("SecureRandomCallable") public class SecureRandomCallable implements Callable { SecureRandomCallable() { - } // L: 36 + } public Object call() { - return WallDecoration.method4340(); // L: 46 + return WallDecoration.method4340(); } @ObfuscatedName("c") @@ -21,18 +21,18 @@ public class SecureRandomCallable implements Callable { ) @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 + VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); + if (var1 != null) { return var1; } else { - byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); // L: 20 - var1 = new VarpDefinition(); // L: 21 - if (var2 != null) { // L: 22 + byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); + var1 = new VarpDefinition(); + if (var2 != null) { var1.decode(new Buffer(var2)); } - VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); // L: 23 - return var1; // L: 24 + VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); + return var1; } } @@ -43,9 +43,9 @@ public class SecureRandomCallable implements Callable { ) @Export("invalidateWidget") static void invalidateWidget(Widget var0) { - if (var0.cycle == Client.field684) { // L: 12032 - Client.field504[var0.rootIndex] = true; // L: 12033 + if (var0.cycle == Client.field684) { + Client.field504[var0.rootIndex] = true; } - } // L: 12035 + } } diff --git a/runescape-client/src/main/java/SecureRandomFuture.java b/runescape-client/src/main/java/SecureRandomFuture.java index 84a4848e49..3b32bfa3c3 100644 --- a/runescape-client/src/main/java/SecureRandomFuture.java +++ b/runescape-client/src/main/java/SecureRandomFuture.java @@ -24,9 +24,9 @@ public class SecureRandomFuture { Future future; SecureRandomFuture() { - this.executor = Executors.newSingleThreadExecutor(); // L: 10 - this.future = this.executor.submit(new SecureRandomCallable()); // L: 14 - } // L: 15 + this.executor = Executors.newSingleThreadExecutor(); + this.future = this.executor.submit(new SecureRandomCallable()); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -35,9 +35,9 @@ public class SecureRandomFuture { ) @Export("shutdown") void shutdown() { - this.executor.shutdown(); // L: 18 - this.executor = null; // L: 19 - } // L: 20 + this.executor.shutdown(); + this.executor = null; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -46,7 +46,7 @@ public class SecureRandomFuture { ) @Export("isDone") boolean isDone() { - return this.future.isDone(); // L: 23 + return this.future.isDone(); } @ObfuscatedName("p") @@ -57,9 +57,9 @@ public class SecureRandomFuture { @Export("get") SecureRandom get() { try { - return (SecureRandom)this.future.get(); // L: 28 - } catch (Exception var2) { // L: 30 - return WallDecoration.method4340(); // L: 31 + return (SecureRandom)this.future.get(); + } catch (Exception var2) { + return WallDecoration.method4340(); } } @@ -70,12 +70,12 @@ public class SecureRandomFuture { ) @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: 89 - if (var3) { // L: 90 + long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17; + if (var3) { var5 |= 65536L; } - return var5; // L: 91 + return var5; } @ObfuscatedName("fz") @@ -85,18 +85,18 @@ public class SecureRandomFuture { ) @Export("forceDisconnect") static final void forceDisconnect(int var0) { - LoginScreenAnimation.logOut(); // L: 3565 - switch(var0) { // L: 3566 + LoginScreenAnimation.logOut(); + switch(var0) { case 1: - PlayerType.method5521(24); // L: 3578 - class19.setLoginResponseString("", "You were disconnected from the server.", ""); // L: 3579 + PlayerType.method5521(24); + class19.setLoginResponseString("", "You were disconnected from the server.", ""); break; case 2: - PlayerType.method5521(24); // L: 3570 - class19.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); // L: 3571 + PlayerType.method5521(24); + class19.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); } - } // L: 3584 + } @ObfuscatedName("ge") @ObfuscatedSignature( @@ -104,61 +104,61 @@ public class SecureRandomFuture { garbageValue = "-1736689537" ) static final void method2025(int var0, int var1) { - if (var0 < 128) { // L: 4575 + if (var0 < 128) { var0 = 128; } - if (var0 > 383) { // L: 4576 + if (var0 > 383) { var0 = 383; } - if (UserComparator7.cameraPitch < var0) { // L: 4577 - UserComparator7.cameraPitch = (var0 - UserComparator7.cameraPitch) * ChatChannel.field956 / 1000 + UserComparator7.cameraPitch + WorldMapSection1.field2755; // L: 4578 - if (UserComparator7.cameraPitch > var0) { // L: 4579 + if (UserComparator7.cameraPitch < var0) { + UserComparator7.cameraPitch = (var0 - UserComparator7.cameraPitch) * ChatChannel.field956 / 1000 + UserComparator7.cameraPitch + WorldMapSection1.field2755; + if (UserComparator7.cameraPitch > var0) { UserComparator7.cameraPitch = var0; } } - if (UserComparator7.cameraPitch > var0) { // L: 4581 - UserComparator7.cameraPitch -= (UserComparator7.cameraPitch - var0) * ChatChannel.field956 / 1000 + WorldMapSection1.field2755; // L: 4582 - if (UserComparator7.cameraPitch < var0) { // L: 4583 + if (UserComparator7.cameraPitch > var0) { + UserComparator7.cameraPitch -= (UserComparator7.cameraPitch - var0) * ChatChannel.field956 / 1000 + WorldMapSection1.field2755; + if (UserComparator7.cameraPitch < var0) { UserComparator7.cameraPitch = var0; } } - int var2 = var1 - class379.cameraYaw; // L: 4585 - if (var2 > 1024) { // L: 4586 + int var2 = var1 - class379.cameraYaw; + if (var2 > 1024) { var2 -= 2048; } - if (var2 < -1024) { // L: 4587 + if (var2 < -1024) { var2 += 2048; } - if (var2 > 0) { // L: 4588 - class379.cameraYaw = class379.cameraYaw + WorldMapSection1.field2755 + var2 * ChatChannel.field956 / 1000; // L: 4589 - class379.cameraYaw &= 2047; // L: 4590 + if (var2 > 0) { + class379.cameraYaw = class379.cameraYaw + WorldMapSection1.field2755 + var2 * ChatChannel.field956 / 1000; + class379.cameraYaw &= 2047; } - if (var2 < 0) { // L: 4592 - class379.cameraYaw -= -var2 * ChatChannel.field956 / 1000 + WorldMapSection1.field2755; // L: 4593 - class379.cameraYaw &= 2047; // L: 4594 + if (var2 < 0) { + class379.cameraYaw -= -var2 * ChatChannel.field956 / 1000 + WorldMapSection1.field2755; + class379.cameraYaw &= 2047; } - int var3 = var1 - class379.cameraYaw; // L: 4596 - if (var3 > 1024) { // L: 4597 + int var3 = var1 - class379.cameraYaw; + if (var3 > 1024) { var3 -= 2048; } - if (var3 < -1024) { // L: 4598 + if (var3 < -1024) { var3 += 2048; } - if (var3 < 0 && var2 > 0 || var3 > 0 && var2 < 0) { // L: 4599 + if (var3 < 0 && var2 > 0 || var3 > 0 && var2 < 0) { class379.cameraYaw = var1; } - } // L: 4600 + } @ObfuscatedName("ls") @ObfuscatedSignature( @@ -167,10 +167,10 @@ public class SecureRandomFuture { ) @Export("Widget_getSpellActionName") static String Widget_getSpellActionName(Widget var0) { - if (class404.Widget_unpackTargetMask(class363.getWidgetFlags(var0)) == 0) { // L: 12581 + if (class404.Widget_unpackTargetMask(class363.getWidgetFlags(var0)) == 0) { return null; } else { - return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; // L: 12582 12583 12585 + return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; } } } diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java index e49bbbc066..7942527bfb 100644 --- a/runescape-client/src/main/java/SequenceDefinition.java +++ b/runescape-client/src/main/java/SequenceDefinition.java @@ -115,26 +115,26 @@ public class SequenceDefinition extends DualNode { public int field2078; static { - field2084 = false; // L: 16 - SequenceDefinition_cached = new EvictingDualNodeHashTable(64); // L: 20 - SequenceDefinition_cachedFrames = new EvictingDualNodeHashTable(100); // L: 21 - field2086 = new EvictingDualNodeHashTable(100); // L: 22 + field2084 = false; + SequenceDefinition_cached = new EvictingDualNodeHashTable(64); + SequenceDefinition_cachedFrames = new EvictingDualNodeHashTable(100); + field2086 = new EvictingDualNodeHashTable(100); } SequenceDefinition() { - this.field2079 = -1; // L: 23 + this.field2079 = -1; this.field2082 = 0; this.field2083 = 0; - this.frameCount = -1; // L: 31 - this.field2091 = false; // L: 34 - this.field2092 = 5; // L: 35 + this.frameCount = -1; + this.field2091 = false; + this.field2092 = 5; this.shield = -1; - this.weapon = -1; // L: 37 - this.field2095 = 99; // L: 38 - this.field2096 = -1; // L: 39 - this.field2097 = -1; // L: 40 - this.field2078 = 2; // L: 41 - } // L: 43 + this.weapon = -1; + this.field2095 = 99; + this.field2096 = -1; + this.field2097 = -1; + this.field2078 = 2; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -144,12 +144,12 @@ public class SequenceDefinition extends DualNode { @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 58 - if (var2 == 0) { // L: 59 - return; // L: 62 + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; } - this.decodeNext(var1, var2); // L: 60 + this.decodeNext(var1, var2); } } @@ -162,97 +162,97 @@ public class SequenceDefinition extends DualNode { void decodeNext(Buffer var1, int var2) { int var3; int var4; - if (var2 == 1) { // L: 65 - var3 = var1.readUnsignedShort(); // L: 66 - this.frameLengths = new int[var3]; // L: 67 + if (var2 == 1) { + var3 = var1.readUnsignedShort(); + this.frameLengths = new int[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 68 + for (var4 = 0; var4 < var3; ++var4) { this.frameLengths[var4] = var1.readUnsignedShort(); } - this.frameIds = new int[var3]; // L: 69 + this.frameIds = new int[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 70 + for (var4 = 0; var4 < var3; ++var4) { this.frameIds[var4] = var1.readUnsignedShort(); } - for (var4 = 0; var4 < var3; ++var4) { // L: 71 + for (var4 = 0; var4 < var3; ++var4) { this.frameIds[var4] += var1.readUnsignedShort() << 16; } - } else if (var2 == 2) { // L: 73 + } else if (var2 == 2) { this.frameCount = var1.readUnsignedShort(); - } else if (var2 == 3) { // L: 74 - var3 = var1.readUnsignedByte(); // L: 75 - this.field2089 = new int[var3 + 1]; // L: 76 + } else if (var2 == 3) { + var3 = var1.readUnsignedByte(); + this.field2089 = new int[var3 + 1]; - for (var4 = 0; var4 < var3; ++var4) { // L: 77 + for (var4 = 0; var4 < var3; ++var4) { this.field2089[var4] = var1.readUnsignedByte(); } - this.field2089[var3] = 9999999; // L: 78 - } else if (var2 == 4) { // L: 80 + this.field2089[var3] = 9999999; + } else if (var2 == 4) { this.field2091 = true; - } else if (var2 == 5) { // L: 81 + } else if (var2 == 5) { this.field2092 = var1.readUnsignedByte(); - } else if (var2 == 6) { // L: 82 + } else if (var2 == 6) { this.shield = var1.readUnsignedShort(); - } else if (var2 == 7) { // L: 83 + } else if (var2 == 7) { this.weapon = var1.readUnsignedShort(); - } else if (var2 == 8) { // L: 84 + } else if (var2 == 8) { this.field2095 = var1.readUnsignedByte(); - } else if (var2 == 9) { // L: 85 + } else if (var2 == 9) { this.field2096 = var1.readUnsignedByte(); - } else if (var2 == 10) { // L: 86 + } else if (var2 == 10) { this.field2097 = var1.readUnsignedByte(); - } else if (var2 == 11) { // L: 87 + } else if (var2 == 11) { this.field2078 = var1.readUnsignedByte(); - } else if (var2 == 12) { // L: 88 - var3 = var1.readUnsignedByte(); // L: 89 - this.chatFrameIds = new int[var3]; // L: 90 + } else if (var2 == 12) { + var3 = var1.readUnsignedByte(); + this.chatFrameIds = new int[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 91 + for (var4 = 0; var4 < var3; ++var4) { this.chatFrameIds[var4] = var1.readUnsignedShort(); } - for (var4 = 0; var4 < var3; ++var4) { // L: 92 + for (var4 = 0; var4 < var3; ++var4) { this.chatFrameIds[var4] += var1.readUnsignedShort() << 16; } - } else if (var2 == 13) { // L: 94 - var3 = var1.readUnsignedByte(); // L: 95 - this.soundEffects = new int[var3]; // L: 96 + } else if (var2 == 13) { + var3 = var1.readUnsignedByte(); + this.soundEffects = new int[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 97 + for (var4 = 0; var4 < var3; ++var4) { this.soundEffects[var4] = var1.readMedium(); } - } else if (var2 == 14) { // L: 99 - this.field2079 = var1.readInt(); // L: 100 - } else if (var2 == 15) { // L: 102 - var3 = var1.readUnsignedShort(); // L: 103 - this.field2075 = new HashMap(); // L: 104 + } else if (var2 == 14) { + this.field2079 = var1.readInt(); + } else if (var2 == 15) { + var3 = var1.readUnsignedShort(); + this.field2075 = new HashMap(); - for (var4 = 0; var4 < var3; ++var4) { // L: 105 - int var5 = var1.readUnsignedShort(); // L: 106 - int var6 = var1.readMedium(); // L: 107 - this.field2075.put(var5, var6); // L: 108 + for (var4 = 0; var4 < var3; ++var4) { + int var5 = var1.readUnsignedShort(); + int var6 = var1.readMedium(); + this.field2075.put(var5, var6); } - } else if (var2 == 16) { // L: 111 - this.field2082 = var1.readUnsignedShort(); // L: 112 - this.field2083 = var1.readUnsignedShort(); // L: 113 - } else if (var2 == 17) { // L: 115 - this.field2081 = new boolean[256]; // L: 116 + } else if (var2 == 16) { + this.field2082 = var1.readUnsignedShort(); + this.field2083 = var1.readUnsignedShort(); + } else if (var2 == 17) { + this.field2081 = new boolean[256]; - for (var3 = 0; var3 < this.field2081.length; ++var3) { // L: 117 - this.field2081[var3] = false; // L: 118 + for (var3 = 0; var3 < this.field2081.length; ++var3) { + this.field2081[var3] = false; } - var3 = var1.readUnsignedByte(); // L: 120 + var3 = var1.readUnsignedByte(); - for (var4 = 0; var4 < var3; ++var4) { // L: 121 - this.field2081[var1.readUnsignedByte()] = true; // L: 122 + for (var4 = 0; var4 < var3; ++var4) { + this.field2081[var1.readUnsignedByte()] = true; } } - } // L: 126 + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -261,23 +261,23 @@ public class SequenceDefinition extends DualNode { ) @Export("postDecode") void postDecode() { - if (this.field2096 == -1) { // L: 129 - if (this.field2089 == null && this.field2081 == null) { // L: 130 - this.field2096 = 0; // L: 131 + if (this.field2096 == -1) { + if (this.field2089 == null && this.field2081 == null) { + this.field2096 = 0; } else { this.field2096 = 2; } } - if (this.field2097 == -1) { // L: 133 - if (this.field2089 == null && this.field2081 == null) { // L: 134 - this.field2097 = 0; // L: 135 + if (this.field2097 == -1) { + if (this.field2089 == null && this.field2081 == null) { + this.field2097 = 0; } else { this.field2097 = 2; } } - } // L: 137 + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -287,25 +287,25 @@ public class SequenceDefinition extends DualNode { @Export("transformActorModel") public Model transformActorModel(Model var1, int var2) { Model var4; - if (!this.method3690()) { // L: 140 - var2 = this.frameIds[var2]; // L: 141 - Frames var5 = ItemComposition.getFrames(var2 >> 16); // L: 142 - var2 &= 65535; // L: 143 - if (var5 == null) { // L: 144 + if (!this.method3690()) { + var2 = this.frameIds[var2]; + Frames var5 = ItemComposition.getFrames(var2 >> 16); + var2 &= 65535; + if (var5 == null) { return var1.toSharedSequenceModel(true); } else { - var4 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); // L: 145 - var4.animate(var5, var2); // L: 146 - return var4; // L: 147 + var4 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); + var4.animate(var5, var2); + return var4; } } else { - class120 var3 = JagexCache.method3064(this.field2079); // L: 150 - if (var3 == null) { // L: 151 + class120 var3 = JagexCache.method3064(this.field2079); + if (var3 == null) { return var1.toSharedSequenceModel(true); } else { - var4 = var1.toSharedSequenceModel(!var3.method2695()); // L: 152 - var4.method4271(var3, var2); // L: 153 - return var4; // L: 154 + var4 = var1.toSharedSequenceModel(!var3.method2695()); + var4.method4271(var3, var2); + return var4; } } } @@ -318,59 +318,59 @@ public class SequenceDefinition extends DualNode { @Export("transformObjectModel") Model transformObjectModel(Model var1, int var2, int var3) { Model var5; - if (!this.method3690()) { // L: 159 - var2 = this.frameIds[var2]; // L: 160 - Frames var6 = ItemComposition.getFrames(var2 >> 16); // L: 161 - var2 &= 65535; // L: 162 - if (var6 == null) { // L: 163 + if (!this.method3690()) { + var2 = this.frameIds[var2]; + Frames var6 = ItemComposition.getFrames(var2 >> 16); + var2 &= 65535; + if (var6 == null) { return var1.toSharedSequenceModel(true); } else { - var5 = var1.toSharedSequenceModel(!var6.hasAlphaTransform(var2)); // L: 164 - var3 &= 3; // L: 165 - if (var3 == 1) { // L: 166 - var5.rotateY270Ccw(); - } else if (var3 == 2) { // L: 167 - var5.rotateY180(); - } else if (var3 == 3) { // L: 168 + var5 = var1.toSharedSequenceModel(!var6.hasAlphaTransform(var2)); + var3 &= 3; + if (var3 == 1) { + var5.method4190(); + } else if (var3 == 2) { + var5.method4206(); + } else if (var3 == 3) { var5.rotateY90Ccw(); } - var5.animate(var6, var2); // L: 169 - if (var3 == 1) { // L: 170 - var5.rotateY90Ccw(); - } else if (var3 == 2) { // L: 171 - var5.rotateY180(); - } else if (var3 == 3) { // L: 172 - var5.rotateY270Ccw(); - } - - return var5; // L: 173 - } - } else { - class120 var4 = JagexCache.method3064(this.field2079); // L: 176 - if (var4 == null) { // L: 177 - return var1.toSharedSequenceModel(true); - } else { - var5 = var1.toSharedSequenceModel(!var4.method2695()); // L: 178 - var3 &= 3; // L: 179 - if (var3 == 1) { // L: 180 - var5.rotateY270Ccw(); - } else if (var3 == 2) { // L: 181 - var5.rotateY180(); - } else if (var3 == 3) { // L: 182 - var5.rotateY90Ccw(); - } - - var5.method4271(var4, var2); // L: 183 - if (var3 == 1) { // L: 184 + var5.animate(var6, var2); + if (var3 == 1) { var5.rotateY90Ccw(); } else if (var3 == 2) { - var5.rotateY180(); // L: 185 - } else if (var3 == 3) { // L: 186 - var5.rotateY270Ccw(); + var5.method4206(); + } else if (var3 == 3) { + var5.method4190(); } - return var5; // L: 187 + return var5; + } + } else { + class120 var4 = JagexCache.method3064(this.field2079); + if (var4 == null) { + return var1.toSharedSequenceModel(true); + } else { + var5 = var1.toSharedSequenceModel(!var4.method2695()); + var3 &= 3; + if (var3 == 1) { + var5.method4190(); + } else if (var3 == 2) { + var5.method4206(); + } else if (var3 == 3) { + var5.rotateY90Ccw(); + } + + var5.method4271(var4, var2); + if (var3 == 1) { + var5.rotateY90Ccw(); + } else if (var3 == 2) { + var5.method4206(); + } else if (var3 == 3) { + var5.method4190(); + } + + return var5; } } } @@ -383,25 +383,25 @@ public class SequenceDefinition extends DualNode { @Export("transformSpotAnimationModel") Model transformSpotAnimationModel(Model var1, int var2) { Model var4; - if (!this.method3690()) { // L: 192 - var2 = this.frameIds[var2]; // L: 193 - Frames var5 = ItemComposition.getFrames(var2 >> 16); // L: 194 - var2 &= 65535; // L: 195 - if (var5 == null) { // L: 196 + if (!this.method3690()) { + var2 = this.frameIds[var2]; + Frames var5 = ItemComposition.getFrames(var2 >> 16); + var2 &= 65535; + if (var5 == null) { return var1.toSharedSpotAnimationModel(true); } else { - var4 = var1.toSharedSpotAnimationModel(!var5.hasAlphaTransform(var2)); // L: 197 - var4.animate(var5, var2); // L: 198 - return var4; // L: 199 + var4 = var1.toSharedSpotAnimationModel(!var5.hasAlphaTransform(var2)); + var4.animate(var5, var2); + return var4; } } else { - class120 var3 = JagexCache.method3064(this.field2079); // L: 202 - if (var3 == null) { // L: 203 + class120 var3 = JagexCache.method3064(this.field2079); + if (var3 == null) { return var1.toSharedSpotAnimationModel(true); } else { - var4 = var1.toSharedSpotAnimationModel(!var3.method2695()); // L: 204 - var4.method4271(var3, var2); // L: 205 - return var4; // L: 206 + var4 = var1.toSharedSpotAnimationModel(!var3.method2695()); + var4.method4271(var3, var2); + return var4; } } } @@ -413,65 +413,65 @@ public class SequenceDefinition extends DualNode { ) @Export("applyTransformations") public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, int var4) { - if (field2084 && !this.method3690() && !var3.method3690()) { // L: 211 - return this.method3674(var1, var2, var3, var4); // L: 212 + if (field2084 && !this.method3690() && !var3.method3690()) { + return this.method3674(var1, var2, var3, var4); } else { - Model var5 = var1.toSharedSequenceModel(false); // L: 214 - boolean var6 = false; // L: 215 - Frames var7 = null; // L: 216 + Model var5 = var1.toSharedSequenceModel(false); + boolean var6 = false; + Frames var7 = null; class120 var8; - if (this.method3690()) { // L: 217 - var8 = this.method3648(); // L: 218 - if (var3.method3690() && this.field2081 == null) { // L: 219 - var5.method4271(var8, var2); // L: 220 - return var5; // L: 221 + if (this.method3690()) { + var8 = this.method3648(); + if (var3.method3690() && this.field2081 == null) { + var5.method4271(var8, var2); + return var5; } - var5.method4202(var8, var2, this.field2081, false); // L: 223 + var5.method4202(var8, var2, this.field2081, false); } else { - var2 = this.frameIds[var2]; // L: 226 - var7 = ItemComposition.getFrames(var2 >> 16); // L: 227 - var2 &= 65535; // L: 228 - if (var7 == null) { // L: 229 + var2 = this.frameIds[var2]; + var7 = ItemComposition.getFrames(var2 >> 16); + var2 &= 65535; + if (var7 == null) { return var3.transformActorModel(var1, var4); } - if (!var3.method3690() && (this.field2089 == null || var4 == -1)) { // L: 230 - var5.animate(var7, var2); // L: 231 - return var5; // L: 232 + if (!var3.method3690() && (this.field2089 == null || var4 == -1)) { + var5.animate(var7, var2); + return var5; } - if (this.field2089 == null || var4 == -1) { // L: 234 - var5.animate(var7, var2); // L: 235 - return var5; // L: 236 + if (this.field2089 == null || var4 == -1) { + var5.animate(var7, var2); + return var5; } - var6 = var3.method3690(); // L: 238 - if (!var6) { // L: 239 - var5.method4203(var7, var2, this.field2089, false); // L: 240 + var6 = var3.method3690(); + if (!var6) { + var5.method4203(var7, var2, this.field2089, false); } } - if (var3.method3690()) { // L: 243 - var8 = var3.method3648(); // L: 244 - var5.method4202(var8, var4, this.field2081, true); // L: 245 + if (var3.method3690()) { + var8 = var3.method3648(); + var5.method4202(var8, var4, this.field2081, true); } else { - var4 = var3.frameIds[var4]; // L: 248 - Frames var9 = ItemComposition.getFrames(var4 >> 16); // L: 249 - var4 &= 65535; // L: 250 - if (var9 == null) { // L: 251 + var4 = var3.frameIds[var4]; + Frames var9 = ItemComposition.getFrames(var4 >> 16); + var4 &= 65535; + if (var9 == null) { return this.transformActorModel(var1, var2); } - var5.method4203(var9, var4, this.field2089, true); // L: 252 + var5.method4203(var9, var4, this.field2089, true); } - if (var6 && var7 != null) { // L: 254 - var5.method4203(var7, var2, this.field2089, false); // L: 255 + if (var6 && var7 != null) { + var5.method4203(var7, var2, this.field2089, false); } - var5.resetBounds(); // L: 257 - return var5; // L: 258 + var5.resetBounds(); + return var5; } } @@ -481,24 +481,24 @@ public class SequenceDefinition extends DualNode { garbageValue = "-2136022860" ) Model method3674(Model var1, int var2, SequenceDefinition var3, int var4) { - var2 = this.frameIds[var2]; // L: 262 - Frames var5 = ItemComposition.getFrames(var2 >> 16); // L: 263 - var2 &= 65535; // L: 264 - if (var5 == null) { // L: 265 + var2 = this.frameIds[var2]; + Frames var5 = ItemComposition.getFrames(var2 >> 16); + var2 &= 65535; + if (var5 == null) { return var3.transformActorModel(var1, var4); } else { - var4 = var3.frameIds[var4]; // L: 266 - Frames var6 = ItemComposition.getFrames(var4 >> 16); // L: 267 - var4 &= 65535; // L: 268 + var4 = var3.frameIds[var4]; + Frames var6 = ItemComposition.getFrames(var4 >> 16); + var4 &= 65535; 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 + if (var6 == null) { + var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); + var7.animate(var5, var2); + return var7; } else { - var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); // L: 274 - var7.animate2(var5, var2, var6, var4, this.field2089); // L: 275 - return var7; // L: 276 + var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); + var7.animate2(var5, var2, var6, var4, this.field2089); + return var7; } } } @@ -510,35 +510,35 @@ public class SequenceDefinition extends DualNode { ) @Export("transformWidgetModel") public Model transformWidgetModel(Model var1, int var2) { - if (!this.method3690()) { // L: 280 - int var3 = this.frameIds[var2]; // L: 281 - Frames var4 = ItemComposition.getFrames(var3 >> 16); // L: 282 - var3 &= 65535; // L: 283 - if (var4 == null) { // L: 284 + if (!this.method3690()) { + int var3 = this.frameIds[var2]; + Frames var4 = ItemComposition.getFrames(var3 >> 16); + var3 &= 65535; + if (var4 == null) { return var1.toSharedSequenceModel(true); } else { - 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 = ItemComposition.getFrames(var6 >> 16); // L: 289 - var6 &= 65535; // L: 290 + Frames var5 = null; + int var6 = 0; + if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { + var6 = this.chatFrameIds[var2]; + var5 = ItemComposition.getFrames(var6 >> 16); + var6 &= 65535; } Model var7; - 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 + if (var5 != null && var6 != 65535) { + var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3) & !var5.hasAlphaTransform(var6)); + var7.animate(var4, var3); + var7.animate(var5, var6); + return var7; } else { - var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3)); // L: 293 - var7.animate(var4, var3); // L: 294 - return var7; // L: 295 + var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3)); + var7.animate(var4, var3); + return var7; } } } else { - return this.transformActorModel(var1, var2); // L: 303 + return this.transformActorModel(var1, var2); } } @@ -548,7 +548,7 @@ public class SequenceDefinition extends DualNode { garbageValue = "-1401537933" ) public boolean method3690() { - return this.field2079 >= 0; // L: 308 + return this.field2079 >= 0; } @ObfuscatedName("v") @@ -557,7 +557,7 @@ public class SequenceDefinition extends DualNode { garbageValue = "2132950979" ) public int method3647() { - return this.field2083 - this.field2082; // L: 312 + return this.field2083 - this.field2082; } @ObfuscatedName("h") @@ -566,7 +566,7 @@ public class SequenceDefinition extends DualNode { garbageValue = "0" ) public class120 method3648() { - return this.method3690() ? JagexCache.method3064(this.field2079) : null; // L: 353 354 357 + return this.method3690() ? JagexCache.method3064(this.field2079) : null; } @ObfuscatedName("b") @@ -577,20 +577,20 @@ public class SequenceDefinition extends DualNode { public static String method3689(Buffer var0) { String var1; try { - int var2 = var0.readUShortSmart(); // L: 25 - if (var2 > 32767) { // L: 26 + int var2 = var0.readUShortSmart(); + if (var2 > 32767) { var2 = 32767; } - byte[] var3 = new byte[var2]; // L: 27 - var0.offset += class410.huffman.decompress(var0.array, var0.offset, var3, 0, var2); // L: 28 - String var4 = PendingSpawn.decodeStringCp1252(var3, 0, var2); // L: 29 - var1 = var4; // L: 30 - } catch (Exception var6) { // L: 32 - var1 = "Cabbage"; // L: 33 + byte[] var3 = new byte[var2]; + var0.offset += class410.huffman.decompress(var0.array, var0.offset, var3, 0, var2); + String var4 = PendingSpawn.decodeStringCp1252(var3, 0, var2); + var1 = var4; + } catch (Exception var6) { + var1 = "Cabbage"; } - return var1; // L: 36 + return var1; } @ObfuscatedName("ah") @@ -599,356 +599,356 @@ public class SequenceDefinition extends DualNode { garbageValue = "-942937629" ) static int method3640(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.FRIEND_COUNT) { // L: 2130 - if (GameEngine.friendSystem.field778 == 0) { // L: 2131 + if (var0 == ScriptOpcodes.FRIEND_COUNT) { + if (GameEngine.friendSystem.field778 == 0) { Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -2; - } else if (GameEngine.friendSystem.field778 == 1) { // L: 2132 + } else if (GameEngine.friendSystem.field778 == 1) { Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = GameEngine.friendSystem.friendsList.getSize(); // L: 2133 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = GameEngine.friendSystem.friendsList.getSize(); } - return 1; // L: 2134 + return 1; } else { int var3; if (var0 == ScriptOpcodes.FRIEND_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2137 - if (GameEngine.friendSystem.method1728() && var3 >= 0 && var3 < GameEngine.friendSystem.friendsList.getSize()) { // L: 2138 - Friend var8 = (Friend)GameEngine.friendSystem.friendsList.get(var3); // L: 2139 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var8.getName(); // L: 2140 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var8.getPreviousName(); // L: 2141 + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + if (GameEngine.friendSystem.method1728() && var3 >= 0 && var3 < GameEngine.friendSystem.friendsList.getSize()) { + Friend var8 = (Friend)GameEngine.friendSystem.friendsList.get(var3); + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var8.getName(); + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var8.getPreviousName(); } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 2144 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 2145 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; } - return 1; // L: 2147 + return 1; } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2150 - if (GameEngine.friendSystem.method1728() && var3 >= 0 && var3 < GameEngine.friendSystem.friendsList.getSize()) { // L: 2151 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = ((Buddy)GameEngine.friendSystem.friendsList.get(var3)).world; // L: 2152 + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + if (GameEngine.friendSystem.method1728() && var3 >= 0 && var3 < GameEngine.friendSystem.friendsList.getSize()) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = ((Buddy)GameEngine.friendSystem.friendsList.get(var3)).world; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 2154 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; } - return 1; // L: 2155 + return 1; } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2158 - if (GameEngine.friendSystem.method1728() && var3 >= 0 && var3 < GameEngine.friendSystem.friendsList.getSize()) { // L: 2159 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = ((Buddy)GameEngine.friendSystem.friendsList.get(var3)).rank; // L: 2160 + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + if (GameEngine.friendSystem.method1728() && var3 >= 0 && var3 < GameEngine.friendSystem.friendsList.getSize()) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = ((Buddy)GameEngine.friendSystem.friendsList.get(var3)).rank; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 2162 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; } - return 1; // L: 2163 + return 1; } else { String var5; if (var0 == ScriptOpcodes.FRIEND_SETRANK) { - var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2166 - int var6 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2167 - class113.method2618(var5, var6); // L: 2168 - return 1; // L: 2169 + var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + int var6 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + class113.method2618(var5, var6); + return 1; } else if (var0 == ScriptOpcodes.FRIEND_ADD) { - var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2172 - GameEngine.friendSystem.addFriend(var5); // L: 2173 - return 1; // L: 2174 + var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + GameEngine.friendSystem.addFriend(var5); + return 1; } else if (var0 == ScriptOpcodes.FRIEND_DEL) { - var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2177 - GameEngine.friendSystem.removeFriend(var5); // L: 2178 - return 1; // L: 2179 + var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + GameEngine.friendSystem.removeFriend(var5); + return 1; } else if (var0 == ScriptOpcodes.IGNORE_ADD) { - var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2182 - GameEngine.friendSystem.addIgnore(var5); // L: 2183 - return 1; // L: 2184 + var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + GameEngine.friendSystem.addIgnore(var5); + return 1; } else if (var0 == ScriptOpcodes.IGNORE_DEL) { - var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2187 - GameEngine.friendSystem.removeIgnore(var5); // L: 2188 - return 1; // L: 2189 + var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + GameEngine.friendSystem.removeIgnore(var5); + return 1; } else if (var0 == ScriptOpcodes.FRIEND_TEST) { - var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2192 - var5 = AbstractWorldMapData.method4791(var5); // L: 2193 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = GameEngine.friendSystem.isFriended(new Username(var5, class194.loginType), false) ? 1 : 0; // L: 2194 - return 1; // L: 2195 + var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + var5 = AbstractWorldMapData.method4791(var5); + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = GameEngine.friendSystem.isFriended(new Username(var5, class194.loginType), false) ? 1 : 0; + return 1; } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { - if (Players.friendsChat != null) { // L: 2198 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Players.friendsChat.name; // L: 2199 + if (Players.friendsChat != null) { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Players.friendsChat.name; } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 2201 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; } - return 1; // L: 2202 + return 1; } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { - if (Players.friendsChat != null) { // L: 2205 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Players.friendsChat.getSize(); // L: 2206 + if (Players.friendsChat != null) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Players.friendsChat.getSize(); } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 2208 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; } - return 1; // L: 2209 + return 1; } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2212 - if (Players.friendsChat != null && var3 < Players.friendsChat.getSize()) { // L: 2213 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Players.friendsChat.get(var3).getUsername().getName(); // L: 2214 + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + if (Players.friendsChat != null && var3 < Players.friendsChat.getSize()) { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Players.friendsChat.get(var3).getUsername().getName(); } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 2216 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; } - return 1; // L: 2217 + return 1; } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2220 - if (Players.friendsChat != null && var3 < Players.friendsChat.getSize()) { // L: 2221 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = ((Buddy)Players.friendsChat.get(var3)).getWorld(); // L: 2222 + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + if (Players.friendsChat != null && var3 < Players.friendsChat.getSize()) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = ((Buddy)Players.friendsChat.get(var3)).getWorld(); } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 2224 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; } - return 1; // L: 2225 + return 1; } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2228 - if (Players.friendsChat != null && var3 < Players.friendsChat.getSize()) { // L: 2229 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = ((Buddy)Players.friendsChat.get(var3)).rank; // L: 2230 + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + if (Players.friendsChat != null && var3 < Players.friendsChat.getSize()) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = ((Buddy)Players.friendsChat.get(var3)).rank; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 2232 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; } - return 1; // L: 2233 + return 1; } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Players.friendsChat != null ? Players.friendsChat.minKick : 0; // L: 2236 - return 1; // L: 2237 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Players.friendsChat != null ? Players.friendsChat.minKick : 0; + return 1; } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { - var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2240 - class409.clanKickUser(var5); // L: 2241 - return 1; // L: 2242 + var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + class409.clanKickUser(var5); + return 1; } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Players.friendsChat != null ? Players.friendsChat.rank * -577246511 * -541938127 : 0; // L: 2245 - return 1; // L: 2246 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Players.friendsChat != null ? Players.friendsChat.rank * -577246511 * -541938127 : 0; + return 1; } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { - var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2249 - class141.Clan_joinChat(var5); // L: 2250 - return 1; // L: 2251 + var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + class141.Clan_joinChat(var5); + return 1; } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { - WorldMapIcon_1.Clan_leaveChat(); // L: 2254 - return 1; // L: 2255 + WorldMapIcon_1.Clan_leaveChat(); + return 1; } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { - if (!GameEngine.friendSystem.method1728()) { // L: 2258 + if (!GameEngine.friendSystem.method1728()) { Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = GameEngine.friendSystem.ignoreList.getSize(); // L: 2259 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = GameEngine.friendSystem.ignoreList.getSize(); } - return 1; // L: 2260 + return 1; } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2263 - if (GameEngine.friendSystem.method1728() && var3 >= 0 && var3 < GameEngine.friendSystem.ignoreList.getSize()) { // L: 2264 - Ignored var4 = (Ignored)GameEngine.friendSystem.ignoreList.get(var3); // L: 2265 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.getName(); // L: 2266 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.getPreviousName(); // L: 2267 + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + if (GameEngine.friendSystem.method1728() && var3 >= 0 && var3 < GameEngine.friendSystem.ignoreList.getSize()) { + Ignored var4 = (Ignored)GameEngine.friendSystem.ignoreList.get(var3); + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.getName(); + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.getPreviousName(); } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 2270 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 2271 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; } - return 1; // L: 2273 + return 1; } else if (var0 == ScriptOpcodes.IGNORE_TEST) { - var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2276 - var5 = AbstractWorldMapData.method4791(var5); // L: 2277 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = GameEngine.friendSystem.isIgnored(new Username(var5, class194.loginType)) ? 1 : 0; // L: 2278 - return 1; // L: 2279 + var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + var5 = AbstractWorldMapData.method4791(var5); + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = GameEngine.friendSystem.isIgnored(new Username(var5, class194.loginType)) ? 1 : 0; + return 1; } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2282 - if (Players.friendsChat != null && var3 < Players.friendsChat.getSize() && Players.friendsChat.get(var3).getUsername().equals(class340.localPlayer.username)) { // L: 2283 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; // L: 2284 + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + if (Players.friendsChat != null && var3 < Players.friendsChat.getSize() && Players.friendsChat.get(var3).getUsername().equals(class340.localPlayer.username)) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 2286 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; } - return 1; // L: 2287 + return 1; } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { - if (Players.friendsChat != null && Players.friendsChat.owner != null) { // L: 2290 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Players.friendsChat.owner; // L: 2291 + if (Players.friendsChat != null && Players.friendsChat.owner != null) { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Players.friendsChat.owner; } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 2293 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; } - return 1; // L: 2294 + return 1; } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2297 - if (Players.friendsChat != null && var3 < Players.friendsChat.getSize() && ((ClanMate)Players.friendsChat.get(var3)).isFriend()) { // L: 2298 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; // L: 2299 + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + if (Players.friendsChat != null && var3 < Players.friendsChat.getSize() && ((ClanMate)Players.friendsChat.get(var3)).isFriend()) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 2301 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; } - return 1; // L: 2302 + return 1; } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { if (var0 == 3628) { - GameEngine.friendSystem.friendsList.removeComparator(); // L: 2313 - return 1; // L: 2314 + GameEngine.friendSystem.friendsList.removeComparator(); + return 1; } else { boolean var7; if (var0 == 3629) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2317 - GameEngine.friendSystem.friendsList.addComparator(new UserComparator1(var7)); // L: 2318 - return 1; // L: 2319 + var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + GameEngine.friendSystem.friendsList.addComparator(new UserComparator1(var7)); + return 1; } else if (var0 == 3630) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2322 - GameEngine.friendSystem.friendsList.addComparator(new UserComparator2(var7)); // L: 2323 - return 1; // L: 2324 + var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + GameEngine.friendSystem.friendsList.addComparator(new UserComparator2(var7)); + return 1; } else if (var0 == 3631) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2327 - GameEngine.friendSystem.friendsList.addComparator(new UserComparator3(var7)); // L: 2328 - return 1; // L: 2329 + var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + GameEngine.friendSystem.friendsList.addComparator(new UserComparator3(var7)); + return 1; } else if (var0 == 3632) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2332 - GameEngine.friendSystem.friendsList.addComparator(new UserComparator4(var7)); // L: 2333 - return 1; // L: 2334 + var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + GameEngine.friendSystem.friendsList.addComparator(new UserComparator4(var7)); + return 1; } else if (var0 == 3633) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2337 - GameEngine.friendSystem.friendsList.addComparator(new UserComparator5(var7)); // L: 2338 - return 1; // L: 2339 + var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + GameEngine.friendSystem.friendsList.addComparator(new UserComparator5(var7)); + return 1; } else if (var0 == 3634) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2342 - GameEngine.friendSystem.friendsList.addComparator(new UserComparator6(var7)); // L: 2343 - return 1; // L: 2344 + var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + GameEngine.friendSystem.friendsList.addComparator(new UserComparator6(var7)); + return 1; } else if (var0 == 3635) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2347 - GameEngine.friendSystem.friendsList.addComparator(new UserComparator7(var7)); // L: 2348 - return 1; // L: 2349 + var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + GameEngine.friendSystem.friendsList.addComparator(new UserComparator7(var7)); + return 1; } else if (var0 == 3636) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2352 - GameEngine.friendSystem.friendsList.addComparator(new UserComparator8(var7)); // L: 2353 - return 1; // L: 2354 + var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + GameEngine.friendSystem.friendsList.addComparator(new UserComparator8(var7)); + return 1; } else if (var0 == 3637) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2357 - GameEngine.friendSystem.friendsList.addComparator(new UserComparator9(var7)); // L: 2358 - return 1; // L: 2359 + var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + GameEngine.friendSystem.friendsList.addComparator(new UserComparator9(var7)); + return 1; } else if (var0 == 3638) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2362 - GameEngine.friendSystem.friendsList.addComparator(new UserComparator10(var7)); // L: 2363 - return 1; // L: 2364 + var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + GameEngine.friendSystem.friendsList.addComparator(new UserComparator10(var7)); + return 1; } else if (var0 == 3639) { - GameEngine.friendSystem.friendsList.sort(); // L: 2367 - return 1; // L: 2368 + GameEngine.friendSystem.friendsList.sort(); + return 1; } else if (var0 == 3640) { - GameEngine.friendSystem.ignoreList.removeComparator(); // L: 2371 - return 1; // L: 2372 + GameEngine.friendSystem.ignoreList.removeComparator(); + return 1; } else if (var0 == 3641) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2375 - GameEngine.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); // L: 2376 - return 1; // L: 2377 + var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + GameEngine.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); + return 1; } else if (var0 == 3642) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2380 - GameEngine.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); // L: 2381 - return 1; // L: 2382 + var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + GameEngine.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); + return 1; } else if (var0 == 3643) { - GameEngine.friendSystem.ignoreList.sort(); // L: 2385 - return 1; // L: 2386 + GameEngine.friendSystem.ignoreList.sort(); + return 1; } else if (var0 == 3644) { - if (Players.friendsChat != null) { // L: 2389 - Players.friendsChat.removeComparator(); // L: 2390 + if (Players.friendsChat != null) { + Players.friendsChat.removeComparator(); } - return 1; // L: 2392 + return 1; } else if (var0 == 3645) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2395 - if (Players.friendsChat != null) { // L: 2396 - Players.friendsChat.addComparator(new UserComparator1(var7)); // L: 2397 + var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + if (Players.friendsChat != null) { + Players.friendsChat.addComparator(new UserComparator1(var7)); } - return 1; // L: 2399 + return 1; } else if (var0 == 3646) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2402 - if (Players.friendsChat != null) { // L: 2403 - Players.friendsChat.addComparator(new UserComparator2(var7)); // L: 2404 + var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + if (Players.friendsChat != null) { + Players.friendsChat.addComparator(new UserComparator2(var7)); } - return 1; // L: 2406 + return 1; } else if (var0 == 3647) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2409 - if (Players.friendsChat != null) { // L: 2410 - Players.friendsChat.addComparator(new UserComparator3(var7)); // L: 2411 + var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + if (Players.friendsChat != null) { + Players.friendsChat.addComparator(new UserComparator3(var7)); } - return 1; // L: 2413 + return 1; } else if (var0 == 3648) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2416 - if (Players.friendsChat != null) { // L: 2417 - Players.friendsChat.addComparator(new UserComparator4(var7)); // L: 2418 + var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + if (Players.friendsChat != null) { + Players.friendsChat.addComparator(new UserComparator4(var7)); } - return 1; // L: 2420 + return 1; } else if (var0 == 3649) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2423 - if (Players.friendsChat != null) { // L: 2424 - Players.friendsChat.addComparator(new UserComparator5(var7)); // L: 2425 + var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + if (Players.friendsChat != null) { + Players.friendsChat.addComparator(new UserComparator5(var7)); } - return 1; // L: 2427 + return 1; } else if (var0 == 3650) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2430 - if (Players.friendsChat != null) { // L: 2431 - Players.friendsChat.addComparator(new UserComparator6(var7)); // L: 2432 + var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + if (Players.friendsChat != null) { + Players.friendsChat.addComparator(new UserComparator6(var7)); } - return 1; // L: 2434 + return 1; } else if (var0 == 3651) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2437 - if (Players.friendsChat != null) { // L: 2438 - Players.friendsChat.addComparator(new UserComparator7(var7)); // L: 2439 + var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + if (Players.friendsChat != null) { + Players.friendsChat.addComparator(new UserComparator7(var7)); } - return 1; // L: 2441 + return 1; } else if (var0 == 3652) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2444 - if (Players.friendsChat != null) { // L: 2445 - Players.friendsChat.addComparator(new UserComparator8(var7)); // L: 2446 + var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + if (Players.friendsChat != null) { + Players.friendsChat.addComparator(new UserComparator8(var7)); } - return 1; // L: 2448 + return 1; } else if (var0 == 3653) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2451 - if (Players.friendsChat != null) { // L: 2452 - Players.friendsChat.addComparator(new UserComparator9(var7)); // L: 2453 + var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + if (Players.friendsChat != null) { + Players.friendsChat.addComparator(new UserComparator9(var7)); } - return 1; // L: 2455 + return 1; } else if (var0 == 3654) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2458 - if (Players.friendsChat != null) { // L: 2459 - Players.friendsChat.addComparator(new UserComparator10(var7)); // L: 2460 + var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + if (Players.friendsChat != null) { + Players.friendsChat.addComparator(new UserComparator10(var7)); } - return 1; // L: 2462 + return 1; } else if (var0 == 3655) { - if (Players.friendsChat != null) { // L: 2465 - Players.friendsChat.sort(); // L: 2466 + if (Players.friendsChat != null) { + Players.friendsChat.sort(); } - return 1; // L: 2468 + return 1; } else if (var0 == 3656) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2471 - GameEngine.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); // L: 2472 - return 1; // L: 2473 + var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + GameEngine.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); + return 1; } else if (var0 == 3657) { - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2476 - if (Players.friendsChat != null) { // L: 2477 - Players.friendsChat.addComparator(new BuddyRankComparator(var7)); // L: 2478 + var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + if (Players.friendsChat != null) { + Players.friendsChat.addComparator(new BuddyRankComparator(var7)); } - return 1; // L: 2480 + return 1; } else { - return 2; // L: 2482 + return 2; } } } else { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2305 - if (Players.friendsChat != null && var3 < Players.friendsChat.getSize() && ((ClanMate)Players.friendsChat.get(var3)).isIgnored()) { // L: 2306 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; // L: 2307 + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + if (Players.friendsChat != null && var3 < Players.friendsChat.getSize() && ((ClanMate)Players.friendsChat.get(var3)).isIgnored()) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 2309 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; } - return 1; // L: 2310 + return 1; } } } diff --git a/runescape-client/src/main/java/ServerPacket.java b/runescape-client/src/main/java/ServerPacket.java index df46d2ee93..ca54f47944 100644 --- a/runescape-client/src/main/java/ServerPacket.java +++ b/runescape-client/src/main/java/ServerPacket.java @@ -511,108 +511,108 @@ public class ServerPacket { public final int length; static { - field3013 = new ServerPacket(0, 6); // L: 5 - field2931 = new ServerPacket(1, -1); // L: 6 - field2983 = new ServerPacket(2, 7); // L: 7 - field2933 = new ServerPacket(3, -2); // L: 8 - field2934 = new ServerPacket(4, -2); // L: 9 - field2930 = new ServerPacket(5, 8); // L: 10 - field2936 = new ServerPacket(6, 0); // L: 11 - field2937 = new ServerPacket(7, 7); // L: 12 - field3000 = new ServerPacket(8, 6); // L: 13 - field3003 = new ServerPacket(9, 5); // L: 14 - field2940 = new ServerPacket(10, -2); // L: 15 - field2941 = new ServerPacket(11, 2); // L: 16 - field2942 = new ServerPacket(12, 6); // L: 17 - field3006 = new ServerPacket(13, 4); // L: 18 - field2944 = new ServerPacket(14, 1); // L: 19 - field2945 = new ServerPacket(15, 2); // L: 20 - field2946 = new ServerPacket(16, 2); // L: 21 - field3008 = new ServerPacket(17, -2); // L: 22 - field2948 = new ServerPacket(18, 4); // L: 23 - field2949 = new ServerPacket(19, -1); // L: 24 - field2950 = new ServerPacket(20, 1); // L: 25 - field2951 = new ServerPacket(21, -2); // L: 26 - field2961 = new ServerPacket(22, 0); // L: 27 - field2982 = new ServerPacket(23, 14); // L: 28 - field2954 = new ServerPacket(24, -2); // L: 29 - field2955 = new ServerPacket(25, -1); // L: 30 - field2956 = new ServerPacket(26, 3); // L: 31 - field2978 = new ServerPacket(27, 10); // L: 32 - field2958 = new ServerPacket(28, 0); // L: 33 - field2959 = new ServerPacket(29, 6); // L: 34 - field3029 = new ServerPacket(30, 8); // L: 35 - field2938 = new ServerPacket(31, 2); // L: 36 - field2962 = new ServerPacket(32, 2); // L: 37 - field2963 = new ServerPacket(33, 4); // L: 38 - field2964 = new ServerPacket(34, 6); // L: 39 - field2965 = new ServerPacket(35, 0); // L: 40 - field3014 = new ServerPacket(36, 1); // L: 41 - field2986 = new ServerPacket(37, 0); // L: 42 - field2968 = new ServerPacket(38, -2); // L: 43 - field3005 = new ServerPacket(39, -1); // L: 44 - field2997 = new ServerPacket(40, -2); // L: 45 - field2971 = new ServerPacket(41, -1); // L: 46 - field2972 = new ServerPacket(42, 5); // L: 47 - field2932 = new ServerPacket(43, 6); // L: 48 - field2974 = new ServerPacket(44, 4); // L: 49 - field2975 = new ServerPacket(45, 2); // L: 50 - field2976 = new ServerPacket(46, 4); // L: 51 - field2987 = new ServerPacket(47, 6); // L: 52 - field2947 = new ServerPacket(48, -2); // L: 53 - field2979 = new ServerPacket(49, -1); // L: 54 - field2980 = new ServerPacket(50, 2); // L: 55 - field2981 = new ServerPacket(51, 0); // L: 56 - field2957 = new ServerPacket(52, 6); // L: 57 - field2939 = new ServerPacket(53, 2); // L: 58 - field2984 = new ServerPacket(54, -2); // L: 59 - field2985 = new ServerPacket(55, 4); // L: 60 - field3016 = new ServerPacket(56, -2); // L: 61 - field3017 = new ServerPacket(57, 5); // L: 62 - field2943 = new ServerPacket(58, 0); // L: 63 - field2989 = new ServerPacket(59, 1); // L: 64 - field2990 = new ServerPacket(60, 20); // L: 65 - field2991 = new ServerPacket(61, 5); // L: 66 - field2992 = new ServerPacket(62, 6); // L: 67 - field2993 = new ServerPacket(63, -2); // L: 68 - field2994 = new ServerPacket(64, 15); // L: 69 - field2995 = new ServerPacket(65, 28); // L: 70 - field2996 = new ServerPacket(66, 2); // L: 71 - field2952 = new ServerPacket(67, 6); // L: 72 - field2998 = new ServerPacket(68, 0); // L: 73 - field2999 = new ServerPacket(69, -1); // L: 74 - field2953 = new ServerPacket(70, 8); // L: 75 - field3001 = new ServerPacket(71, -2); // L: 76 - field3002 = new ServerPacket(72, -1); // L: 77 - field2960 = new ServerPacket(73, 8); // L: 78 - field3004 = new ServerPacket(74, -2); // L: 79 - field2966 = new ServerPacket(75, -2); // L: 80 - field2988 = new ServerPacket(76, 12); // L: 81 - field3007 = new ServerPacket(77, 6); // L: 82 - field2967 = new ServerPacket(78, -2); // L: 83 - field3009 = new ServerPacket(79, 1); // L: 84 - field3010 = new ServerPacket(80, -2); // L: 85 - field3011 = new ServerPacket(81, 5); // L: 86 - field3012 = new ServerPacket(82, -2); // L: 87 - field2969 = new ServerPacket(83, -1); // L: 88 - field2970 = new ServerPacket(84, -2); // L: 89 - field3015 = new ServerPacket(85, 1); // L: 90 - field2935 = new ServerPacket(86, 10); // L: 91 - field3025 = new ServerPacket(87, 0); // L: 92 - field3018 = new ServerPacket(88, -2); // L: 93 - field3019 = new ServerPacket(89, 4); // L: 94 - field3020 = new ServerPacket(90, -2); // L: 95 - field3021 = new ServerPacket(91, -2); // L: 96 - field3022 = new ServerPacket(92, -2); // L: 97 - field3023 = new ServerPacket(93, 2); // L: 98 - field3024 = new ServerPacket(94, 3); // L: 99 - field2973 = new ServerPacket(95, -2); // L: 100 - field3026 = new ServerPacket(96, -2); // L: 101 - field3027 = new ServerPacket(97, 4); // L: 102 + field3013 = new ServerPacket(0, 6); + field2931 = new ServerPacket(1, -1); + field2983 = new ServerPacket(2, 7); + field2933 = new ServerPacket(3, -2); + field2934 = new ServerPacket(4, -2); + field2930 = new ServerPacket(5, 8); + field2936 = new ServerPacket(6, 0); + field2937 = new ServerPacket(7, 7); + field3000 = new ServerPacket(8, 6); + field3003 = new ServerPacket(9, 5); + field2940 = new ServerPacket(10, -2); + field2941 = new ServerPacket(11, 2); + field2942 = new ServerPacket(12, 6); + field3006 = new ServerPacket(13, 4); + field2944 = new ServerPacket(14, 1); + field2945 = new ServerPacket(15, 2); + field2946 = new ServerPacket(16, 2); + field3008 = new ServerPacket(17, -2); + field2948 = new ServerPacket(18, 4); + field2949 = new ServerPacket(19, -1); + field2950 = new ServerPacket(20, 1); + field2951 = new ServerPacket(21, -2); + field2961 = new ServerPacket(22, 0); + field2982 = new ServerPacket(23, 14); + field2954 = new ServerPacket(24, -2); + field2955 = new ServerPacket(25, -1); + field2956 = new ServerPacket(26, 3); + field2978 = new ServerPacket(27, 10); + field2958 = new ServerPacket(28, 0); + field2959 = new ServerPacket(29, 6); + field3029 = new ServerPacket(30, 8); + field2938 = new ServerPacket(31, 2); + field2962 = new ServerPacket(32, 2); + field2963 = new ServerPacket(33, 4); + field2964 = new ServerPacket(34, 6); + field2965 = new ServerPacket(35, 0); + field3014 = new ServerPacket(36, 1); + field2986 = new ServerPacket(37, 0); + field2968 = new ServerPacket(38, -2); + field3005 = new ServerPacket(39, -1); + field2997 = new ServerPacket(40, -2); + field2971 = new ServerPacket(41, -1); + field2972 = new ServerPacket(42, 5); + field2932 = new ServerPacket(43, 6); + field2974 = new ServerPacket(44, 4); + field2975 = new ServerPacket(45, 2); + field2976 = new ServerPacket(46, 4); + field2987 = new ServerPacket(47, 6); + field2947 = new ServerPacket(48, -2); + field2979 = new ServerPacket(49, -1); + field2980 = new ServerPacket(50, 2); + field2981 = new ServerPacket(51, 0); + field2957 = new ServerPacket(52, 6); + field2939 = new ServerPacket(53, 2); + field2984 = new ServerPacket(54, -2); + field2985 = new ServerPacket(55, 4); + field3016 = new ServerPacket(56, -2); + field3017 = new ServerPacket(57, 5); + field2943 = new ServerPacket(58, 0); + field2989 = new ServerPacket(59, 1); + field2990 = new ServerPacket(60, 20); + field2991 = new ServerPacket(61, 5); + field2992 = new ServerPacket(62, 6); + field2993 = new ServerPacket(63, -2); + field2994 = new ServerPacket(64, 15); + field2995 = new ServerPacket(65, 28); + field2996 = new ServerPacket(66, 2); + field2952 = new ServerPacket(67, 6); + field2998 = new ServerPacket(68, 0); + field2999 = new ServerPacket(69, -1); + field2953 = new ServerPacket(70, 8); + field3001 = new ServerPacket(71, -2); + field3002 = new ServerPacket(72, -1); + field2960 = new ServerPacket(73, 8); + field3004 = new ServerPacket(74, -2); + field2966 = new ServerPacket(75, -2); + field2988 = new ServerPacket(76, 12); + field3007 = new ServerPacket(77, 6); + field2967 = new ServerPacket(78, -2); + field3009 = new ServerPacket(79, 1); + field3010 = new ServerPacket(80, -2); + field3011 = new ServerPacket(81, 5); + field3012 = new ServerPacket(82, -2); + field2969 = new ServerPacket(83, -1); + field2970 = new ServerPacket(84, -2); + field3015 = new ServerPacket(85, 1); + field2935 = new ServerPacket(86, 10); + field3025 = new ServerPacket(87, 0); + field3018 = new ServerPacket(88, -2); + field3019 = new ServerPacket(89, 4); + field3020 = new ServerPacket(90, -2); + field3021 = new ServerPacket(91, -2); + field3022 = new ServerPacket(92, -2); + field3023 = new ServerPacket(93, 2); + field3024 = new ServerPacket(94, 3); + field2973 = new ServerPacket(95, -2); + field3026 = new ServerPacket(96, -2); + field3027 = new ServerPacket(97, 4); } ServerPacket(int var1, int var2) { - this.id = var1; // L: 111 - this.length = var2; // L: 112 - } // L: 113 + this.id = var1; + this.length = var2; + } } diff --git a/runescape-client/src/main/java/Skeleton.java b/runescape-client/src/main/java/Skeleton.java index 0c35a1586f..f66ddd7971 100644 --- a/runescape-client/src/main/java/Skeleton.java +++ b/runescape-client/src/main/java/Skeleton.java @@ -38,35 +38,35 @@ public class Skeleton extends Node { class194 field2290; public Skeleton(int var1, byte[] var2) { - this.id = var1; // L: 19 - Buffer var3 = new Buffer(var2); // L: 20 - this.count = var3.readUnsignedByte(); // L: 21 - this.transformTypes = new int[this.count]; // L: 22 - this.labels = new int[this.count][]; // L: 23 + this.id = var1; + Buffer var3 = new Buffer(var2); + this.count = var3.readUnsignedByte(); + this.transformTypes = new int[this.count]; + this.labels = new int[this.count][]; int var4; - for (var4 = 0; var4 < this.count; ++var4) { // L: 24 + for (var4 = 0; var4 < this.count; ++var4) { this.transformTypes[var4] = var3.readUnsignedByte(); } - for (var4 = 0; var4 < this.count; ++var4) { // L: 25 + for (var4 = 0; var4 < this.count; ++var4) { this.labels[var4] = new int[var3.readUnsignedByte()]; } - for (var4 = 0; var4 < this.count; ++var4) { // L: 26 - for (int var5 = 0; var5 < this.labels[var4].length; ++var5) { // L: 27 + for (var4 = 0; var4 < this.count; ++var4) { + for (int var5 = 0; var5 < this.labels[var4].length; ++var5) { this.labels[var4][var5] = var3.readUnsignedByte(); } } - if (var3.offset < var3.array.length) { // L: 29 - var4 = var3.readUnsignedShort(); // L: 30 - if (var4 > 0) { // L: 31 - this.field2290 = new class194(var3, var4); // L: 32 + if (var3.offset < var3.array.length) { + var4 = var3.readUnsignedShort(); + if (var4 > 0) { + this.field2290 = new class194(var3, var4); } } - } // L: 35 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -93,68 +93,68 @@ public class Skeleton extends Node { ) @Export("getWorldMapScript") static Script getWorldMapScript(int var0, int var1, int var2) { - int var3 = WorldMapSection2.method4414(var1, var0); // L: 38 + int var3 = WorldMapSection2.method4414(var1, var0); Script var5 = (Script)Script.Script_cached.get((long)(var3 << 16)); Script var4; if (var5 != null) { var4 = var5; } else { - String var6 = String.valueOf(var3); // L: 46 - int var7 = TaskHandler.archive12.getGroupId(var6); // L: 47 - if (var7 == -1) { // L: 48 - var4 = null; // L: 49 + String var6 = String.valueOf(var3); + int var7 = TaskHandler.archive12.getGroupId(var6); + if (var7 == -1) { + var4 = null; } else { label59: { - byte[] var8 = TaskHandler.archive12.takeFileFlat(var7); // L: 52 - if (var8 != null) { // L: 53 - if (var8.length <= 1) { // L: 54 - var4 = null; // L: 55 - break label59; // L: 56 + byte[] var8 = TaskHandler.archive12.takeFileFlat(var7); + if (var8 != null) { + if (var8.length <= 1) { + var4 = null; + break label59; } - var5 = class145.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 + var5 = class145.newScript(var8); + if (var5 != null) { + Script.Script_cached.put(var5, (long)(var3 << 16)); + var4 = var5; + break label59; } } - var4 = null; // L: 65 + var4 = null; } } } - if (var4 != null) { // L: 68 - return var4; // L: 69 + if (var4 != null) { + return var4; } else { - int var12 = (-3 - var2 << 8) + var0; // L: 73 - Script var14 = (Script)Script.Script_cached.get((long)(var12 << 16)); // L: 78 + int var12 = (-3 - var2 << 8) + var0; + Script var14 = (Script)Script.Script_cached.get((long)(var12 << 16)); Script var13; - if (var14 != null) { // L: 79 - var13 = var14; // L: 80 + if (var14 != null) { + var13 = var14; } else { - String var9 = String.valueOf(var12); // L: 83 - int var10 = TaskHandler.archive12.getGroupId(var9); // L: 84 - if (var10 == -1) { // L: 85 - var13 = null; // L: 86 + String var9 = String.valueOf(var12); + int var10 = TaskHandler.archive12.getGroupId(var9); + if (var10 == -1) { + var13 = null; } else { - byte[] var11 = TaskHandler.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 + byte[] var11 = TaskHandler.archive12.takeFileFlat(var10); + if (var11 != null) { + if (var11.length <= 1) { + var13 = null; + return var13 != null ? var13 : null; } - var14 = class145.newScript(var11); // L: 95 - if (var14 != null) { // L: 96 - Script.Script_cached.put(var14, (long)(var12 << 16)); // L: 97 - var13 = var14; // L: 98 + var14 = class145.newScript(var11); + if (var14 != null) { + Script.Script_cached.put(var14, (long)(var12 << 16)); + var13 = var14; return var13 != null ? var13 : null; } } - var13 = null; // L: 102 + var13 = null; } } @@ -168,11 +168,11 @@ public class Skeleton extends Node { garbageValue = "1" ) static String method3948(IterableNodeHashTable var0, int var1, String var2) { - if (var0 == null) { // L: 41 + if (var0 == null) { return var2; } else { - ObjectNode var3 = (ObjectNode)var0.get((long)var1); // L: 42 - return var3 == null ? var2 : (String)var3.obj; // L: 43 44 + ObjectNode var3 = (ObjectNode)var0.get((long)var1); + return var3 == null ? var2 : (String)var3.obj; } } @@ -182,29 +182,29 @@ public class Skeleton extends Node { garbageValue = "211610749" ) static String method3944(int var0, int var1, boolean var2) { - if (var1 >= 2 && var1 <= 36) { // L: 116 - if (var2 && var0 >= 0) { // L: 117 - int var3 = 2; // L: 118 + if (var1 >= 2 && var1 <= 36) { + if (var2 && var0 >= 0) { + int var3 = 2; - for (int var4 = var0 / var1; var4 != 0; ++var3) { // L: 119 120 122 - var4 /= var1; // L: 121 + for (int var4 = var0 / var1; var4 != 0; ++var3) { + var4 /= var1; } - char[] var5 = new char[var3]; // L: 124 - var5[0] = '+'; // L: 125 + char[] var5 = new char[var3]; + var5[0] = '+'; - for (int var6 = var3 - 1; var6 > 0; --var6) { // L: 126 - int var7 = var0; // L: 127 - var0 /= var1; // L: 128 - int var8 = var7 - var0 * var1; // L: 129 - if (var8 >= 10) { // L: 130 + for (int var6 = var3 - 1; var6 > 0; --var6) { + int var7 = var0; + var0 /= var1; + int var8 = var7 - var0 * var1; + if (var8 >= 10) { var5[var6] = (char)(var8 + 87); } else { - var5[var6] = (char)(var8 + 48); // L: 131 + var5[var6] = (char)(var8 + 48); } } - return new String(var5); // L: 133 + return new String(var5); } else { return Integer.toString(var0, var1); } @@ -220,346 +220,346 @@ public class Skeleton extends Node { ) static void method3947(GameEngine var0, Font var1) { int var5; - if (Login.worldSelectOpen) { // L: 348 + if (Login.worldSelectOpen) { while (true) { - if (!NPCComposition.isKeyDown()) { // L: 350 - if (MouseHandler.MouseHandler_lastButton != 1 && (class150.mouseCam || MouseHandler.MouseHandler_lastButton != 4)) { // L: 371 + if (!NPCComposition.isKeyDown()) { + if (MouseHandler.MouseHandler_lastButton != 1 && (class150.mouseCam || MouseHandler.MouseHandler_lastButton != 4)) { break; } - int var2 = Login.xPadding + 280; // L: 372 - if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 373 - UserComparator3.changeWorldSelectSorting(0, 0); // L: 374 - break; // L: 375 + int var2 = Login.xPadding + 280; + if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + UserComparator3.changeWorldSelectSorting(0, 0); + break; } - if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 377 - UserComparator3.changeWorldSelectSorting(0, 1); // L: 378 - break; // L: 379 + if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + UserComparator3.changeWorldSelectSorting(0, 1); + break; } - int var3 = Login.xPadding + 390; // L: 381 - if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 382 - UserComparator3.changeWorldSelectSorting(1, 0); // L: 383 - break; // L: 384 + int var3 = Login.xPadding + 390; + if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + UserComparator3.changeWorldSelectSorting(1, 0); + break; } - if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 386 - UserComparator3.changeWorldSelectSorting(1, 1); // L: 387 - break; // L: 388 + if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + UserComparator3.changeWorldSelectSorting(1, 1); + break; } - int var35 = Login.xPadding + 500; // L: 390 - if (MouseHandler.MouseHandler_lastPressedX >= var35 && MouseHandler.MouseHandler_lastPressedX <= var35 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 391 - UserComparator3.changeWorldSelectSorting(2, 0); // L: 392 - break; // L: 393 + int var35 = Login.xPadding + 500; + if (MouseHandler.MouseHandler_lastPressedX >= var35 && MouseHandler.MouseHandler_lastPressedX <= var35 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + UserComparator3.changeWorldSelectSorting(2, 0); + break; } - if (MouseHandler.MouseHandler_lastPressedX >= var35 + 15 && MouseHandler.MouseHandler_lastPressedX <= var35 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 395 - UserComparator3.changeWorldSelectSorting(2, 1); // L: 396 - break; // L: 397 + if (MouseHandler.MouseHandler_lastPressedX >= var35 + 15 && MouseHandler.MouseHandler_lastPressedX <= var35 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + UserComparator3.changeWorldSelectSorting(2, 1); + break; } - var5 = Login.xPadding + 610; // L: 399 - if (MouseHandler.MouseHandler_lastPressedX >= var5 && MouseHandler.MouseHandler_lastPressedX <= var5 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 400 - UserComparator3.changeWorldSelectSorting(3, 0); // L: 401 - break; // L: 402 + var5 = Login.xPadding + 610; + if (MouseHandler.MouseHandler_lastPressedX >= var5 && MouseHandler.MouseHandler_lastPressedX <= var5 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + UserComparator3.changeWorldSelectSorting(3, 0); + break; } - if (MouseHandler.MouseHandler_lastPressedX >= var5 + 15 && MouseHandler.MouseHandler_lastPressedX <= var5 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 404 - UserComparator3.changeWorldSelectSorting(3, 1); // L: 405 - break; // L: 406 + if (MouseHandler.MouseHandler_lastPressedX >= var5 + 15 && MouseHandler.MouseHandler_lastPressedX <= var5 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + UserComparator3.changeWorldSelectSorting(3, 1); + break; } - if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { // L: 408 - Login.worldSelectOpen = false; // L: 410 - WorldMapCacheName.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 411 - NPC.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 412 - Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); // L: 413 - break; // L: 415 + if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { + Login.worldSelectOpen = false; + WorldMapCacheName.leftTitleSprite.drawAt(Login.xPadding, 0); + NPC.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); + break; } - if (Login.hoveredWorldIndex != -1) { // L: 417 - World var6 = class334.World_worlds[Login.hoveredWorldIndex]; // L: 418 - BoundaryObject.changeWorld(var6); // L: 419 - Login.worldSelectOpen = false; // L: 421 - WorldMapCacheName.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 422 - NPC.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 423 - Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); // L: 424 + if (Login.hoveredWorldIndex != -1) { + World var6 = class334.World_worlds[Login.hoveredWorldIndex]; + BoundaryObject.changeWorld(var6); + Login.worldSelectOpen = false; + WorldMapCacheName.leftTitleSprite.drawAt(Login.xPadding, 0); + NPC.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); } else { - if (Login.worldSelectPage > 0 && class11.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= class11.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= BoundaryObject.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= BoundaryObject.canvasHeight / 2 + 50) { // L: 428 - --Login.worldSelectPage; // L: 429 + if (Login.worldSelectPage > 0 && class11.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= class11.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= BoundaryObject.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= BoundaryObject.canvasHeight / 2 + 50) { + --Login.worldSelectPage; } - if (Login.worldSelectPage < Login.worldSelectPagesCount && UrlRequest.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= class186.canvasWidth - UrlRequest.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= class186.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= BoundaryObject.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= BoundaryObject.canvasHeight / 2 + 50) { // L: 431 - ++Login.worldSelectPage; // L: 432 + if (Login.worldSelectPage < Login.worldSelectPagesCount && UrlRequest.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= class186.canvasWidth - UrlRequest.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= class186.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= BoundaryObject.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= BoundaryObject.canvasHeight / 2 + 50) { + ++Login.worldSelectPage; } } break; } - if (Players.field1247 == 13) { // L: 351 - Login.worldSelectOpen = false; // L: 353 - WorldMapCacheName.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 354 - NPC.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 355 - Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); // L: 356 - break; // L: 358 + if (Players.field1247 == 13) { + Login.worldSelectOpen = false; + WorldMapCacheName.leftTitleSprite.drawAt(Login.xPadding, 0); + NPC.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); + break; } - if (Players.field1247 == 96) { // L: 360 - if (Login.worldSelectPage > 0 && class11.worldSelectLeftSprite != null) { // L: 361 - --Login.worldSelectPage; // L: 362 + if (Players.field1247 == 96) { + if (Login.worldSelectPage > 0 && class11.worldSelectLeftSprite != null) { + --Login.worldSelectPage; } - } else if (Players.field1247 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && UrlRequest.worldSelectRightSprite != null) { // L: 365 366 - ++Login.worldSelectPage; // L: 367 + } else if (Players.field1247 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && UrlRequest.worldSelectRightSprite != null) { + ++Login.worldSelectPage; } } } else { - if ((MouseHandler.MouseHandler_lastButton == 1 || !class150.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { // L: 438 - SecureRandomFuture.clientPreferences.titleMusicDisabled = !SecureRandomFuture.clientPreferences.titleMusicDisabled; // L: 439 - class127.savePreferences(); // L: 440 - if (!SecureRandomFuture.clientPreferences.titleMusicDisabled) { // L: 441 + if ((MouseHandler.MouseHandler_lastButton == 1 || !class150.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { + SecureRandomFuture.clientPreferences.titleMusicDisabled = !SecureRandomFuture.clientPreferences.titleMusicDisabled; + class127.savePreferences(); + if (!SecureRandomFuture.clientPreferences.titleMusicDisabled) { Players.method2382(WorldMapScaleHandler.archive6, "scape main", "", 255, false); } else { - StructComposition.method3444(); // L: 442 + StructComposition.method3444(); } } - if (Client.gameState != 5) { // L: 444 - if (-1L == Login.field890) { // L: 445 - Login.field890 = Ignored.method6459() + 1000L; // L: 446 + if (Client.gameState != 5) { + if (-1L == Login.field890) { + Login.field890 = Ignored.method6459() + 1000L; } - long var22 = Ignored.method6459(); // L: 448 + long var22 = Ignored.method6459(); boolean var4; - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 451 + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { while (true) { - if (Client.archiveLoadersDone >= Client.archiveLoaders.size()) { // L: 455 - var4 = true; // L: 463 + if (Client.archiveLoadersDone >= Client.archiveLoaders.size()) { + var4 = true; break; } - ArchiveLoader var24 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); // L: 456 - if (!var24.isLoaded()) { // L: 457 - var4 = false; // L: 458 - break; // L: 459 + ArchiveLoader var24 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); + if (!var24.isLoaded()) { + var4 = false; + break; } - ++Client.archiveLoadersDone; // L: 461 + ++Client.archiveLoadersDone; } } else { - var4 = true; // L: 452 + var4 = true; } - if (var4 && -1L == Login.field869) { // L: 465 466 - Login.field869 = var22; // L: 467 - if (Login.field869 > Login.field890) { // L: 468 - Login.field890 = Login.field869; // L: 469 + if (var4 && -1L == Login.field869) { + Login.field869 = var22; + if (Login.field869 > Login.field890) { + Login.field890 = Login.field869; } } - if (Client.gameState == 10 || Client.gameState == 11) { // L: 473 - if (Language.Language_EN == ScriptFrame.clientLanguage) { // L: 474 - if (MouseHandler.MouseHandler_lastButton == 1 || !class150.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 475 - var5 = Login.xPadding + 5; // L: 476 - short var25 = 463; // L: 477 - byte var7 = 100; // L: 478 - byte var8 = 35; // L: 479 - if (MouseHandler.MouseHandler_lastPressedX >= var5 && MouseHandler.MouseHandler_lastPressedX <= var5 + var7 && MouseHandler.MouseHandler_lastPressedY >= var25 && MouseHandler.MouseHandler_lastPressedY <= var8 + var25) { // L: 480 - if (PlayerComposition.loadWorlds()) { // L: 482 - Login.worldSelectOpen = true; // L: 483 - Login.worldSelectPage = 0; // L: 484 - Login.worldSelectPagesCount = 0; // L: 485 + if (Client.gameState == 10 || Client.gameState == 11) { + if (Language.Language_EN == ScriptFrame.clientLanguage) { + if (MouseHandler.MouseHandler_lastButton == 1 || !class150.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { + var5 = Login.xPadding + 5; + short var25 = 463; + byte var7 = 100; + byte var8 = 35; + if (MouseHandler.MouseHandler_lastPressedX >= var5 && MouseHandler.MouseHandler_lastPressedX <= var5 + var7 && MouseHandler.MouseHandler_lastPressedY >= var25 && MouseHandler.MouseHandler_lastPressedY <= var8 + var25) { + if (PlayerComposition.loadWorlds()) { + Login.worldSelectOpen = true; + Login.worldSelectPage = 0; + Login.worldSelectPagesCount = 0; } - return; // L: 488 + return; } } - if (HorizontalAlignment.World_request != null && PlayerComposition.loadWorlds()) { // L: 491 492 - Login.worldSelectOpen = true; // L: 493 - Login.worldSelectPage = 0; // L: 494 - Login.worldSelectPagesCount = 0; // L: 495 + if (HorizontalAlignment.World_request != null && PlayerComposition.loadWorlds()) { + Login.worldSelectOpen = true; + Login.worldSelectPage = 0; + Login.worldSelectPagesCount = 0; } } - var5 = MouseHandler.MouseHandler_lastButton; // L: 499 - int var50 = MouseHandler.MouseHandler_lastPressedX; // L: 500 - int var36 = MouseHandler.MouseHandler_lastPressedY; // L: 501 - if (var5 == 0) { // L: 502 - var50 = MouseHandler.MouseHandler_x; // L: 503 - var36 = MouseHandler.MouseHandler_y; // L: 504 + var5 = MouseHandler.MouseHandler_lastButton; + int var50 = MouseHandler.MouseHandler_lastPressedX; + int var36 = MouseHandler.MouseHandler_lastPressedY; + if (var5 == 0) { + var50 = MouseHandler.MouseHandler_x; + var36 = MouseHandler.MouseHandler_y; } - if (!class150.mouseCam && var5 == 4) { // L: 506 + if (!class150.mouseCam && var5 == 4) { var5 = 1; } short var39; int var41; - if (Login.loginIndex == 0) { // L: 507 - boolean var48 = false; // L: 508 + if (Login.loginIndex == 0) { + boolean var48 = false; - while (NPCComposition.isKeyDown()) { // L: 509 - if (Players.field1247 == 84) { // L: 510 - var48 = true; // L: 511 + while (NPCComposition.isKeyDown()) { + if (Players.field1247 == 84) { + var48 = true; } } - var41 = class138.loginBoxCenter - 80; // L: 514 - var39 = 291; // L: 515 - if (var5 == 1 && var50 >= var41 - 75 && var50 <= var41 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20) { // L: 516 - WorldMapSprite.openURL(InterfaceParent.method2146("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); // L: 517 + var41 = class138.loginBoxCenter - 80; + var39 = 291; + if (var5 == 1 && var50 >= var41 - 75 && var50 <= var41 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20) { + WorldMapSprite.openURL(InterfaceParent.method2146("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); } - var41 = class138.loginBoxCenter + 80; // L: 519 - if (var5 == 1 && var50 >= var41 - 75 && var50 <= var41 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20 || var48) { // L: 520 - if ((Client.worldProperties & 33554432) != 0) { // L: 521 - Login.Login_response0 = ""; // L: 522 - Login.Login_response1 = "This is a Beta world."; // L: 523 - Login.Login_response2 = "Your normal account will not be affected."; // L: 524 - Login.Login_response3 = ""; // L: 525 - PlayerType.method5521(1); // L: 526 - WorldMapID.method4805(); // L: 527 - } else if ((Client.worldProperties & 4) != 0) { // L: 529 - if ((Client.worldProperties & 1024) != 0) { // L: 530 - Login.Login_response1 = "This is a High Risk PvP world."; // L: 531 - Login.Login_response2 = "Players can attack each other almost everywhere"; // L: 532 - Login.Login_response3 = "and the Protect Item prayer won't work."; // L: 533 + var41 = class138.loginBoxCenter + 80; + if (var5 == 1 && var50 >= var41 - 75 && var50 <= var41 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20 || var48) { + if ((Client.worldProperties & 33554432) != 0) { + Login.Login_response0 = ""; + Login.Login_response1 = "This is a Beta world."; + Login.Login_response2 = "Your normal account will not be affected."; + Login.Login_response3 = ""; + PlayerType.method5521(1); + WorldMapID.method4805(); + } else if ((Client.worldProperties & 4) != 0) { + if ((Client.worldProperties & 1024) != 0) { + Login.Login_response1 = "This is a High Risk PvP world."; + Login.Login_response2 = "Players can attack each other almost everywhere"; + Login.Login_response3 = "and the Protect Item prayer won't work."; } else { - Login.Login_response1 = "This is a PvP world."; // L: 536 - Login.Login_response2 = "Players can attack each other"; // L: 537 - Login.Login_response3 = "almost everywhere."; // L: 538 + Login.Login_response1 = "This is a PvP world."; + Login.Login_response2 = "Players can attack each other"; + Login.Login_response3 = "almost everywhere."; } - Login.Login_response0 = "Warning!"; // L: 540 - PlayerType.method5521(1); // L: 541 - WorldMapID.method4805(); // L: 542 - } else if ((Client.worldProperties & 1024) != 0) { // L: 544 - Login.Login_response1 = "This is a High Risk world."; // L: 545 - Login.Login_response2 = "The Protect Item prayer will"; // L: 546 - Login.Login_response3 = "not work on this world."; // L: 547 - Login.Login_response0 = "Warning!"; // L: 548 - PlayerType.method5521(1); // L: 549 - WorldMapID.method4805(); // L: 550 + Login.Login_response0 = "Warning!"; + PlayerType.method5521(1); + WorldMapID.method4805(); + } else if ((Client.worldProperties & 1024) != 0) { + Login.Login_response1 = "This is a High Risk world."; + Login.Login_response2 = "The Protect Item prayer will"; + Login.Login_response3 = "not work on this world."; + Login.Login_response0 = "Warning!"; + PlayerType.method5521(1); + WorldMapID.method4805(); } else { - class67.Login_promptCredentials(false); // L: 553 + class67.Login_promptCredentials(false); } } } else { short var9; int var37; - if (Login.loginIndex == 1) { // L: 557 + if (Login.loginIndex == 1) { while (true) { - if (!NPCComposition.isKeyDown()) { // L: 558 - var37 = class138.loginBoxCenter - 80; // L: 566 - var9 = 321; // L: 567 - if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { // L: 568 - class67.Login_promptCredentials(false); // L: 569 + if (!NPCComposition.isKeyDown()) { + var37 = class138.loginBoxCenter - 80; + var9 = 321; + if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { + class67.Login_promptCredentials(false); } - var37 = class138.loginBoxCenter + 80; // L: 571 - if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { // L: 572 - PlayerType.method5521(0); // L: 573 + var37 = class138.loginBoxCenter + 80; + if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { + PlayerType.method5521(0); } break; } - if (Players.field1247 == 84) { // L: 559 - class67.Login_promptCredentials(false); // L: 560 - } else if (Players.field1247 == 13) { // L: 562 - PlayerType.method5521(0); // L: 563 + if (Players.field1247 == 84) { + class67.Login_promptCredentials(false); + } else if (Players.field1247 == 13) { + PlayerType.method5521(0); } } } else { int var12; short var38; boolean var40; - if (Login.loginIndex == 2) { // L: 576 - var38 = 201; // L: 577 - var37 = var38 + 52; // L: 578 - if (var5 == 1 && var36 >= var37 - 12 && var36 < var37 + 2) { // L: 579 + if (Login.loginIndex == 2) { + var38 = 201; + var37 = var38 + 52; + if (var5 == 1 && var36 >= var37 - 12 && var36 < var37 + 2) { Login.currentLoginField = 0; } - var37 += 15; // L: 580 - if (var5 == 1 && var36 >= var37 - 12 && var36 < var37 + 2) { // L: 581 + var37 += 15; + if (var5 == 1 && var36 >= var37 - 12 && var36 < var37 + 2) { Login.currentLoginField = 1; } - var37 += 15; // L: 582 - var38 = 361; // L: 583 - if (WorldMapData_1.field2652 != null) { // L: 584 - var41 = WorldMapData_1.field2652.highX / 2; // L: 585 - if (var5 == 1 && var50 >= WorldMapData_1.field2652.lowX - var41 && var50 <= var41 + WorldMapData_1.field2652.lowX && var36 >= var38 - 15 && var36 < var38) { // L: 586 - switch(Login.field872) { // L: 587 + var37 += 15; + var38 = 361; + if (WorldMapData_1.field2652 != null) { + var41 = WorldMapData_1.field2652.highX / 2; + if (var5 == 1 && var50 >= WorldMapData_1.field2652.lowX - var41 && var50 <= var41 + WorldMapData_1.field2652.lowX && var36 >= var38 - 15 && var36 < var38) { + switch(Login.field872) { case 1: - class19.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 590 - PlayerType.method5521(5); // L: 591 - return; // L: 592 + class19.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); + PlayerType.method5521(5); + return; case 2: - WorldMapSprite.openURL("https://support.runescape.com/hc/en-gb", true, false); // L: 596 + WorldMapSprite.openURL("https://support.runescape.com/hc/en-gb", true, false); } } } - var41 = class138.loginBoxCenter - 80; // L: 602 - var39 = 321; // L: 603 - if (var5 == 1 && var50 >= var41 - 75 && var50 <= var41 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20) { // L: 604 - Login.Login_username = Login.Login_username.trim(); // L: 605 - if (Login.Login_username.length() == 0) { // L: 606 - class19.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 607 - return; // L: 608 + var41 = class138.loginBoxCenter - 80; + var39 = 321; + if (var5 == 1 && var50 >= var41 - 75 && var50 <= var41 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20) { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + class19.setLoginResponseString("", "Please enter your username/email address.", ""); + return; } - if (Login.Login_password.length() == 0) { // L: 610 - class19.setLoginResponseString("", "Please enter your password.", ""); // L: 611 - return; // L: 612 + if (Login.Login_password.length() == 0) { + class19.setLoginResponseString("", "Please enter your password.", ""); + return; } - class19.setLoginResponseString("", "Connecting to server...", ""); // L: 614 - FriendSystem.method1791(false); // L: 615 - VertexNormal.updateGameState(20); // L: 616 - return; // L: 617 + class19.setLoginResponseString("", "Connecting to server...", ""); + FriendSystem.method1791(false); + VertexNormal.updateGameState(20); + return; } - var41 = Login.loginBoxX + 180 + 80; // L: 619 - if (var5 == 1 && var50 >= var41 - 75 && var50 <= var41 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20) { // L: 620 - PlayerType.method5521(0); // L: 621 - Login.Login_username = ""; // L: 622 - Login.Login_password = ""; // L: 623 - class148.field1651 = 0; // L: 624 - BufferedSource.otp = ""; // L: 625 - Login.field882 = true; // L: 626 + var41 = Login.loginBoxX + 180 + 80; + if (var5 == 1 && var50 >= var41 - 75 && var50 <= var41 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20) { + PlayerType.method5521(0); + Login.Login_username = ""; + Login.Login_password = ""; + class148.field1651 = 0; + BufferedSource.otp = ""; + Login.field882 = true; } - var41 = class138.loginBoxCenter + -117; // L: 628 - var39 = 277; // L: 629 - Login.field880 = var50 >= var41 && var50 < var41 + class315.field3918 && var36 >= var39 && var36 < var39 + Huffman.field3152; // L: 630 - if (var5 == 1 && Login.field880) { // L: 631 - Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; // L: 632 - if (!Client.Login_isUsernameRemembered && SecureRandomFuture.clientPreferences.rememberedUsername != null) { // L: 633 - SecureRandomFuture.clientPreferences.rememberedUsername = null; // L: 634 - class127.savePreferences(); // L: 635 + var41 = class138.loginBoxCenter + -117; + var39 = 277; + Login.field880 = var50 >= var41 && var50 < var41 + class315.field3918 && var36 >= var39 && var36 < var39 + Huffman.field3152; + if (var5 == 1 && Login.field880) { + Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; + if (!Client.Login_isUsernameRemembered && SecureRandomFuture.clientPreferences.rememberedUsername != null) { + SecureRandomFuture.clientPreferences.rememberedUsername = null; + class127.savePreferences(); } } - var41 = class138.loginBoxCenter + 24; // L: 638 - var39 = 277; // L: 639 - Login.field881 = var50 >= var41 && var50 < var41 + class315.field3918 && var36 >= var39 && var36 < var39 + Huffman.field3152; // L: 640 - if (var5 == 1 && Login.field881) { // L: 641 - SecureRandomFuture.clientPreferences.hideUsername = !SecureRandomFuture.clientPreferences.hideUsername; // L: 642 - if (!SecureRandomFuture.clientPreferences.hideUsername) { // L: 643 - Login.Login_username = ""; // L: 644 - SecureRandomFuture.clientPreferences.rememberedUsername = null; // L: 645 - WorldMapID.method4805(); // L: 646 + var41 = class138.loginBoxCenter + 24; + var39 = 277; + Login.field881 = var50 >= var41 && var50 < var41 + class315.field3918 && var36 >= var39 && var36 < var39 + Huffman.field3152; + if (var5 == 1 && Login.field881) { + SecureRandomFuture.clientPreferences.hideUsername = !SecureRandomFuture.clientPreferences.hideUsername; + if (!SecureRandomFuture.clientPreferences.hideUsername) { + Login.Login_username = ""; + SecureRandomFuture.clientPreferences.rememberedUsername = null; + WorldMapID.method4805(); } - class127.savePreferences(); // L: 648 + class127.savePreferences(); } - label1392: + label1390: while (true) { int var45; Transferable var52; @@ -568,424 +568,424 @@ public class Skeleton extends Node { label1306: do { while (true) { - while (NPCComposition.isKeyDown()) { // L: 650 - if (Players.field1247 != 13) { // L: 651 - if (Login.currentLoginField != 0) { // L: 660 + while (NPCComposition.isKeyDown()) { + if (Players.field1247 != 13) { + if (Login.currentLoginField != 0) { continue label1306; } - char var42 = ModeWhere.field3954; // L: 661 + char var42 = ModeWhere.field3954; - for (var12 = 0; var12 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length() && var42 != "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var12); ++var12) { // L: 663 664 + for (var12 = 0; var12 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length() && var42 != "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var12); ++var12) { } - if (Players.field1247 == 85 && Login.Login_username.length() > 0) { // L: 667 + if (Players.field1247 == 85 && Login.Login_username.length() > 0) { Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); } - if (Players.field1247 == 84 || Players.field1247 == 80) { // L: 668 + if (Players.field1247 == 84 || Players.field1247 == 80) { Login.currentLoginField = 1; } - char var13 = ModeWhere.field3954; // L: 670 - boolean var43 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var13) != -1; // L: 672 - if (var43 && Login.Login_username.length() < 320) { // L: 674 + char var13 = ModeWhere.field3954; + boolean var43 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var13) != -1; + if (var43 && Login.Login_username.length() < 320) { Login.Login_username = Login.Login_username + ModeWhere.field3954; } } else { - PlayerType.method5521(0); // L: 652 - Login.Login_username = ""; // L: 653 - Login.Login_password = ""; // L: 654 - class148.field1651 = 0; // L: 655 - BufferedSource.otp = ""; // L: 656 - Login.field882 = true; // L: 657 + PlayerType.method5521(0); + Login.Login_username = ""; + Login.Login_password = ""; + class148.field1651 = 0; + BufferedSource.otp = ""; + Login.field882 = true; } } - return; // L: 1034 + return; } - } while(Login.currentLoginField != 1); // L: 676 + } while(Login.currentLoginField != 1); - if (Players.field1247 == 85 && Login.Login_password.length() > 0) { // L: 677 - Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); // L: 678 - } else if (Players.field1247 == 84 || Players.field1247 == 80) { // L: 680 - Login.currentLoginField = 0; // L: 681 - if (Players.field1247 == 84) { // L: 682 - Login.Login_username = Login.Login_username.trim(); // L: 683 - if (Login.Login_username.length() == 0) { // L: 684 - class19.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 685 - return; // L: 686 + if (Players.field1247 == 85 && Login.Login_password.length() > 0) { + Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); + } else if (Players.field1247 == 84 || Players.field1247 == 80) { + Login.currentLoginField = 0; + if (Players.field1247 == 84) { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + class19.setLoginResponseString("", "Please enter your username/email address.", ""); + return; } - if (Login.Login_password.length() == 0) { // L: 688 - class19.setLoginResponseString("", "Please enter your password.", ""); // L: 689 - return; // L: 690 + if (Login.Login_password.length() == 0) { + class19.setLoginResponseString("", "Please enter your password.", ""); + return; } - class19.setLoginResponseString("", "Connecting to server...", ""); // L: 692 - FriendSystem.method1791(false); // L: 693 - VertexNormal.updateGameState(20); // L: 694 - return; // L: 695 + class19.setLoginResponseString("", "Connecting to server...", ""); + FriendSystem.method1791(false); + VertexNormal.updateGameState(20); + return; } } - if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && Players.field1247 == 67) { // L: 698 - Clipboard var51 = Toolkit.getDefaultToolkit().getSystemClipboard(); // L: 699 - var52 = var51.getContents(class295.client); // L: 700 - var45 = 20 - Login.Login_password.length(); // L: 701 + if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && Players.field1247 == 67) { + Clipboard var51 = Toolkit.getDefaultToolkit().getSystemClipboard(); + var52 = var51.getContents(class295.client); + var45 = 20 - Login.Login_password.length(); break; } - char var46 = ModeWhere.field3954; // L: 751 - if (var46 >= ' ' && var46 < 127 || var46 > 127 && var46 < 160 || var46 > 160 && var46 <= 255) { // L: 753 - var40 = true; // L: 754 - } else { - label1540: { - if (var46 != 0) { // L: 757 - char[] var53 = class328.cp1252AsciiExtension; // L: 759 + char var46 = ModeWhere.field3954; + if ((var46 < ' ' || var46 >= 127) && (var46 <= 127 || var46 >= 160) && (var46 <= 160 || var46 > 255)) { + label1524: { + if (var46 != 0) { + char[] var53 = class328.cp1252AsciiExtension; - for (int var30 = 0; var30 < var53.length; ++var30) { // L: 760 - char var15 = var53[var30]; // L: 761 - if (var15 == var46) { // L: 763 - var40 = true; // L: 764 - break label1540; // L: 765 + for (int var30 = 0; var30 < var53.length; ++var30) { + char var15 = var53[var30]; + if (var15 == var46) { + var40 = true; + break label1524; } } } - var40 = false; // L: 771 + var40 = false; } + } else { + var40 = true; } - if (var40) { // L: 773 - char var54 = ModeWhere.field3954; // L: 775 - boolean var44 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var54) != -1; // L: 777 - if (var44 && Login.Login_password.length() < 20) { // L: 779 780 - Login.Login_password = Login.Login_password + ModeWhere.field3954; // L: 781 + if (var40) { + char var54 = ModeWhere.field3954; + boolean var44 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var54) != -1; + if (var44 && Login.Login_password.length() < 20) { + Login.Login_password = Login.Login_password + ModeWhere.field3954; } } } - } while(var45 <= 0); // L: 702 + } while(var45 <= 0); try { - String var14 = (String)var52.getTransferData(DataFlavor.stringFlavor); // L: 704 - int var47 = Math.min(var45, var14.length()); // L: 705 + String var14 = (String)var52.getTransferData(DataFlavor.stringFlavor); + int var47 = Math.min(var45, var14.length()); int var16 = 0; while (true) { if (var16 >= var47) { - Login.Login_password = Login.Login_password + var14.substring(0, var47); // L: 743 - continue label1392; + Login.Login_password = Login.Login_password + var14.substring(0, var47); + continue label1390; } - char var18 = var14.charAt(var16); // L: 709 + char var18 = var14.charAt(var16); boolean var17; - if (var18 >= ' ' && var18 < 127 || var18 > 127 && var18 < 160 || var18 > 160 && var18 <= 255) { // L: 711 - var17 = true; // L: 712 + if (var18 >= ' ' && var18 < 127 || var18 > 127 && var18 < 160 || var18 > 160 && var18 <= 255) { + var17 = true; } else { - label1541: { - if (var18 != 0) { // L: 715 - char[] var19 = class328.cp1252AsciiExtension; // L: 717 + label1538: { + if (var18 != 0) { + char[] var19 = class328.cp1252AsciiExtension; - for (int var20 = 0; var20 < var19.length; ++var20) { // L: 718 - char var21 = var19[var20]; // L: 719 - if (var18 == var21) { // L: 721 - var17 = true; // L: 722 - break label1541; // L: 723 + for (int var20 = 0; var20 < var19.length; ++var20) { + char var21 = var19[var20]; + if (var18 == var21) { + var17 = true; + break label1538; } } } - var17 = false; // L: 729 + var17 = false; } } - if (!var17) { // L: 731 + if (!var17) { break; } - char var49 = var14.charAt(var16); // L: 733 - boolean var28 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var49) != -1; // L: 735 - if (!var28) { // L: 737 + char var49 = var14.charAt(var16); + boolean var28 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var49) != -1; + if (!var28) { break; } - ++var16; // L: 706 + ++var16; } - PlayerType.method5521(3); // L: 739 - return; // L: 740 - } catch (UnsupportedFlavorException var33) { // L: 745 - } catch (IOException var34) { // L: 746 + PlayerType.method5521(3); + return; + } catch (UnsupportedFlavorException var33) { + } catch (IOException var34) { } } - } else if (Login.loginIndex == 3) { // L: 790 - var37 = Login.loginBoxX + 180; // L: 791 - var9 = 276; // L: 792 - if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { // L: 793 - class185.method3731(false); // L: 794 + } else if (Login.loginIndex == 3) { + var37 = Login.loginBoxX + 180; + var9 = 276; + if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { + class185.method3731(false); } - var37 = Login.loginBoxX + 180; // L: 796 - var9 = 326; // L: 797 - if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { // L: 798 - class19.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 799 - PlayerType.method5521(5); // L: 800 - return; // L: 801 + var37 = Login.loginBoxX + 180; + var9 = 326; + if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { + class19.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); + PlayerType.method5521(5); + return; } } else { int var11; - if (Login.loginIndex == 4) { // L: 804 - var37 = Login.loginBoxX + 180 - 80; // L: 805 - var9 = 321; // L: 806 - if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { // L: 807 - BufferedSource.otp.trim(); // L: 808 - if (BufferedSource.otp.length() != 6) { // L: 809 - class19.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 810 - return; // L: 811 + if (Login.loginIndex == 4) { + var37 = Login.loginBoxX + 180 - 80; + var9 = 321; + if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { + BufferedSource.otp.trim(); + if (BufferedSource.otp.length() != 6) { + class19.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); + return; } - class148.field1651 = Integer.parseInt(BufferedSource.otp); // L: 813 - BufferedSource.otp = ""; // L: 814 - FriendSystem.method1791(true); // L: 815 - class19.setLoginResponseString("", "Connecting to server...", ""); // L: 816 - VertexNormal.updateGameState(20); // L: 817 - return; // L: 818 + class148.field1651 = Integer.parseInt(BufferedSource.otp); + BufferedSource.otp = ""; + FriendSystem.method1791(true); + class19.setLoginResponseString("", "Connecting to server...", ""); + VertexNormal.updateGameState(20); + return; } - if (var5 == 1 && var50 >= Login.loginBoxX + 180 - 9 && var50 <= Login.loginBoxX + 180 + 130 && var36 >= 263 && var36 <= 296) { // L: 820 - Login.field882 = !Login.field882; // L: 821 + if (var5 == 1 && var50 >= Login.loginBoxX + 180 - 9 && var50 <= Login.loginBoxX + 180 + 130 && var36 >= 263 && var36 <= 296) { + Login.field882 = !Login.field882; } - if (var5 == 1 && var50 >= Login.loginBoxX + 180 - 34 && var50 <= Login.loginBoxX + 34 + 180 && var36 >= 351 && var36 <= 363) { // L: 823 - WorldMapSprite.openURL(InterfaceParent.method2146("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); // L: 824 + if (var5 == 1 && var50 >= Login.loginBoxX + 180 - 34 && var50 <= Login.loginBoxX + 34 + 180 && var36 >= 351 && var36 <= 363) { + WorldMapSprite.openURL(InterfaceParent.method2146("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); } - var37 = Login.loginBoxX + 180 + 80; // L: 826 - if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { // L: 827 - PlayerType.method5521(0); // L: 828 - Login.Login_username = ""; // L: 829 - Login.Login_password = ""; // L: 830 - class148.field1651 = 0; // L: 831 - BufferedSource.otp = ""; // L: 832 + var37 = Login.loginBoxX + 180 + 80; + if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { + PlayerType.method5521(0); + Login.Login_username = ""; + Login.Login_password = ""; + class148.field1651 = 0; + BufferedSource.otp = ""; } - while (NPCComposition.isKeyDown()) { // L: 834 - boolean var10 = false; // L: 835 + while (NPCComposition.isKeyDown()) { + boolean var10 = false; - for (var11 = 0; var11 < "1234567890".length(); ++var11) { // L: 836 - if (ModeWhere.field3954 == "1234567890".charAt(var11)) { // L: 837 - var10 = true; // L: 838 - break; // L: 839 + for (var11 = 0; var11 < "1234567890".length(); ++var11) { + if (ModeWhere.field3954 == "1234567890".charAt(var11)) { + var10 = true; + break; } } - if (Players.field1247 == 13) { // L: 842 - PlayerType.method5521(0); // L: 843 - Login.Login_username = ""; // L: 844 - Login.Login_password = ""; // L: 845 - class148.field1651 = 0; // L: 846 - BufferedSource.otp = ""; // L: 847 + if (Players.field1247 == 13) { + PlayerType.method5521(0); + Login.Login_username = ""; + Login.Login_password = ""; + class148.field1651 = 0; + BufferedSource.otp = ""; } else { - if (Players.field1247 == 85 && BufferedSource.otp.length() > 0) { // L: 850 + if (Players.field1247 == 85 && BufferedSource.otp.length() > 0) { BufferedSource.otp = BufferedSource.otp.substring(0, BufferedSource.otp.length() - 1); } - if (Players.field1247 == 84) { // L: 851 - BufferedSource.otp.trim(); // L: 852 - if (BufferedSource.otp.length() != 6) { // L: 853 - class19.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 854 - return; // L: 855 + if (Players.field1247 == 84) { + BufferedSource.otp.trim(); + if (BufferedSource.otp.length() != 6) { + class19.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); + return; } - class148.field1651 = Integer.parseInt(BufferedSource.otp); // L: 857 - BufferedSource.otp = ""; // L: 858 - FriendSystem.method1791(true); // L: 859 - class19.setLoginResponseString("", "Connecting to server...", ""); // L: 860 - VertexNormal.updateGameState(20); // L: 861 - return; // L: 862 + class148.field1651 = Integer.parseInt(BufferedSource.otp); + BufferedSource.otp = ""; + FriendSystem.method1791(true); + class19.setLoginResponseString("", "Connecting to server...", ""); + VertexNormal.updateGameState(20); + return; } - if (var10 && BufferedSource.otp.length() < 6) { // L: 864 + if (var10 && BufferedSource.otp.length() < 6) { BufferedSource.otp = BufferedSource.otp + ModeWhere.field3954; } } } - } else if (Login.loginIndex == 5) { // L: 868 - var37 = Login.loginBoxX + 180 - 80; // L: 869 - var9 = 321; // L: 870 - if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { // L: 871 - WorldMapRectangle.method4793(); // L: 872 - return; // L: 873 + } else if (Login.loginIndex == 5) { + var37 = Login.loginBoxX + 180 - 80; + var9 = 321; + if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { + WorldMapRectangle.method4793(); + return; } - var37 = Login.loginBoxX + 180 + 80; // L: 875 - if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { // L: 876 - class67.Login_promptCredentials(true); // L: 877 + var37 = Login.loginBoxX + 180 + 80; + if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { + class67.Login_promptCredentials(true); } - var39 = 361; // L: 879 - if (MouseRecorder.field1044 != null) { // L: 880 - var11 = MouseRecorder.field1044.highX / 2; // L: 881 - if (var5 == 1 && var50 >= MouseRecorder.field1044.lowX - var11 && var50 <= var11 + MouseRecorder.field1044.lowX && var36 >= var39 - 15 && var36 < var39) { // L: 882 - WorldMapSprite.openURL(InterfaceParent.method2146("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); // L: 883 + var39 = 361; + if (MouseRecorder.field1044 != null) { + var11 = MouseRecorder.field1044.highX / 2; + if (var5 == 1 && var50 >= MouseRecorder.field1044.lowX - var11 && var50 <= var11 + MouseRecorder.field1044.lowX && var36 >= var39 - 15 && var36 < var39) { + WorldMapSprite.openURL(InterfaceParent.method2146("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); } } - while (NPCComposition.isKeyDown()) { // L: 886 - var40 = false; // L: 887 + while (NPCComposition.isKeyDown()) { + var40 = false; - for (var12 = 0; var12 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var12) { // L: 888 - if (ModeWhere.field3954 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var12)) { // L: 889 - var40 = true; // L: 890 - break; // L: 891 + for (var12 = 0; var12 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var12) { + if (ModeWhere.field3954 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var12)) { + var40 = true; + break; } } - if (Players.field1247 == 13) { // L: 894 - class67.Login_promptCredentials(true); // L: 895 + if (Players.field1247 == 13) { + class67.Login_promptCredentials(true); } else { - if (Players.field1247 == 85 && Login.Login_username.length() > 0) { // L: 898 + if (Players.field1247 == 85 && Login.Login_username.length() > 0) { Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); } - if (Players.field1247 == 84) { // L: 899 - WorldMapRectangle.method4793(); // L: 900 - return; // L: 901 + if (Players.field1247 == 84) { + WorldMapRectangle.method4793(); + return; } - if (var40 && Login.Login_username.length() < 320) { // L: 903 + if (var40 && Login.Login_username.length() < 320) { Login.Login_username = Login.Login_username + ModeWhere.field3954; } } } - } else if (Login.loginIndex != 6) { // L: 907 - if (Login.loginIndex == 7) { // L: 918 - var37 = Login.loginBoxX + 180 - 80; // L: 919 - var9 = 321; // L: 920 - if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { // L: 921 - WorldMapSprite.openURL(InterfaceParent.method2146("secure", true) + "m=dob/set_dob.ws", true, false); // L: 922 - class19.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 923 - PlayerType.method5521(6); // L: 924 - return; // L: 925 + } else if (Login.loginIndex != 6) { + if (Login.loginIndex == 7) { + var37 = Login.loginBoxX + 180 - 80; + var9 = 321; + if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { + WorldMapSprite.openURL(InterfaceParent.method2146("secure", true) + "m=dob/set_dob.ws", true, false); + class19.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); + PlayerType.method5521(6); + return; } - var37 = Login.loginBoxX + 180 + 80; // L: 927 - if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { // L: 928 - class67.Login_promptCredentials(true); // L: 929 + var37 = Login.loginBoxX + 180 + 80; + if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { + class67.Login_promptCredentials(true); } - } else if (Login.loginIndex == 8) { // L: 932 - var37 = Login.loginBoxX + 180 - 80; // L: 933 - var9 = 321; // L: 934 - if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { // L: 935 - WorldMapSprite.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 936 - class19.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 937 - PlayerType.method5521(6); // L: 938 - return; // L: 939 + } else if (Login.loginIndex == 8) { + var37 = Login.loginBoxX + 180 - 80; + var9 = 321; + if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { + WorldMapSprite.openURL("https://www.jagex.com/terms/privacy", true, false); + class19.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); + PlayerType.method5521(6); + return; } - var37 = Login.loginBoxX + 180 + 80; // L: 941 - if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { // L: 942 - class67.Login_promptCredentials(true); // L: 943 + var37 = Login.loginBoxX + 180 + 80; + if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { + class67.Login_promptCredentials(true); } - } else if (Login.loginIndex == 9) { // L: 946 - var37 = Login.loginBoxX + 180; // L: 947 - var9 = 311; // L: 948 - if (Players.field1247 == 84 || Players.field1247 == 13 || var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { // L: 949 - class185.method3731(false); // L: 950 + } else if (Login.loginIndex == 9) { + var37 = Login.loginBoxX + 180; + var9 = 311; + if (Players.field1247 == 84 || Players.field1247 == 13 || var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { + class185.method3731(false); } - } else if (Login.loginIndex == 10) { // L: 953 - var37 = Login.loginBoxX + 180; // L: 954 - var9 = 209; // L: 955 - if (Players.field1247 == 84 || var5 == 1 && var50 >= var37 - 109 && var50 <= var37 + 109 && var36 >= var9 && var36 <= var9 + 68) { // L: 956 - class19.setLoginResponseString("", "Connecting to server...", ""); // L: 957 - Client.field508 = class422.field4524; // L: 958 - FriendSystem.method1791(false); // L: 959 - VertexNormal.updateGameState(20); // L: 960 + } else if (Login.loginIndex == 10) { + var37 = Login.loginBoxX + 180; + var9 = 209; + if (Players.field1247 == 84 || var5 == 1 && var50 >= var37 - 109 && var50 <= var37 + 109 && var36 >= var9 && var36 <= var9 + 68) { + class19.setLoginResponseString("", "Connecting to server...", ""); + Client.field508 = class422.field4524; + FriendSystem.method1791(false); + VertexNormal.updateGameState(20); } - } else if (Login.loginIndex == 12) { // L: 963 - var37 = class138.loginBoxCenter; // L: 964 - var9 = 233; // L: 965 - Bounds var31 = var1.method6091(0, 30, "terms of use, privacy policy, and end user licence", var37, var9); // L: 966 - Bounds var26 = var1.method6091(32, 32, "terms of use, privacy policy, and end user licence", var37, var9); // L: 967 - Bounds var27 = var1.method6091(70, 34, "terms of use, privacy policy, and end user licence", var37, var9); // L: 968 - var41 = var9 + 17; // L: 969 - Bounds var29 = var1.method6091(0, 34, "agreement (EULA).", var37, var41); // L: 970 - if (var5 == 1) { // L: 971 - if (var31.method6577(var50, var36)) { // L: 972 - WorldMapSprite.openURL("https://www.jagex.com/terms", true, false); // L: 973 - } else if (var26.method6577(var50, var36)) { // L: 975 - WorldMapSprite.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 976 - } else if (var27.method6577(var50, var36) || var29.method6577(var50, var36)) { // L: 978 - WorldMapSprite.openURL("https://www.jagex.com/en-GB/legal/eula-runescape-oldschool", true, false); // L: 979 + } else if (Login.loginIndex == 12) { + var37 = class138.loginBoxCenter; + var9 = 233; + Bounds var31 = var1.method6091(0, 30, "terms of use, privacy policy, and end user licence", var37, var9); + Bounds var26 = var1.method6091(32, 32, "terms of use, privacy policy, and end user licence", var37, var9); + Bounds var27 = var1.method6091(70, 34, "terms of use, privacy policy, and end user licence", var37, var9); + var41 = var9 + 17; + Bounds var29 = var1.method6091(0, 34, "agreement (EULA).", var37, var41); + if (var5 == 1) { + if (var31.method6577(var50, var36)) { + WorldMapSprite.openURL("https://www.jagex.com/terms", true, false); + } else if (var26.method6577(var50, var36)) { + WorldMapSprite.openURL("https://www.jagex.com/terms/privacy", true, false); + } else if (var27.method6577(var50, var36) || var29.method6577(var50, var36)) { + WorldMapSprite.openURL("https://www.jagex.com/en-GB/legal/eula-runescape-oldschool", true, false); } } - var37 = class138.loginBoxCenter - 80; // L: 982 - var9 = 311; // L: 983 - if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { // L: 984 - UserComparator6.method2549(); // L: 985 - class185.method3731(true); // L: 986 + var37 = class138.loginBoxCenter - 80; + var9 = 311; + if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { + UserComparator6.method2549(); + class185.method3731(true); } - var37 = class138.loginBoxCenter + 80; // L: 988 - if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { // L: 989 - Login.loginIndex = 13; // L: 990 + var37 = class138.loginBoxCenter + 80; + if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { + Login.loginIndex = 13; } - } else if (Login.loginIndex == 13) { // L: 993 - var37 = class138.loginBoxCenter; // L: 994 - var9 = 321; // L: 995 - if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { // L: 996 - class185.method3731(true); // L: 997 + } else if (Login.loginIndex == 13) { + var37 = class138.loginBoxCenter; + var9 = 321; + if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { + class185.method3731(true); } - } else if (Login.loginIndex == 14) { // L: 1000 - String var32 = ""; // L: 1001 - switch(Login.field871) { // L: 1002 + } else if (Login.loginIndex == 14) { + String var32 = ""; + switch(Login.field871) { case 0: - var32 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; // L: 1007 - break; // L: 1008 + var32 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; + break; case 1: - var32 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; // L: 1004 - break; // L: 1005 + var32 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; + break; default: - class67.Login_promptCredentials(false); // L: 1010 + class67.Login_promptCredentials(false); } - var41 = Login.loginBoxX + 180; // L: 1013 - var39 = 276; // L: 1014 - if (var5 == 1 && var50 >= var41 - 75 && var50 <= var41 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20) { // L: 1015 - WorldMapSprite.openURL(var32, true, false); // L: 1016 - class19.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 1017 - PlayerType.method5521(6); // L: 1018 - return; // L: 1019 + var41 = Login.loginBoxX + 180; + var39 = 276; + if (var5 == 1 && var50 >= var41 - 75 && var50 <= var41 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20) { + WorldMapSprite.openURL(var32, true, false); + class19.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); + PlayerType.method5521(6); + return; } - var41 = Login.loginBoxX + 180; // L: 1021 - var39 = 326; // L: 1022 - if (var5 == 1 && var50 >= var41 - 75 && var50 <= var41 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20) { // L: 1023 - class67.Login_promptCredentials(false); // L: 1024 + var41 = Login.loginBoxX + 180; + var39 = 326; + if (var5 == 1 && var50 >= var41 - 75 && var50 <= var41 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20) { + class67.Login_promptCredentials(false); } - } else if (Login.loginIndex == 24) { // L: 1027 - var37 = Login.loginBoxX + 180; // L: 1028 - var9 = 301; // L: 1029 - if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { // L: 1030 - class185.method3731(false); // L: 1031 + } else if (Login.loginIndex == 24) { + var37 = Login.loginBoxX + 180; + var9 = 301; + if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { + class185.method3731(false); } } } else { while (true) { do { - if (!NPCComposition.isKeyDown()) { // L: 908 - var38 = 321; // L: 913 - if (var5 == 1 && var36 >= var38 - 20 && var36 <= var38 + 20) { // L: 914 - class67.Login_promptCredentials(true); // L: 915 + if (!NPCComposition.isKeyDown()) { + var38 = 321; + if (var5 == 1 && var36 >= var38 - 20 && var36 <= var38 + 20) { + class67.Login_promptCredentials(true); } return; } - } while(Players.field1247 != 84 && Players.field1247 != 13); // L: 909 + } while(Players.field1247 != 84 && Players.field1247 != 13); - class67.Login_promptCredentials(true); // L: 910 + class67.Login_promptCredentials(true); } } } @@ -995,7 +995,7 @@ public class Skeleton extends Node { } } } - } // L: 436 + } @ObfuscatedName("kk") @ObfuscatedSignature( @@ -1004,10 +1004,10 @@ public class Skeleton extends Node { ) @Export("FriendSystem_invalidateIgnoreds") static final void FriendSystem_invalidateIgnoreds() { - BufferedSource.method6516(); // L: 12465 - if (Players.friendsChat != null) { // L: 12466 - Players.friendsChat.invalidateIgnoreds(); // L: 12467 + BufferedSource.method6516(); + if (Players.friendsChat != null) { + Players.friendsChat.invalidateIgnoreds(); } - } // L: 12469 + } } diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java index 312a4ce9d7..0f663d6553 100644 --- a/runescape-client/src/main/java/Skills.java +++ b/runescape-client/src/main/java/Skills.java @@ -14,18 +14,18 @@ public class Skills { public static int[] Skills_experienceTable; 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 - Skills_experienceTable = new int[99]; // L: 6 - int var0 = 0; // L: 9 + 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}; + Skills_experienceTable = new int[99]; + int var0 = 0; - for (int var1 = 0; var1 < 99; ++var1) { // L: 10 - int var2 = var1 + 1; // L: 11 - int var3 = (int)((double)var2 + 300.0D * Math.pow(2.0D, (double)var2 / 7.0D)); // L: 12 - var0 += var3; // L: 13 - Skills_experienceTable[var1] = var0 / 4; // L: 14 + for (int var1 = 0; var1 < 99; ++var1) { + int var2 = var1 + 1; + int var3 = (int)((double)var2 + 300.0D * Math.pow(2.0D, (double)var2 / 7.0D)); + var0 += var3; + Skills_experienceTable[var1] = var0 / 4; } - } // L: 16 + } @ObfuscatedName("j") @ObfuscatedSignature( @@ -34,14 +34,14 @@ public class Skills { ) @Export("hashString") public static int hashString(CharSequence var0) { - int var1 = var0.length(); // L: 137 - int var2 = 0; // L: 138 + int var1 = var0.length(); + int var2 = 0; - for (int var3 = 0; var3 < var1; ++var3) { // L: 139 + for (int var3 = 0; var3 < var1; ++var3) { var2 = (var2 << 5) - var2 + class372.charToByteCp1252(var0.charAt(var3)); } - return var2; // L: 140 + return var2; } @ObfuscatedName("h") @@ -50,8 +50,8 @@ public class Skills { garbageValue = "708045213" ) static final void method5487() { - Object var10000 = null; // L: 175 + Object var10000 = null; String var0 = "You can't add yourself to your own ignore list"; - class194.addGameMessage(30, "", var0); // L: 177 - } // L: 179 + class194.addGameMessage(30, "", var0); + } } diff --git a/runescape-client/src/main/java/SoftWrapper.java b/runescape-client/src/main/java/SoftWrapper.java index 624ed61fb0..ed9cf215ae 100644 --- a/runescape-client/src/main/java/SoftWrapper.java +++ b/runescape-client/src/main/java/SoftWrapper.java @@ -11,19 +11,19 @@ public class SoftWrapper extends Wrapper { SoftReference ref; SoftWrapper(Object var1, int var2) { - super(var2); // L: 10 - this.ref = new SoftReference(var1); // L: 11 - } // L: 12 + super(var2); + this.ref = new SoftReference(var1); + } @ObfuscatedName("c") @Export("get") Object get() { - return this.ref.get(); // L: 15 + return this.ref.get(); } @ObfuscatedName("b") @Export("isSoft") boolean isSoft() { - return true; // L: 19 + return true; } } diff --git a/runescape-client/src/main/java/SoundCache.java b/runescape-client/src/main/java/SoundCache.java index 4f9d17bc62..e51be9a728 100644 --- a/runescape-client/src/main/java/SoundCache.java +++ b/runescape-client/src/main/java/SoundCache.java @@ -43,11 +43,11 @@ public class SoundCache { descriptor = "(Lku;Lku;)V" ) public SoundCache(AbstractArchive var1, AbstractArchive var2) { - this.musicSamples = new NodeHashTable(256); // L: 9 - this.rawSounds = new NodeHashTable(256); // L: 10 - this.soundEffectIndex = var1; // L: 13 - this.musicSampleIndex = var2; // L: 14 - } // L: 15 + this.musicSamples = new NodeHashTable(256); + this.rawSounds = new NodeHashTable(256); + this.soundEffectIndex = var1; + this.musicSampleIndex = var2; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -56,26 +56,26 @@ public class SoundCache { ) @Export("getSoundEffect0") RawSound getSoundEffect0(int var1, int var2, int[] var3) { - int var4 = var2 ^ (var1 << 4 & 65535 | var1 >>> 12); // L: 18 - var4 |= var1 << 16; // L: 19 - long var5 = (long)var4; // L: 20 - RawSound var7 = (RawSound)this.rawSounds.get(var5); // L: 21 - if (var7 != null) { // L: 22 + int var4 = var2 ^ (var1 << 4 & 65535 | var1 >>> 12); + var4 |= var1 << 16; + long var5 = (long)var4; + RawSound var7 = (RawSound)this.rawSounds.get(var5); + if (var7 != null) { return var7; - } else if (var3 != null && var3[0] <= 0) { // L: 23 + } else if (var3 != null && var3[0] <= 0) { return null; } else { - SoundEffect var8 = SoundEffect.readSoundEffect(this.soundEffectIndex, var1, var2); // L: 24 - if (var8 == null) { // L: 25 + SoundEffect var8 = SoundEffect.readSoundEffect(this.soundEffectIndex, var1, var2); + if (var8 == null) { return null; } else { - var7 = var8.toRawSound(); // L: 26 - this.rawSounds.put(var7, var5); // L: 27 + var7 = var8.toRawSound(); + this.rawSounds.put(var7, var5); if (var3 != null) { - var3[0] -= var7.samples.length; // L: 28 + var3[0] -= var7.samples.length; } - return var7; // L: 29 + return var7; } } } @@ -88,31 +88,31 @@ public class SoundCache { @Export("getMusicSample0") RawSound getMusicSample0(int var1, int var2, int[] var3) { int var4 = var2 ^ (var1 << 4 & 65535 | var1 >>> 12); - var4 |= var1 << 16; // L: 34 - long var5 = (long)var4 ^ 4294967296L; // L: 35 - RawSound var7 = (RawSound)this.rawSounds.get(var5); // L: 36 - if (var7 != null) { // L: 37 + var4 |= var1 << 16; + long var5 = (long)var4 ^ 4294967296L; + RawSound var7 = (RawSound)this.rawSounds.get(var5); + if (var7 != null) { return var7; - } else if (var3 != null && var3[0] <= 0) { // L: 38 + } else if (var3 != null && var3[0] <= 0) { return null; } else { - VorbisSample var8 = (VorbisSample)this.musicSamples.get(var5); // L: 39 - if (var8 == null) { // L: 40 - var8 = VorbisSample.readMusicSample(this.musicSampleIndex, var1, var2); // L: 41 - if (var8 == null) { // L: 42 + VorbisSample var8 = (VorbisSample)this.musicSamples.get(var5); + if (var8 == null) { + var8 = VorbisSample.readMusicSample(this.musicSampleIndex, var1, var2); + if (var8 == null) { return null; } - this.musicSamples.put(var8, var5); // L: 43 + this.musicSamples.put(var8, var5); } - var7 = var8.toRawSound(var3); // L: 45 - if (var7 == null) { // L: 46 + var7 = var8.toRawSound(var3); + if (var7 == null) { return null; } else { - var8.remove(); // L: 47 - this.rawSounds.put(var7, var5); // L: 48 - return var7; // L: 49 + var8.remove(); + this.rawSounds.put(var7, var5); + return var7; } } } @@ -124,12 +124,12 @@ public class SoundCache { ) @Export("getSoundEffect") public RawSound getSoundEffect(int var1, int[] var2) { - if (this.soundEffectIndex.getGroupCount() == 1) { // L: 53 + if (this.soundEffectIndex.getGroupCount() == 1) { return this.getSoundEffect0(0, var1, var2); } else if (this.soundEffectIndex.getGroupFileCount(var1) == 1) { - return this.getSoundEffect0(var1, 0, var2); // L: 54 + return this.getSoundEffect0(var1, 0, var2); } else { - throw new RuntimeException(); // L: 55 + throw new RuntimeException(); } } @@ -140,12 +140,12 @@ public class SoundCache { ) @Export("getMusicSample") public RawSound getMusicSample(int var1, int[] var2) { - if (this.musicSampleIndex.getGroupCount() == 1) { // L: 59 + if (this.musicSampleIndex.getGroupCount() == 1) { return this.getMusicSample0(0, var1, var2); } else if (this.musicSampleIndex.getGroupFileCount(var1) == 1) { - return this.getMusicSample0(var1, 0, var2); // L: 60 + return this.getMusicSample0(var1, 0, var2); } else { - throw new RuntimeException(); // L: 61 + throw new RuntimeException(); } } @@ -155,7 +155,7 @@ public class SoundCache { garbageValue = "919700872" ) public static int method833(int var0) { - return class378.field4233[var0 & 16383]; // L: 33 + return class378.field4233[var0 & 16383]; } @ObfuscatedName("m") @@ -164,33 +164,33 @@ public class SoundCache { garbageValue = "2120721647" ) static void method823() { - if (DirectByteArrayCopier.clearLoginScreen) { // L: 309 - AbstractByteArrayCopier.titleboxSprite = null; // L: 310 - class19.titlebuttonSprite = null; // L: 311 - Login.runesSprite = null; // L: 312 - WorldMapCacheName.leftTitleSprite = null; // L: 313 - NPC.rightTitleSprite = null; // L: 314 - Login.logoSprite = null; // L: 315 - Login.title_muteSprite = null; // L: 316 - KeyHandler.options_buttons_0Sprite = null; // L: 317 - LoginType.options_buttons_2Sprite = null; // L: 318 - class148.worldSelectBackSprites = null; // L: 319 - AbstractArchive.worldSelectFlagSprites = null; // L: 320 - UserComparator3.worldSelectArrows = null; // L: 321 - class112.worldSelectStars = null; // L: 322 - class21.field118 = null; // L: 323 - Client.loginScreenRunesAnimation.method2280(); // L: 324 - class260.musicPlayerStatus = 1; // L: 326 - class124.musicTrackArchive = null; // L: 327 - VarcInt.musicTrackGroupId = -1; // L: 328 - class260.musicTrackFileId = -1; // L: 329 - ChatChannel.musicTrackVolume = 0; // L: 330 - DynamicObject.musicTrackBoolean = false; // L: 331 - class260.pcmSampleLength = 2; // L: 332 - ClientPreferences.method2297(true); // L: 334 - DirectByteArrayCopier.clearLoginScreen = false; // L: 335 + if (DirectByteArrayCopier.clearLoginScreen) { + AbstractByteArrayCopier.titleboxSprite = null; + class19.titlebuttonSprite = null; + Login.runesSprite = null; + WorldMapCacheName.leftTitleSprite = null; + NPC.rightTitleSprite = null; + Login.logoSprite = null; + Login.title_muteSprite = null; + KeyHandler.options_buttons_0Sprite = null; + LoginType.options_buttons_2Sprite = null; + class148.worldSelectBackSprites = null; + AbstractArchive.worldSelectFlagSprites = null; + UserComparator3.worldSelectArrows = null; + class112.worldSelectStars = null; + class21.field118 = null; + Client.loginScreenRunesAnimation.method2280(); + class260.musicPlayerStatus = 1; + class124.musicTrackArchive = null; + VarcInt.musicTrackGroupId = -1; + class260.musicTrackFileId = -1; + ChatChannel.musicTrackVolume = 0; + DynamicObject.musicTrackBoolean = false; + class260.pcmSampleLength = 2; + ClientPreferences.method2297(true); + DirectByteArrayCopier.clearLoginScreen = false; } - } // L: 336 + } @ObfuscatedName("ak") @ObfuscatedSignature( @@ -198,13 +198,13 @@ public class SoundCache { garbageValue = "8" ) static void method831(int var0, Coord var1, boolean var2) { - WorldMapArea var3 = WorldMapRectangle.getWorldMap().getMapArea(var0); // L: 4527 - int var4 = class340.localPlayer.plane; // L: 4528 - int var5 = (class340.localPlayer.x >> 7) + class131.baseX; // L: 4529 - int var6 = (class340.localPlayer.y >> 7) + TileItem.baseY; // L: 4530 - Coord var7 = new Coord(var4, var5, var6); // L: 4531 - WorldMapRectangle.getWorldMap().method6876(var3, var7, var1, var2); // L: 4532 - } // L: 4533 + WorldMapArea var3 = WorldMapRectangle.getWorldMap().getMapArea(var0); + int var4 = class340.localPlayer.plane; + int var5 = (class340.localPlayer.x >> 7) + class131.baseX; + int var6 = (class340.localPlayer.y >> 7) + TileItem.baseY; + Coord var7 = new Coord(var4, var5, var6); + WorldMapRectangle.getWorldMap().method6876(var3, var7, var1, var2); + } @ObfuscatedName("ie") @ObfuscatedSignature( @@ -213,110 +213,110 @@ public class SoundCache { ) @Export("widgetDefaultMenuAction") static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { - Widget var5 = class126.getWidgetChild(var1, var2); // L: 9903 - if (var5 != null) { // L: 9904 - if (var5.onOp != null) { // L: 9905 - ScriptEvent var6 = new ScriptEvent(); // L: 9906 - var6.widget = var5; // L: 9907 - var6.opIndex = var0; // L: 9908 - var6.targetName = var4; // L: 9909 - var6.args = var5.onOp; // L: 9910 - class285.runScriptEvent(var6); // L: 9911 + Widget var5 = class126.getWidgetChild(var1, var2); + if (var5 != null) { + if (var5.onOp != null) { + ScriptEvent var6 = new ScriptEvent(); + var6.widget = var5; + var6.opIndex = var0; + var6.targetName = var4; + var6.args = var5.onOp; + class285.runScriptEvent(var6); } - boolean var11 = true; // L: 9913 - if (var5.contentType > 0) { // L: 9914 + boolean var11 = true; + if (var5.contentType > 0) { var11 = class19.method329(var5); } - if (var11) { // L: 9915 - int var8 = class363.getWidgetFlags(var5); // L: 9917 - int var9 = var0 - 1; // L: 9918 - boolean var7 = (var8 >> var9 + 1 & 1) != 0; // L: 9920 - if (var7) { // L: 9922 + if (var11) { + int var8 = class363.getWidgetFlags(var5); + int var9 = var0 - 1; + boolean var7 = (var8 >> var9 + 1 & 1) != 0; + if (var7) { PacketBufferNode var10; - if (var0 == 1) { // L: 9925 - var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2891, Client.packetWriter.isaacCipher); // L: 9927 - var10.packetBuffer.writeInt(var1); // L: 9928 - var10.packetBuffer.writeShort(var2); // L: 9929 - var10.packetBuffer.writeShort(var3); // L: 9930 - Client.packetWriter.addNode(var10); // L: 9931 + if (var0 == 1) { + var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2891, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); } - if (var0 == 2) { // L: 9933 - var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2880, Client.packetWriter.isaacCipher); // L: 9935 - var10.packetBuffer.writeInt(var1); // L: 9936 - var10.packetBuffer.writeShort(var2); // L: 9937 - var10.packetBuffer.writeShort(var3); // L: 9938 - Client.packetWriter.addNode(var10); // L: 9939 + if (var0 == 2) { + var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2880, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); } - if (var0 == 3) { // L: 9941 - var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2834, Client.packetWriter.isaacCipher); // L: 9943 - var10.packetBuffer.writeInt(var1); // L: 9944 - var10.packetBuffer.writeShort(var2); // L: 9945 - var10.packetBuffer.writeShort(var3); // L: 9946 - Client.packetWriter.addNode(var10); // L: 9947 + if (var0 == 3) { + var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2834, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); } - if (var0 == 4) { // L: 9949 - var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2821, Client.packetWriter.isaacCipher); // L: 9951 - var10.packetBuffer.writeInt(var1); // L: 9952 - var10.packetBuffer.writeShort(var2); // L: 9953 - var10.packetBuffer.writeShort(var3); // L: 9954 - Client.packetWriter.addNode(var10); // L: 9955 + if (var0 == 4) { + var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2821, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); } - if (var0 == 5) { // L: 9957 - var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2877, Client.packetWriter.isaacCipher); // L: 9959 - var10.packetBuffer.writeInt(var1); // L: 9960 - var10.packetBuffer.writeShort(var2); // L: 9961 - var10.packetBuffer.writeShort(var3); // L: 9962 - Client.packetWriter.addNode(var10); // L: 9963 + if (var0 == 5) { + var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2877, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); } - if (var0 == 6) { // L: 9965 - var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2866, Client.packetWriter.isaacCipher); // L: 9967 - var10.packetBuffer.writeInt(var1); // L: 9968 - var10.packetBuffer.writeShort(var2); // L: 9969 - var10.packetBuffer.writeShort(var3); // L: 9970 - Client.packetWriter.addNode(var10); // L: 9971 + if (var0 == 6) { + var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2866, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); } - if (var0 == 7) { // L: 9973 - var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2822, Client.packetWriter.isaacCipher); // L: 9975 - var10.packetBuffer.writeInt(var1); // L: 9976 - var10.packetBuffer.writeShort(var2); // L: 9977 - var10.packetBuffer.writeShort(var3); // L: 9978 - Client.packetWriter.addNode(var10); // L: 9979 + if (var0 == 7) { + var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2822, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); } - if (var0 == 8) { // L: 9981 - var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2884, Client.packetWriter.isaacCipher); // L: 9983 - var10.packetBuffer.writeInt(var1); // L: 9984 - var10.packetBuffer.writeShort(var2); // L: 9985 - var10.packetBuffer.writeShort(var3); // L: 9986 - Client.packetWriter.addNode(var10); // L: 9987 + if (var0 == 8) { + var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2884, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); } - if (var0 == 9) { // L: 9989 - var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2830, Client.packetWriter.isaacCipher); // L: 9991 - var10.packetBuffer.writeInt(var1); // L: 9992 - var10.packetBuffer.writeShort(var2); // L: 9993 - var10.packetBuffer.writeShort(var3); // L: 9994 - Client.packetWriter.addNode(var10); // L: 9995 + if (var0 == 9) { + var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2830, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); } - if (var0 == 10) { // L: 9997 - var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2853, Client.packetWriter.isaacCipher); // L: 9999 - var10.packetBuffer.writeInt(var1); // L: 10000 - var10.packetBuffer.writeShort(var2); // L: 10001 - var10.packetBuffer.writeShort(var3); // L: 10002 - Client.packetWriter.addNode(var10); // L: 10003 + if (var0 == 10) { + var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2853, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); } } } } - } // L: 9923 10005 + } } diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java index fbe85279f2..32a9af0fec 100644 --- a/runescape-client/src/main/java/SoundEffect.java +++ b/runescape-client/src/main/java/SoundEffect.java @@ -23,20 +23,20 @@ public class SoundEffect { descriptor = "(Lpi;)V" ) SoundEffect(Buffer var1) { - this.instruments = new Instrument[10]; // L: 10 + this.instruments = new Instrument[10]; - for (int var2 = 0; var2 < 10; ++var2) { // L: 21 - int var3 = var1.readUnsignedByte(); // L: 22 - if (var3 != 0) { // L: 23 - --var1.offset; // L: 24 - this.instruments[var2] = new Instrument(); // L: 25 - this.instruments[var2].decode(var1); // L: 26 + for (int var2 = 0; var2 < 10; ++var2) { + int var3 = var1.readUnsignedByte(); + if (var3 != 0) { + --var1.offset; + this.instruments[var2] = new Instrument(); + this.instruments[var2].decode(var1); } } - this.start = var1.readUnsignedShort(); // L: 28 - this.end = var1.readUnsignedShort(); // L: 29 - } // L: 30 + this.start = var1.readUnsignedShort(); + this.end = var1.readUnsignedShort(); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -44,40 +44,40 @@ public class SoundEffect { ) @Export("toRawSound") public RawSound toRawSound() { - byte[] var1 = this.mix(); // L: 33 - return new RawSound(22050, var1, this.start * 22050 / 1000, this.end * 22050 / 1000); // L: 34 + byte[] var1 = this.mix(); + return new RawSound(22050, var1, this.start * 22050 / 1000, this.end * 22050 / 1000); } @ObfuscatedName("p") @Export("calculateDelay") public final int calculateDelay() { - int var1 = 9999999; // L: 38 + int var1 = 9999999; int var2; - for (var2 = 0; var2 < 10; ++var2) { // L: 39 - if (this.instruments[var2] != null && this.instruments[var2].offset / 20 < var1) { // L: 40 41 + for (var2 = 0; var2 < 10; ++var2) { + if (this.instruments[var2] != null && this.instruments[var2].offset / 20 < var1) { var1 = this.instruments[var2].offset / 20; } } - if (this.start < this.end && this.start / 20 < var1) { // L: 44 + if (this.start < this.end && this.start / 20 < var1) { var1 = this.start / 20; } - if (var1 != 9999999 && var1 != 0) { // L: 45 - for (var2 = 0; var2 < 10; ++var2) { // L: 46 + if (var1 != 9999999 && var1 != 0) { + for (var2 = 0; var2 < 10; ++var2) { if (this.instruments[var2] != null) { Instrument var10000 = this.instruments[var2]; - var10000.offset -= var1 * 20; // L: 47 + var10000.offset -= var1 * 20; } } - if (this.start < this.end) { // L: 49 - this.start -= var1 * 20; // L: 50 - this.end -= var1 * 20; // L: 51 + if (this.start < this.end) { + this.start -= var1 * 20; + this.end -= var1 * 20; } - return var1; // L: 53 + return var1; } else { return 0; } @@ -86,39 +86,39 @@ public class SoundEffect { @ObfuscatedName("m") @Export("mix") final byte[] mix() { - int var1 = 0; // L: 57 + int var1 = 0; int var2; - for (var2 = 0; var2 < 10; ++var2) { // L: 58 - if (this.instruments[var2] != null && this.instruments[var2].duration + this.instruments[var2].offset > var1) { // L: 59 60 + for (var2 = 0; var2 < 10; ++var2) { + if (this.instruments[var2] != null && this.instruments[var2].duration + this.instruments[var2].offset > var1) { var1 = this.instruments[var2].duration + this.instruments[var2].offset; } } - if (var1 == 0) { // L: 63 + if (var1 == 0) { return new byte[0]; } else { - var2 = var1 * 22050 / 1000; // L: 64 - byte[] var3 = new byte[var2]; // L: 65 + var2 = var1 * 22050 / 1000; + byte[] var3 = new byte[var2]; - for (int var4 = 0; var4 < 10; ++var4) { // L: 66 - if (this.instruments[var4] != null) { // L: 67 - int var5 = this.instruments[var4].duration * 22050 / 1000; // L: 68 - int var6 = this.instruments[var4].offset * 22050 / 1000; // L: 69 - int[] var7 = this.instruments[var4].synthesize(var5, this.instruments[var4].duration); // L: 70 + for (int var4 = 0; var4 < 10; ++var4) { + if (this.instruments[var4] != null) { + int var5 = this.instruments[var4].duration * 22050 / 1000; + int var6 = this.instruments[var4].offset * 22050 / 1000; + int[] var7 = this.instruments[var4].synthesize(var5, this.instruments[var4].duration); - for (int var8 = 0; var8 < var5; ++var8) { // L: 71 - int var9 = (var7[var8] >> 8) + var3[var8 + var6]; // L: 72 - if ((var9 + 128 & -256) != 0) { // L: 73 + for (int var8 = 0; var8 < var5; ++var8) { + int var9 = (var7[var8] >> 8) + var3[var8 + var6]; + if ((var9 + 128 & -256) != 0) { var9 = var9 >> 31 ^ 127; } - var3[var8 + var6] = (byte)var9; // L: 74 + var3[var8 + var6] = (byte)var9; } } } - return var3; // L: 78 + return var3; } } @@ -128,7 +128,7 @@ public class SoundEffect { ) @Export("readSoundEffect") public static SoundEffect readSoundEffect(AbstractArchive var0, int var1, int var2) { - byte[] var3 = var0.takeFile(var1, var2); // L: 15 - return var3 == null ? null : new SoundEffect(new Buffer(var3)); // L: 16 + byte[] var3 = var0.takeFile(var1, var2); + return var3 == null ? null : new SoundEffect(new Buffer(var3)); } } diff --git a/runescape-client/src/main/java/SoundEnvelope.java b/runescape-client/src/main/java/SoundEnvelope.java index 8b12bdf501..87a568befa 100644 --- a/runescape-client/src/main/java/SoundEnvelope.java +++ b/runescape-client/src/main/java/SoundEnvelope.java @@ -41,14 +41,14 @@ public class SoundEnvelope { int max; SoundEnvelope() { - this.segments = 2; // L: 21 - this.durations = new int[2]; // L: 22 - this.phases = new int[2]; // L: 23 - this.durations[0] = 0; // L: 24 - this.durations[1] = 65535; // L: 25 - this.phases[0] = 0; // L: 26 - this.phases[1] = 65535; // L: 27 - } // L: 28 + this.segments = 2; + this.durations = new int[2]; + this.phases = new int[2]; + this.durations[0] = 0; + this.durations[1] = 65535; + this.phases[0] = 0; + this.phases[1] = 65535; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -56,11 +56,11 @@ public class SoundEnvelope { ) @Export("decode") final void decode(Buffer var1) { - this.form = var1.readUnsignedByte(); // L: 31 - this.start = var1.readInt(); // L: 32 - this.end = var1.readInt(); // L: 33 - this.decodeSegments(var1); // L: 34 - } // L: 35 + this.form = var1.readUnsignedByte(); + this.start = var1.readInt(); + this.end = var1.readInt(); + this.decodeSegments(var1); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -68,44 +68,44 @@ public class SoundEnvelope { ) @Export("decodeSegments") final void decodeSegments(Buffer var1) { - this.segments = var1.readUnsignedByte(); // L: 38 - this.durations = new int[this.segments]; // L: 39 - this.phases = new int[this.segments]; // L: 40 + this.segments = var1.readUnsignedByte(); + this.durations = new int[this.segments]; + this.phases = new int[this.segments]; - for (int var2 = 0; var2 < this.segments; ++var2) { // L: 41 - this.durations[var2] = var1.readUnsignedShort(); // L: 42 - this.phases[var2] = var1.readUnsignedShort(); // L: 43 + for (int var2 = 0; var2 < this.segments; ++var2) { + this.durations[var2] = var1.readUnsignedShort(); + this.phases[var2] = var1.readUnsignedShort(); } - } // L: 45 + } @ObfuscatedName("p") @Export("reset") final void reset() { - this.ticks = 0; // L: 48 - this.phaseIndex = 0; // L: 49 - this.step = 0; // L: 50 - this.amplitude = 0; // L: 51 - this.max = 0; // L: 52 - } // L: 53 + this.ticks = 0; + this.phaseIndex = 0; + this.step = 0; + this.amplitude = 0; + this.max = 0; + } @ObfuscatedName("m") @Export("doStep") final int doStep(int var1) { - if (this.max >= this.ticks) { // L: 56 - this.amplitude = this.phases[this.phaseIndex++] << 15; // L: 57 - if (this.phaseIndex >= this.segments) { // L: 58 + if (this.max >= this.ticks) { + this.amplitude = this.phases[this.phaseIndex++] << 15; + if (this.phaseIndex >= this.segments) { this.phaseIndex = this.segments - 1; } - this.ticks = (int)((double)this.durations[this.phaseIndex] / 65536.0D * (double)var1); // L: 59 - if (this.ticks > this.max) { // L: 60 + this.ticks = (int)((double)this.durations[this.phaseIndex] / 65536.0D * (double)var1); + if (this.ticks > this.max) { this.step = ((this.phases[this.phaseIndex] << 15) - this.amplitude) / (this.ticks - this.max); } } - this.amplitude += this.step; // L: 62 - ++this.max; // L: 63 - return this.amplitude - this.step >> 15; // L: 64 + this.amplitude += this.step; + ++this.max; + return this.amplitude - this.step >> 15; } } diff --git a/runescape-client/src/main/java/SoundSystem.java b/runescape-client/src/main/java/SoundSystem.java index fc7e7f81e8..3a4a2866e9 100644 --- a/runescape-client/src/main/java/SoundSystem.java +++ b/runescape-client/src/main/java/SoundSystem.java @@ -17,20 +17,20 @@ public class SoundSystem implements Runnable { volatile PcmPlayer[] players; SoundSystem() { - this.players = new PcmPlayer[2]; // L: 6 - } // L: 8 + this.players = new PcmPlayer[2]; + } public void run() { try { - for (int var1 = 0; var1 < 2; ++var1) { // L: 12 - PcmPlayer var2 = this.players[var1]; // L: 13 - if (var2 != null) { // L: 14 + for (int var1 = 0; var1 < 2; ++var1) { + PcmPlayer var2 = this.players[var1]; + if (var2 != null) { var2.run(); } } - } catch (Exception var4) { // L: 17 - AccessFile.RunException_sendStackTrace((String)null, var4); // L: 18 + } catch (Exception var4) { + AccessFile.RunException_sendStackTrace((String)null, var4); } - } // L: 20 + } } diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java index d8df16b2d4..3fd1143bb9 100644 --- a/runescape-client/src/main/java/SpotAnimationDefinition.java +++ b/runescape-client/src/main/java/SpotAnimationDefinition.java @@ -93,18 +93,18 @@ public class SpotAnimationDefinition extends DualNode { int contrast; static { - SpotAnimationDefinition_cached = new EvictingDualNodeHashTable(64); // L: 14 - SpotAnimationDefinition_cachedModels = new EvictingDualNodeHashTable(30); // L: 15 + SpotAnimationDefinition_cached = new EvictingDualNodeHashTable(64); + SpotAnimationDefinition_cachedModels = new EvictingDualNodeHashTable(30); } SpotAnimationDefinition() { - this.sequence = -1; // L: 18 - this.widthScale = 128; // L: 23 - this.heightScale = 128; // L: 24 - this.orientation = 0; // L: 25 - this.ambient = 0; // L: 26 - this.contrast = 0; // L: 27 - } // L: 29 + this.sequence = -1; + this.widthScale = 128; + this.heightScale = 128; + this.orientation = 0; + this.ambient = 0; + this.contrast = 0; + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -114,12 +114,12 @@ public class SpotAnimationDefinition extends DualNode { @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 49 - if (var2 == 0) { // L: 50 - return; // L: 53 + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; } - this.decodeNext(var1, var2); // L: 51 + this.decodeNext(var1, var2); } } @@ -130,24 +130,24 @@ public class SpotAnimationDefinition extends DualNode { ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 56 + if (var2 == 1) { this.archive = var1.readUnsignedShort(); - } else if (var2 == 2) { // L: 57 + } else if (var2 == 2) { this.sequence = var1.readUnsignedShort(); - } else if (var2 == 4) { // L: 58 + } else if (var2 == 4) { this.widthScale = var1.readUnsignedShort(); - } else if (var2 == 5) { // L: 59 + } else if (var2 == 5) { this.heightScale = var1.readUnsignedShort(); - } else if (var2 == 6) { // L: 60 + } else if (var2 == 6) { this.orientation = var1.readUnsignedShort(); - } else if (var2 == 7) { // L: 61 + } else if (var2 == 7) { this.ambient = var1.readUnsignedByte(); - } else if (var2 == 8) { // L: 62 + } else if (var2 == 8) { this.contrast = var1.readUnsignedByte(); } else { int var3; int var4; - if (var2 == 40) { // L: 63 + if (var2 == 40) { var3 = var1.readUnsignedByte(); this.recolorFrom = new short[var3]; this.recolorTo = new short[var3]; @@ -156,19 +156,19 @@ public class SpotAnimationDefinition extends DualNode { this.recolorFrom[var4] = (short)var1.readUnsignedShort(); this.recolorTo[var4] = (short)var1.readUnsignedShort(); } - } else if (var2 == 41) { // L: 72 - var3 = var1.readUnsignedByte(); // L: 73 - this.retextureFrom = new short[var3]; // L: 74 - this.retextureTo = new short[var3]; // L: 75 + } else if (var2 == 41) { + var3 = var1.readUnsignedByte(); + this.retextureFrom = new short[var3]; + this.retextureTo = new short[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 76 - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 77 - this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 78 + for (var4 = 0; var4 < var3; ++var4) { + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); + this.retextureTo[var4] = (short)var1.readUnsignedShort(); } } } - } // L: 82 + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -177,59 +177,59 @@ public class SpotAnimationDefinition extends DualNode { ) @Export("getModel") public final Model getModel(int var1) { - Model var2 = (Model)SpotAnimationDefinition_cachedModels.get((long)this.id); // L: 85 - if (var2 == null) { // L: 86 - ModelData var3 = ModelData.ModelData_get(SpotAnimationDefinition_modelArchive, this.archive, 0); // L: 87 - if (var3 == null) { // L: 88 + Model var2 = (Model)SpotAnimationDefinition_cachedModels.get((long)this.id); + if (var2 == null) { + ModelData var3 = ModelData.ModelData_get(SpotAnimationDefinition_modelArchive, this.archive, 0); + if (var3 == null) { return null; } int var4; - if (this.recolorFrom != null) { // L: 89 - for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 90 - var3.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 91 + if (this.recolorFrom != null) { + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { + var3.recolor(this.recolorFrom[var4], this.recolorTo[var4]); } } - if (this.retextureFrom != null) { // L: 94 - for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 95 - var3.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 96 + if (this.retextureFrom != null) { + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { + var3.retexture(this.retextureFrom[var4], this.retextureTo[var4]); } } - var2 = var3.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); // L: 99 - SpotAnimationDefinition_cachedModels.put(var2, (long)this.id); // L: 100 + var2 = var3.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); + SpotAnimationDefinition_cachedModels.put(var2, (long)this.id); } Model var5; - if (this.sequence != -1 && var1 != -1) { // L: 103 + if (this.sequence != -1 && var1 != -1) { var5 = UserComparator5.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); } else { - var5 = var2.toSharedSpotAnimationModel(true); // L: 104 + var5 = var2.toSharedSpotAnimationModel(true); } - if (this.widthScale != 128 || this.heightScale != 128) { // L: 105 + if (this.widthScale != 128 || this.heightScale != 128) { var5.scale(this.widthScale, this.heightScale, this.widthScale); } - if (this.orientation != 0) { // L: 106 - if (this.orientation == 90) { // L: 107 + if (this.orientation != 0) { + if (this.orientation == 90) { var5.rotateY90Ccw(); } - if (this.orientation == 180) { // L: 108 - var5.rotateY90Ccw(); // L: 109 - var5.rotateY90Ccw(); // L: 110 + if (this.orientation == 180) { + var5.rotateY90Ccw(); + var5.rotateY90Ccw(); } - if (this.orientation == 270) { // L: 112 - var5.rotateY90Ccw(); // L: 113 - var5.rotateY90Ccw(); // L: 114 - var5.rotateY90Ccw(); // L: 115 + if (this.orientation == 270) { + var5.rotateY90Ccw(); + var5.rotateY90Ccw(); + var5.rotateY90Ccw(); } } - return var5; // L: 118 + return var5; } @ObfuscatedName("c") @@ -239,7 +239,7 @@ public class SpotAnimationDefinition extends DualNode { ) @Export("PlayerType_values") public static PlayerType[] PlayerType_values() { - return new PlayerType[]{PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_jagexModerator, PlayerType.field3795, PlayerType.PlayerType_ultimateIronman, PlayerType.PlayerType_normal, PlayerType.field3802, PlayerType.field3801, PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_ironman}; // L: 22 + return new PlayerType[]{PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_jagexModerator, PlayerType.field3795, PlayerType.PlayerType_ultimateIronman, PlayerType.PlayerType_normal, PlayerType.field3802, PlayerType.field3801, PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_ironman}; } @ObfuscatedName("s") @@ -248,13 +248,13 @@ public class SpotAnimationDefinition extends DualNode { garbageValue = "84" ) public static int method3362(int var0) { - --var0; // L: 64 - var0 |= var0 >>> 1; // L: 65 - var0 |= var0 >>> 2; // L: 66 - var0 |= var0 >>> 4; // L: 67 - var0 |= var0 >>> 8; // L: 68 - var0 |= var0 >>> 16; // L: 69 - return var0 + 1; // L: 70 + --var0; + var0 |= var0 >>> 1; + var0 |= var0 >>> 2; + var0 |= var0 >>> 4; + var0 |= var0 >>> 8; + var0 |= var0 >>> 16; + return var0 + 1; } @ObfuscatedName("lc") @@ -263,18 +263,18 @@ public class SpotAnimationDefinition extends DualNode { garbageValue = "-123837697" ) static Widget method3340(Widget var0) { - int var1 = Frames.method4149(class363.getWidgetFlags(var0)); // L: 12567 - if (var1 == 0) { // L: 12568 + int var1 = Frames.method4149(class363.getWidgetFlags(var0)); + if (var1 == 0) { return null; } else { - for (int var2 = 0; var2 < var1; ++var2) { // L: 12569 - var0 = ChatChannel.getWidget(var0.parentId); // L: 12570 - if (var0 == null) { // L: 12571 + for (int var2 = 0; var2 < var1; ++var2) { + var0 = ChatChannel.getWidget(var0.parentId); + if (var0 == null) { return null; } } - return var0; // L: 12573 + return var0; } } } diff --git a/runescape-client/src/main/java/SpriteMask.java b/runescape-client/src/main/java/SpriteMask.java index 7715a43e94..9c36e07b77 100644 --- a/runescape-client/src/main/java/SpriteMask.java +++ b/runescape-client/src/main/java/SpriteMask.java @@ -30,11 +30,11 @@ public class SpriteMask extends DualNode { public final int[] xStarts; SpriteMask(int var1, int var2, int[] var3, int[] var4, int var5) { - this.width = var1; // L: 747 - this.height = var2; // L: 748 - this.xWidths = var3; // L: 749 - this.xStarts = var4; // L: 750 - } // L: 751 + this.width = var1; + this.height = var2; + this.xWidths = var3; + this.xStarts = var4; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -43,13 +43,13 @@ public class SpriteMask extends DualNode { ) @Export("contains") public boolean contains(int var1, int var2) { - if (var2 >= 0 && var2 < this.xStarts.length) { // L: 754 - int var3 = this.xStarts[var2]; // L: 755 - if (var1 >= var3 && var1 <= var3 + this.xWidths[var2]) { // L: 756 + if (var2 >= 0 && var2 < this.xStarts.length) { + int var3 = this.xStarts[var2]; + if (var1 >= var3 && var1 <= var3 + this.xWidths[var2]) { return true; } } - return false; // L: 758 + return false; } } diff --git a/runescape-client/src/main/java/SpritePixels.java b/runescape-client/src/main/java/SpritePixels.java index f557c25e11..97625dd7b8 100644 --- a/runescape-client/src/main/java/SpritePixels.java +++ b/runescape-client/src/main/java/SpritePixels.java @@ -29,19 +29,19 @@ public final class SpritePixels extends Rasterizer2D { public int height; public SpritePixels(int[] var1, int var2, int var3) { - this.pixels = var1; // L: 26 - this.subWidth = this.width = var2; // L: 27 - this.subHeight = this.height = var3; // L: 28 - this.yOffset = 0; // L: 29 - this.xOffset = 0; // L: 30 - } // L: 31 + this.pixels = var1; + this.subWidth = this.width = var2; + this.subHeight = this.height = var3; + this.yOffset = 0; + this.xOffset = 0; + } public SpritePixels(int var1, int var2) { - this(new int[var2 * var1], var1, var2); // L: 22 - } // L: 23 + this(new int[var2 * var1], var1, var2); + } public SpritePixels() { - } // L: 19 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -49,19 +49,19 @@ public final class SpritePixels extends Rasterizer2D { ) @Export("mirrorHorizontally") public SpritePixels mirrorHorizontally() { - SpritePixels var1 = new SpritePixels(this.subWidth, this.subHeight); // L: 34 - var1.width = this.width; // L: 35 - var1.height = this.height; // L: 36 - var1.xOffset = this.width - this.subWidth - this.xOffset; // L: 37 - var1.yOffset = this.yOffset; // L: 38 + SpritePixels var1 = new SpritePixels(this.subWidth, this.subHeight); + var1.width = this.width; + var1.height = this.height; + var1.xOffset = this.width - this.subWidth - this.xOffset; + var1.yOffset = this.yOffset; - for (int var2 = 0; var2 < this.subHeight; ++var2) { // L: 39 - for (int var3 = 0; var3 < this.subWidth; ++var3) { // L: 40 - var1.pixels[var3 + var2 * this.subWidth] = this.pixels[var2 * this.subWidth + this.subWidth - 1 - var3]; // L: 41 + for (int var2 = 0; var2 < this.subHeight; ++var2) { + for (int var3 = 0; var3 < this.subWidth; ++var3) { + var1.pixels[var3 + var2 * this.subWidth] = this.pixels[var2 * this.subWidth + this.subWidth - 1 - var3]; } } - return var1; // L: 44 + return var1; } @ObfuscatedName("b") @@ -70,832 +70,832 @@ public final class SpritePixels extends Rasterizer2D { ) @Export("copyNormalized") public SpritePixels copyNormalized() { - SpritePixels var1 = new SpritePixels(this.width, this.height); // L: 48 + SpritePixels var1 = new SpritePixels(this.width, this.height); - for (int var2 = 0; var2 < this.subHeight; ++var2) { // L: 49 - for (int var3 = 0; var3 < this.subWidth; ++var3) { // L: 50 - var1.pixels[var3 + (var2 + this.yOffset) * this.width + this.xOffset] = this.pixels[var3 + var2 * this.subWidth]; // L: 51 + for (int var2 = 0; var2 < this.subHeight; ++var2) { + for (int var3 = 0; var3 < this.subWidth; ++var3) { + var1.pixels[var3 + (var2 + this.yOffset) * this.width + this.xOffset] = this.pixels[var3 + var2 * this.subWidth]; } } - return var1; // L: 54 + return var1; } @ObfuscatedName("p") @Export("setRaster") public void setRaster() { - Rasterizer2D.Rasterizer2D_replace(this.pixels, this.subWidth, this.subHeight); // L: 58 - } // L: 59 + Rasterizer2D.Rasterizer2D_replace(this.pixels, this.subWidth, this.subHeight); + } @ObfuscatedName("m") @Export("normalize") public void normalize() { - if (this.subWidth != this.width || this.subHeight != this.height) { // L: 62 - int[] var1 = new int[this.width * this.height]; // L: 63 + if (this.subWidth != this.width || this.subHeight != this.height) { + int[] var1 = new int[this.width * this.height]; - for (int var2 = 0; var2 < this.subHeight; ++var2) { // L: 64 - for (int var3 = 0; var3 < this.subWidth; ++var3) { // L: 65 - var1[var3 + (var2 + this.yOffset) * this.width + this.xOffset] = this.pixels[var3 + var2 * this.subWidth]; // L: 66 + for (int var2 = 0; var2 < this.subHeight; ++var2) { + for (int var3 = 0; var3 < this.subWidth; ++var3) { + var1[var3 + (var2 + this.yOffset) * this.width + this.xOffset] = this.pixels[var3 + var2 * this.subWidth]; } } - this.pixels = var1; // L: 69 - this.subWidth = this.width; // L: 70 - this.subHeight = this.height; // L: 71 - this.xOffset = 0; // L: 72 - this.yOffset = 0; // L: 73 + this.pixels = var1; + this.subWidth = this.width; + this.subHeight = this.height; + this.xOffset = 0; + this.yOffset = 0; } - } // L: 74 + } @ObfuscatedName("t") @Export("pad") public void pad(int var1) { - if (this.subWidth != this.width || this.subHeight != this.height) { // L: 77 - int var2 = var1; // L: 78 - if (var1 > this.xOffset) { // L: 79 + if (this.subWidth != this.width || this.subHeight != this.height) { + int var2 = var1; + if (var1 > this.xOffset) { var2 = this.xOffset; } - int var3 = var1; // L: 80 - if (var1 + this.xOffset + this.subWidth > this.width) { // L: 81 + int var3 = var1; + if (var1 + this.xOffset + this.subWidth > this.width) { var3 = this.width - this.xOffset - this.subWidth; } - int var4 = var1; // L: 82 - if (var1 > this.yOffset) { // L: 83 + int var4 = var1; + if (var1 > this.yOffset) { var4 = this.yOffset; } - int var5 = var1; // L: 84 - if (var1 + this.yOffset + this.subHeight > this.height) { // L: 85 + int var5 = var1; + if (var1 + this.yOffset + this.subHeight > this.height) { var5 = this.height - this.yOffset - this.subHeight; } - int var6 = var2 + var3 + this.subWidth; // L: 86 - int var7 = var4 + var5 + this.subHeight; // L: 87 - int[] var8 = new int[var6 * var7]; // L: 88 + int var6 = var2 + var3 + this.subWidth; + int var7 = var4 + var5 + this.subHeight; + int[] var8 = new int[var6 * var7]; - for (int var9 = 0; var9 < this.subHeight; ++var9) { // L: 89 - for (int var10 = 0; var10 < this.subWidth; ++var10) { // L: 90 - var8[var6 * (var9 + var4) + var10 + var2] = this.pixels[var10 + var9 * this.subWidth]; // L: 91 + for (int var9 = 0; var9 < this.subHeight; ++var9) { + for (int var10 = 0; var10 < this.subWidth; ++var10) { + var8[var6 * (var9 + var4) + var10 + var2] = this.pixels[var10 + var9 * this.subWidth]; } } - this.pixels = var8; // L: 94 - this.subWidth = var6; // L: 95 - this.subHeight = var7; // L: 96 - this.xOffset -= var2; // L: 97 - this.yOffset -= var4; // L: 98 + this.pixels = var8; + this.subWidth = var6; + this.subHeight = var7; + this.xOffset -= var2; + this.yOffset -= var4; } - } // L: 99 + } @ObfuscatedName("s") @Export("flipHorizontally") public void flipHorizontally() { - int[] var1 = new int[this.subWidth * this.subHeight]; // L: 102 - int var2 = 0; // L: 103 + int[] var1 = new int[this.subWidth * this.subHeight]; + int var2 = 0; - for (int var3 = 0; var3 < this.subHeight; ++var3) { // L: 104 + for (int var3 = 0; var3 < this.subHeight; ++var3) { for (int var4 = this.subWidth - 1; var4 >= 0; --var4) { - var1[var2++] = this.pixels[var4 + var3 * this.subWidth]; // L: 105 - } - } - - this.pixels = var1; // L: 107 - this.xOffset = this.width - this.subWidth - this.xOffset; // L: 108 - } // L: 109 - - @ObfuscatedName("j") - @Export("flipVertically") - public void flipVertically() { - int[] var1 = new int[this.subWidth * this.subHeight]; // L: 112 - int var2 = 0; // L: 113 - - for (int var3 = this.subHeight - 1; var3 >= 0; --var3) { // L: 114 - for (int var4 = 0; var4 < this.subWidth; ++var4) { // L: 115 var1[var2++] = this.pixels[var4 + var3 * this.subWidth]; } } - this.pixels = var1; // L: 117 - this.yOffset = this.height - this.subHeight - this.yOffset; // L: 118 - } // L: 119 + this.pixels = var1; + this.xOffset = this.width - this.subWidth - this.xOffset; + } + + @ObfuscatedName("j") + @Export("flipVertically") + public void flipVertically() { + int[] var1 = new int[this.subWidth * this.subHeight]; + int var2 = 0; + + for (int var3 = this.subHeight - 1; var3 >= 0; --var3) { + for (int var4 = 0; var4 < this.subWidth; ++var4) { + var1[var2++] = this.pixels[var4 + var3 * this.subWidth]; + } + } + + this.pixels = var1; + this.yOffset = this.height - this.subHeight - this.yOffset; + } @ObfuscatedName("w") @Export("outline") public void outline(int var1) { - int[] var2 = new int[this.subWidth * this.subHeight]; // L: 122 - int var3 = 0; // L: 123 + int[] var2 = new int[this.subWidth * this.subHeight]; + int var3 = 0; - for (int var4 = 0; var4 < this.subHeight; ++var4) { // L: 124 - for (int var5 = 0; var5 < this.subWidth; ++var5) { // L: 125 - int var6 = this.pixels[var3]; // L: 126 - if (var6 == 0) { // L: 127 - if (var5 > 0 && this.pixels[var3 - 1] != 0) { // L: 128 + for (int var4 = 0; var4 < this.subHeight; ++var4) { + for (int var5 = 0; var5 < this.subWidth; ++var5) { + int var6 = this.pixels[var3]; + if (var6 == 0) { + if (var5 > 0 && this.pixels[var3 - 1] != 0) { var6 = var1; - } else if (var4 > 0 && this.pixels[var3 - this.subWidth] != 0) { // L: 129 + } else if (var4 > 0 && this.pixels[var3 - this.subWidth] != 0) { var6 = var1; } else if (var5 < this.subWidth - 1 && this.pixels[var3 + 1] != 0) { - var6 = var1; // L: 130 - } else if (var4 < this.subHeight - 1 && this.pixels[var3 + this.subWidth] != 0) { // L: 131 + var6 = var1; + } else if (var4 < this.subHeight - 1 && this.pixels[var3 + this.subWidth] != 0) { var6 = var1; } } - var2[var3++] = var6; // L: 133 + var2[var3++] = var6; } } - this.pixels = var2; // L: 136 - } // L: 137 + this.pixels = var2; + } @ObfuscatedName("n") @Export("shadow") public void shadow(int var1) { - for (int var2 = this.subHeight - 1; var2 > 0; --var2) { // L: 140 - int var3 = var2 * this.subWidth; // L: 141 + for (int var2 = this.subHeight - 1; var2 > 0; --var2) { + int var3 = var2 * this.subWidth; - for (int var4 = this.subWidth - 1; var4 > 0; --var4) { // L: 142 + for (int var4 = this.subWidth - 1; var4 > 0; --var4) { if (this.pixels[var4 + var3] == 0 && this.pixels[var4 + var3 - 1 - this.subWidth] != 0) { - this.pixels[var4 + var3] = var1; // L: 143 + this.pixels[var4 + var3] = var1; } } } - } // L: 146 + } @ObfuscatedName("r") @Export("drawAt") public void drawAt(int var1, int var2) { - var1 += this.xOffset; // L: 149 - var2 += this.yOffset; // L: 150 - int var3 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 151 - int var4 = 0; // L: 152 - int var5 = this.subHeight; // L: 153 - int var6 = this.subWidth; // L: 154 - int var7 = Rasterizer2D.Rasterizer2D_width - var6; // L: 155 - int var8 = 0; // L: 156 + var1 += this.xOffset; + var2 += this.yOffset; + int var3 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; + int var4 = 0; + int var5 = this.subHeight; + int var6 = this.subWidth; + int var7 = Rasterizer2D.Rasterizer2D_width - var6; + int var8 = 0; int var9; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 157 - var9 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 158 - var5 -= var9; // L: 159 - var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 160 - var4 += var9 * var6; // L: 161 - var3 += var9 * Rasterizer2D.Rasterizer2D_width; // L: 162 + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + var9 = Rasterizer2D.Rasterizer2D_yClipStart - var2; + var5 -= var9; + var2 = Rasterizer2D.Rasterizer2D_yClipStart; + var4 += var9 * var6; + var3 += var9 * Rasterizer2D.Rasterizer2D_width; } - if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 164 + if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { var5 -= var5 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 165 - var9 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 166 - var6 -= var9; // L: 167 - var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 168 - var4 += var9; // L: 169 - var3 += var9; // L: 170 - var8 += var9; // L: 171 - var7 += var9; // L: 172 + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + var9 = Rasterizer2D.Rasterizer2D_xClipStart - var1; + var6 -= var9; + var1 = Rasterizer2D.Rasterizer2D_xClipStart; + var4 += var9; + var3 += var9; + var8 += var9; + var7 += var9; } - if (var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 174 - var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 175 - var6 -= var9; // L: 176 - var8 += var9; // L: 177 - var7 += var9; // L: 178 + if (var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; + var6 -= var9; + var8 += var9; + var7 += var9; } - if (var6 > 0 && var5 > 0) { // L: 180 - Sprite_draw(Rasterizer2D.Rasterizer2D_pixels, this.pixels, var4, var3, var6, var5, var7, var8); // L: 181 + if (var6 > 0 && var5 > 0) { + Sprite_draw(Rasterizer2D.Rasterizer2D_pixels, this.pixels, var4, var3, var6, var5, var7, var8); } - } // L: 182 + } @ObfuscatedName("v") @Export("drawTransBgAt") public void drawTransBgAt(int var1, int var2) { - var1 += this.xOffset; // L: 203 - var2 += this.yOffset; // L: 204 - int var3 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 205 - int var4 = 0; // L: 206 - int var5 = this.subHeight; // L: 207 - int var6 = this.subWidth; // L: 208 - int var7 = Rasterizer2D.Rasterizer2D_width - var6; // L: 209 - int var8 = 0; // L: 210 + var1 += this.xOffset; + var2 += this.yOffset; + int var3 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; + int var4 = 0; + int var5 = this.subHeight; + int var6 = this.subWidth; + int var7 = Rasterizer2D.Rasterizer2D_width - var6; + int var8 = 0; int var9; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 211 - var9 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 212 - var5 -= var9; // L: 213 - var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 214 - var4 += var9 * var6; // L: 215 - var3 += var9 * Rasterizer2D.Rasterizer2D_width; // L: 216 + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + var9 = Rasterizer2D.Rasterizer2D_yClipStart - var2; + var5 -= var9; + var2 = Rasterizer2D.Rasterizer2D_yClipStart; + var4 += var9 * var6; + var3 += var9 * Rasterizer2D.Rasterizer2D_width; } - if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 218 + if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { var5 -= var5 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 219 - var9 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 220 - var6 -= var9; // L: 221 - var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 222 - var4 += var9; // L: 223 - var3 += var9; // L: 224 - var8 += var9; // L: 225 - var7 += var9; // L: 226 + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + var9 = Rasterizer2D.Rasterizer2D_xClipStart - var1; + var6 -= var9; + var1 = Rasterizer2D.Rasterizer2D_xClipStart; + var4 += var9; + var3 += var9; + var8 += var9; + var7 += var9; } - if (var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 228 - var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 229 - var6 -= var9; // L: 230 - var8 += var9; // L: 231 - var7 += var9; // L: 232 + if (var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; + var6 -= var9; + var8 += var9; + var7 += var9; } - if (var6 > 0 && var5 > 0) { // L: 234 - Sprite_drawTransBg(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var4, var3, var6, var5, var7, var8); // L: 235 + if (var6 > 0 && var5 > 0) { + Sprite_drawTransBg(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var4, var3, var6, var5, var7, var8); } - } // L: 236 + } @ObfuscatedName("h") @Export("drawScaledAt") public void drawScaledAt(int var1, int var2, int var3, int var4) { - if (var3 > 0 && var4 > 0) { // L: 267 - int var5 = this.subWidth; // L: 268 - int var6 = this.subHeight; // L: 269 - int var7 = 0; // L: 270 - int var8 = 0; // L: 271 - int var9 = this.width; // L: 272 - int var10 = this.height; // L: 273 - int var11 = (var9 << 16) / var3; // L: 274 - int var12 = (var10 << 16) / var4; // L: 275 + if (var3 > 0 && var4 > 0) { + int var5 = this.subWidth; + int var6 = this.subHeight; + int var7 = 0; + int var8 = 0; + int var9 = this.width; + int var10 = this.height; + int var11 = (var9 << 16) / var3; + int var12 = (var10 << 16) / var4; int var13; - if (this.xOffset > 0) { // L: 276 - var13 = (var11 + (this.xOffset << 16) - 1) / var11; // L: 277 - var1 += var13; // L: 278 - var7 += var13 * var11 - (this.xOffset << 16); // L: 279 + if (this.xOffset > 0) { + var13 = (var11 + (this.xOffset << 16) - 1) / var11; + var1 += var13; + var7 += var13 * var11 - (this.xOffset << 16); } - if (this.yOffset > 0) { // L: 281 - var13 = (var12 + (this.yOffset << 16) - 1) / var12; // L: 282 - var2 += var13; // L: 283 - var8 += var13 * var12 - (this.yOffset << 16); // L: 284 + if (this.yOffset > 0) { + var13 = (var12 + (this.yOffset << 16) - 1) / var12; + var2 += var13; + var8 += var13 * var12 - (this.yOffset << 16); } - if (var5 < var9) { // L: 286 + if (var5 < var9) { var3 = (var11 + ((var5 << 16) - var7) - 1) / var11; } - if (var6 < var10) { // L: 287 + if (var6 < var10) { var4 = (var12 + ((var6 << 16) - var8) - 1) / var12; } - var13 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 288 - int var14 = Rasterizer2D.Rasterizer2D_width - var3; // L: 289 - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 290 + var13 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; + int var14 = Rasterizer2D.Rasterizer2D_width - var3; + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } int var15; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 291 - var15 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 292 - var4 -= var15; // L: 293 - var13 += var15 * Rasterizer2D.Rasterizer2D_width; // L: 294 - var8 += var12 * var15; // L: 295 + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + var15 = Rasterizer2D.Rasterizer2D_yClipStart - var2; + var4 -= var15; + var13 += var15 * Rasterizer2D.Rasterizer2D_width; + var8 += var12 * var15; } - if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 297 - var15 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 298 - var3 -= var15; // L: 299 - var14 += var15; // L: 300 + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var15 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; + var3 -= var15; + var14 += var15; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 302 - var15 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 303 - var3 -= var15; // L: 304 - var13 += var15; // L: 305 - var7 += var11 * var15; // L: 306 - var14 += var15; // L: 307 + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + var15 = Rasterizer2D.Rasterizer2D_xClipStart - var1; + var3 -= var15; + var13 += var15; + var7 += var11 * var15; + var14 += var15; } - Sprite_drawScaled(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var7, var8, var13, var14, var3, var4, var11, var12, var5); // L: 309 + Sprite_drawScaled(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var7, var8, var13, var14, var3, var4, var11, var12, var5); } - } // L: 310 + } @ObfuscatedName("e") @Export("drawTransOverlayAt") public void drawTransOverlayAt(int var1, int var2, int var3, int var4) { - if (var3 == 256) { // L: 329 - this.drawTransBgAt(var1, var2); // L: 330 + if (var3 == 256) { + this.drawTransBgAt(var1, var2); } else { - var1 += this.xOffset; // L: 333 - var2 += this.yOffset; // L: 334 - int var5 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 335 - int var6 = 0; // L: 336 - int var7 = this.subHeight; // L: 337 - int var8 = this.subWidth; // L: 338 - int var9 = Rasterizer2D.Rasterizer2D_width - var8; // L: 339 - int var10 = 0; // L: 340 + var1 += this.xOffset; + var2 += this.yOffset; + int var5 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; + int var6 = 0; + int var7 = this.subHeight; + int var8 = this.subWidth; + int var9 = Rasterizer2D.Rasterizer2D_width - var8; + int var10 = 0; int var11; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 341 - var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 342 - var7 -= var11; // L: 343 - var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 344 - var6 += var11 * var8; // L: 345 - var5 += var11 * Rasterizer2D.Rasterizer2D_width; // L: 346 + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2; + var7 -= var11; + var2 = Rasterizer2D.Rasterizer2D_yClipStart; + var6 += var11 * var8; + var5 += var11 * Rasterizer2D.Rasterizer2D_width; } - if (var7 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 348 + if (var7 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { var7 -= var7 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 349 - var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 350 - var8 -= var11; // L: 351 - var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 352 - var6 += var11; // L: 353 - var5 += var11; // L: 354 - var10 += var11; // L: 355 - var9 += var11; // L: 356 + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1; + var8 -= var11; + var1 = Rasterizer2D.Rasterizer2D_xClipStart; + var6 += var11; + var5 += var11; + var10 += var11; + var9 += var11; } - if (var8 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 358 - var11 = var8 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 359 - var8 -= var11; // L: 360 - var10 += var11; // L: 361 - var9 += var11; // L: 362 + if (var8 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var11 = var8 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; + var8 -= var11; + var10 += var11; + var9 += var11; } - if (var8 > 0 && var7 > 0) { // L: 364 - Sprite_drawTransOverlay(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var6, var5, var8, var7, var9, var10, var3, var4); // L: 365 + if (var8 > 0 && var7 > 0) { + Sprite_drawTransOverlay(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var6, var5, var8, var7, var9, var10, var3, var4); } } - } // L: 331 366 + } @ObfuscatedName("u") @Export("drawTransAt") public void drawTransAt(int var1, int var2, int var3) { - var1 += this.xOffset; // L: 389 - var2 += this.yOffset; // L: 390 - int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 391 - int var5 = 0; // L: 392 - int var6 = this.subHeight; // L: 393 - int var7 = this.subWidth; // L: 394 - int var8 = Rasterizer2D.Rasterizer2D_width - var7; // L: 395 - int var9 = 0; // L: 396 + var1 += this.xOffset; + var2 += this.yOffset; + int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; + int var5 = 0; + int var6 = this.subHeight; + int var7 = this.subWidth; + int var8 = Rasterizer2D.Rasterizer2D_width - var7; + int var9 = 0; int var10; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 397 - var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 398 - var6 -= var10; // L: 399 - var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 400 - var5 += var10 * var7; // L: 401 - var4 += var10 * Rasterizer2D.Rasterizer2D_width; // L: 402 + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; + var6 -= var10; + var2 = Rasterizer2D.Rasterizer2D_yClipStart; + var5 += var10 * var7; + var4 += var10 * Rasterizer2D.Rasterizer2D_width; } - if (var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 404 + if (var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { var6 -= var6 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 405 - var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 406 - var7 -= var10; // L: 407 - var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 408 - var5 += var10; // L: 409 - var4 += var10; // L: 410 - var9 += var10; // L: 411 - var8 += var10; // L: 412 + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; + var7 -= var10; + var1 = Rasterizer2D.Rasterizer2D_xClipStart; + var5 += var10; + var4 += var10; + var9 += var10; + var8 += var10; } - if (var7 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 414 - var10 = var7 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 415 - var7 -= var10; // L: 416 - var9 += var10; // L: 417 - var8 += var10; // L: 418 + if (var7 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var10 = var7 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; + var7 -= var10; + var9 += var10; + var8 += var10; } - if (var7 > 0 && var6 > 0) { // L: 420 - Sprite_drawTransparent(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var5, var4, var7, var6, var8, var9, var3); // L: 421 + if (var7 > 0 && var6 > 0) { + Sprite_drawTransparent(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var5, var4, var7, var6, var8, var9, var3); } - } // L: 422 + } @ObfuscatedName("f") @Export("drawTransScaledAt") public void drawTransScaledAt(int var1, int var2, int var3, int var4, int var5) { - if (var3 > 0 && var4 > 0) { // L: 441 - int var6 = this.subWidth; // L: 442 - int var7 = this.subHeight; // L: 443 - int var8 = 0; // L: 444 - int var9 = 0; // L: 445 - int var10 = this.width; // L: 446 - int var11 = this.height; // L: 447 - int var12 = (var10 << 16) / var3; // L: 448 - int var13 = (var11 << 16) / var4; // L: 449 + if (var3 > 0 && var4 > 0) { + int var6 = this.subWidth; + int var7 = this.subHeight; + int var8 = 0; + int var9 = 0; + int var10 = this.width; + int var11 = this.height; + int var12 = (var10 << 16) / var3; + int var13 = (var11 << 16) / var4; int var14; - if (this.xOffset > 0) { // L: 450 - var14 = (var12 + (this.xOffset << 16) - 1) / var12; // L: 451 - var1 += var14; // L: 452 - var8 += var14 * var12 - (this.xOffset << 16); // L: 453 + if (this.xOffset > 0) { + var14 = (var12 + (this.xOffset << 16) - 1) / var12; + var1 += var14; + var8 += var14 * var12 - (this.xOffset << 16); } - if (this.yOffset > 0) { // L: 455 - var14 = (var13 + (this.yOffset << 16) - 1) / var13; // L: 456 - var2 += var14; // L: 457 - var9 += var14 * var13 - (this.yOffset << 16); // L: 458 + if (this.yOffset > 0) { + var14 = (var13 + (this.yOffset << 16) - 1) / var13; + var2 += var14; + var9 += var14 * var13 - (this.yOffset << 16); } - if (var6 < var10) { // L: 460 + if (var6 < var10) { var3 = (var12 + ((var6 << 16) - var8) - 1) / var12; } - if (var7 < var11) { // L: 461 + if (var7 < var11) { var4 = (var13 + ((var7 << 16) - var9) - 1) / var13; } - var14 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 462 - int var15 = Rasterizer2D.Rasterizer2D_width - var3; // L: 463 - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 464 + var14 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; + int var15 = Rasterizer2D.Rasterizer2D_width - var3; + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } int var16; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 465 - var16 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 466 - var4 -= var16; // L: 467 - var14 += var16 * Rasterizer2D.Rasterizer2D_width; // L: 468 - var9 += var13 * var16; // L: 469 + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + var16 = Rasterizer2D.Rasterizer2D_yClipStart - var2; + var4 -= var16; + var14 += var16 * Rasterizer2D.Rasterizer2D_width; + var9 += var13 * var16; } - if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 471 - var16 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 472 - var3 -= var16; // L: 473 - var15 += var16; // L: 474 + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var16 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; + var3 -= var16; + var15 += var16; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 476 - var16 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 477 - var3 -= var16; // L: 478 - var14 += var16; // L: 479 - var8 += var12 * var16; // L: 480 - var15 += var16; // L: 481 + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + var16 = Rasterizer2D.Rasterizer2D_xClipStart - var1; + var3 -= var16; + var14 += var16; + var8 += var12 * var16; + var15 += var16; } - Sprite_drawTransScaled(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var8, var9, var14, var15, var3, var4, var12, var13, var6, var5); // L: 483 + Sprite_drawTransScaled(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var8, var9, var14, var15, var3, var4, var12, var13, var6, var5); } - } // L: 484 + } @ObfuscatedName("q") public void method7809(int var1, int var2, int var3) { - var1 += this.xOffset; // L: 507 - var2 += this.yOffset; // L: 508 - int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 509 - int var5 = 0; // L: 510 - int var6 = this.subHeight; // L: 511 - int var7 = this.subWidth; // L: 512 - int var8 = Rasterizer2D.Rasterizer2D_width - var7; // L: 513 - int var9 = 0; // L: 514 + var1 += this.xOffset; + var2 += this.yOffset; + int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; + int var5 = 0; + int var6 = this.subHeight; + int var7 = this.subWidth; + int var8 = Rasterizer2D.Rasterizer2D_width - var7; + int var9 = 0; int var10; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 515 - var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 516 - var6 -= var10; // L: 517 - var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 518 - var5 += var10 * var7; // L: 519 - var4 += var10 * Rasterizer2D.Rasterizer2D_width; // L: 520 + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; + var6 -= var10; + var2 = Rasterizer2D.Rasterizer2D_yClipStart; + var5 += var10 * var7; + var4 += var10 * Rasterizer2D.Rasterizer2D_width; } - if (var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 522 + if (var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { var6 -= var6 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 523 - var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 524 - var7 -= var10; // L: 525 - var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 526 - var5 += var10; // L: 527 - var4 += var10; // L: 528 - var9 += var10; // L: 529 - var8 += var10; // L: 530 + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; + var7 -= var10; + var1 = Rasterizer2D.Rasterizer2D_xClipStart; + var5 += var10; + var4 += var10; + var9 += var10; + var8 += var10; } - if (var7 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 532 - var10 = var7 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 533 - var7 -= var10; // L: 534 - var9 += var10; // L: 535 - var8 += var10; // L: 536 + if (var7 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var10 = var7 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; + var7 -= var10; + var9 += var10; + var8 += var10; } - if (var7 > 0 && var6 > 0) { // L: 538 + if (var7 > 0 && var6 > 0) { if (var3 == 256) { - method7774(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); // L: 539 + method7774(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); } else { - method7798(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); // L: 540 + method7798(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); } } - } // L: 541 + } @ObfuscatedName("i") public void method7776(int var1, int var2, int var3, int var4, int var5) { - if (var3 > 0 && var4 > 0) { // L: 582 - int var6 = this.subWidth; // L: 583 - int var7 = this.subHeight; // L: 584 - int var8 = 0; // L: 585 - int var9 = 0; // L: 586 - int var10 = this.width; // L: 587 - int var11 = this.height; // L: 588 - int var12 = (var10 << 16) / var3; // L: 589 - int var13 = (var11 << 16) / var4; // L: 590 + if (var3 > 0 && var4 > 0) { + int var6 = this.subWidth; + int var7 = this.subHeight; + int var8 = 0; + int var9 = 0; + int var10 = this.width; + int var11 = this.height; + int var12 = (var10 << 16) / var3; + int var13 = (var11 << 16) / var4; int var14; - if (this.xOffset > 0) { // L: 591 - var14 = (var12 + (this.xOffset << 16) - 1) / var12; // L: 592 - var1 += var14; // L: 593 - var8 += var14 * var12 - (this.xOffset << 16); // L: 594 + if (this.xOffset > 0) { + var14 = (var12 + (this.xOffset << 16) - 1) / var12; + var1 += var14; + var8 += var14 * var12 - (this.xOffset << 16); } - if (this.yOffset > 0) { // L: 596 - var14 = (var13 + (this.yOffset << 16) - 1) / var13; // L: 597 - var2 += var14; // L: 598 - var9 += var14 * var13 - (this.yOffset << 16); // L: 599 + if (this.yOffset > 0) { + var14 = (var13 + (this.yOffset << 16) - 1) / var13; + var2 += var14; + var9 += var14 * var13 - (this.yOffset << 16); } - if (var6 < var10) { // L: 601 + if (var6 < var10) { var3 = (var12 + ((var6 << 16) - var8) - 1) / var12; } - if (var7 < var11) { // L: 602 + if (var7 < var11) { var4 = (var13 + ((var7 << 16) - var9) - 1) / var13; } - var14 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 603 - int var15 = Rasterizer2D.Rasterizer2D_width - var3; // L: 604 - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 605 + var14 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; + int var15 = Rasterizer2D.Rasterizer2D_width - var3; + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } int var16; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 606 - var16 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 607 - var4 -= var16; // L: 608 - var14 += var16 * Rasterizer2D.Rasterizer2D_width; // L: 609 - var9 += var13 * var16; // L: 610 + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + var16 = Rasterizer2D.Rasterizer2D_yClipStart - var2; + var4 -= var16; + var14 += var16 * Rasterizer2D.Rasterizer2D_width; + var9 += var13 * var16; } - if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 612 - var16 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 613 - var3 -= var16; // L: 614 - var15 += var16; // L: 615 + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var16 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; + var3 -= var16; + var15 += var16; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 617 - var16 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 618 - var3 -= var16; // L: 619 - var14 += var16; // L: 620 - var8 += var12 * var16; // L: 621 - var15 += var16; // L: 622 + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + var16 = Rasterizer2D.Rasterizer2D_xClipStart - var1; + var3 -= var16; + var14 += var16; + var8 += var12 * var16; + var15 += var16; } - if (var5 == 256) { // L: 624 + if (var5 == 256) { method7777(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); } else { - method7780(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); // L: 625 + method7780(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); } } - } // L: 626 + } @ObfuscatedName("ao") public void method7779(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { - int var9 = var2 < 0 ? -var2 : 0; // L: 675 - int var10 = var2 + this.subHeight <= var6 ? this.subHeight : var6 - var2; // L: 676 - int var11 = var1 < 0 ? -var1 : 0; // L: 677 + int var9 = var2 < 0 ? -var2 : 0; + int var10 = var2 + this.subHeight <= var6 ? this.subHeight : var6 - var2; + int var11 = var1 < 0 ? -var1 : 0; int var10000; - if (this.subWidth + var1 <= var5) { // L: 678 + if (this.subWidth + var1 <= var5) { var10000 = this.subWidth; } else { var10000 = var5 - var1; } - int var13 = var3 + var11 + (var9 + var2 + var4) * Rasterizer2D.Rasterizer2D_width + var1; // L: 679 - int var14 = var9 + var2; // L: 680 + int var13 = var3 + var11 + (var9 + var2 + var4) * Rasterizer2D.Rasterizer2D_width + var1; + int var14 = var9 + var2; - for (int var15 = var9; var15 < var10; ++var15) { // L: 681 - int var16 = var7[var14]; // L: 682 - int var17 = var8[var14++]; // L: 683 - int var18 = var13; // L: 684 + for (int var15 = var9; var15 < var10; ++var15) { + int var16 = var7[var14]; + int var17 = var8[var14++]; + int var18 = var13; int var19; - if (var1 < var16) { // L: 686 - var19 = var16 - var1; // L: 687 - var18 = var13 + (var19 - var11); // L: 688 + if (var1 < var16) { + var19 = var16 - var1; + var18 = var13 + (var19 - var11); } else { - var19 = var11; // L: 690 + var19 = var11; } int var12; - if (this.subWidth + var1 <= var16 + var17) { // L: 691 + if (this.subWidth + var1 <= var16 + var17) { var12 = this.subWidth; } else { - var12 = var16 + var17 - var1; // L: 692 + var12 = var16 + var17 - var1; } - for (int var20 = var19; var20 < var12; ++var20) { // L: 693 - int var21 = this.pixels[var20 + var15 * this.subWidth]; // L: 694 + for (int var20 = var19; var20 < var12; ++var20) { + int var21 = this.pixels[var20 + var15 * this.subWidth]; if (var21 != 0) { - Rasterizer2D.Rasterizer2D_pixels[var18++] = var21; // L: 695 + Rasterizer2D.Rasterizer2D_pixels[var18++] = var21; } else { - ++var18; // L: 696 + ++var18; } } - var13 += Rasterizer2D.Rasterizer2D_width; // L: 698 + var13 += Rasterizer2D.Rasterizer2D_width; } - } // L: 700 + } @ObfuscatedName("ab") @Export("drawRotatedMaskedCenteredAround") public void drawRotatedMaskedCenteredAround(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int[] var9, int[] var10) { try { - int var11 = -var3 / 2; // L: 704 - int var12 = -var4 / 2; // L: 705 - int var13 = (int)(Math.sin((double)var7 / 326.11D) * 65536.0D); // L: 706 - int var14 = (int)(Math.cos((double)var7 / 326.11D) * 65536.0D); // L: 707 - var13 = var13 * var8 >> 8; // L: 708 - var14 = var14 * var8 >> 8; // L: 709 - int var15 = var12 * var13 + var11 * var14 + (var5 << 16); // L: 710 - int var16 = var12 * var14 - var11 * var13 + (var6 << 16); // L: 711 - int var17 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 712 + int var11 = -var3 / 2; + int var12 = -var4 / 2; + int var13 = (int)(Math.sin((double)var7 / 326.11D) * 65536.0D); + int var14 = (int)(Math.cos((double)var7 / 326.11D) * 65536.0D); + var13 = var13 * var8 >> 8; + var14 = var14 * var8 >> 8; + int var15 = var12 * var13 + var11 * var14 + (var5 << 16); + int var16 = var12 * var14 - var11 * var13 + (var6 << 16); + int var17 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; - for (var2 = 0; var2 < var4; ++var2) { // L: 713 - int var18 = var9[var2]; // L: 714 - int var19 = var17 + var18; // L: 715 - int var20 = var15 + var14 * var18; // L: 716 - int var21 = var16 - var13 * var18; // L: 717 + for (var2 = 0; var2 < var4; ++var2) { + int var18 = var9[var2]; + int var19 = var17 + var18; + int var20 = var15 + var14 * var18; + int var21 = var16 - var13 * var18; - for (var1 = -var10[var2]; var1 < 0; ++var1) { // L: 718 - Rasterizer2D.Rasterizer2D_pixels[var19++] = this.pixels[this.subWidth * (var21 >> 16) + (var20 >> 16)]; // L: 719 - var20 += var14; // L: 720 - var21 -= var13; // L: 721 + for (var1 = -var10[var2]; var1 < 0; ++var1) { + Rasterizer2D.Rasterizer2D_pixels[var19++] = this.pixels[this.subWidth * (var21 >> 16) + (var20 >> 16)]; + var20 += var14; + var21 -= var13; } - var15 += var13; // L: 723 - var16 += var14; // L: 724 - var17 += Rasterizer2D.Rasterizer2D_width; // L: 725 + var15 += var13; + var16 += var14; + var17 += Rasterizer2D.Rasterizer2D_width; } - } catch (Exception var23) { // L: 728 + } catch (Exception var23) { } - } // L: 729 + } @ObfuscatedName("an") public void method7807(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { try { - int var10 = -var3 / 2; // L: 733 - int var11 = -var4 / 2; // L: 734 - int var12 = (int)(Math.sin(var7) * 65536.0D); // L: 735 - int var13 = (int)(Math.cos(var7) * 65536.0D); // L: 736 - var12 = var12 * var9 >> 8; // L: 737 - var13 = var13 * var9 >> 8; // L: 738 - int var14 = var11 * var12 + var10 * var13 + (var5 << 16); // L: 739 - int var15 = var11 * var13 - var10 * var12 + (var6 << 16); // L: 740 - int var16 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 741 + int var10 = -var3 / 2; + int var11 = -var4 / 2; + int var12 = (int)(Math.sin(var7) * 65536.0D); + int var13 = (int)(Math.cos(var7) * 65536.0D); + var12 = var12 * var9 >> 8; + var13 = var13 * var9 >> 8; + int var14 = var11 * var12 + var10 * var13 + (var5 << 16); + int var15 = var11 * var13 - var10 * var12 + (var6 << 16); + int var16 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; - for (var2 = 0; var2 < var4; ++var2) { // L: 742 - int var17 = var16; // L: 743 - int var18 = var14; // L: 744 - int var19 = var15; // L: 745 + for (var2 = 0; var2 < var4; ++var2) { + int var17 = var16; + int var18 = var14; + int var19 = var15; - for (var1 = -var3; var1 < 0; ++var1) { // L: 746 - int var20 = this.pixels[this.subWidth * (var19 >> 16) + (var18 >> 16)]; // L: 747 - if (var20 != 0) { // L: 748 + for (var1 = -var3; var1 < 0; ++var1) { + int var20 = this.pixels[this.subWidth * (var19 >> 16) + (var18 >> 16)]; + if (var20 != 0) { Rasterizer2D.Rasterizer2D_pixels[var17++] = var20; } else { - ++var17; // L: 749 + ++var17; } - var18 += var13; // L: 750 - var19 -= var12; // L: 751 + var18 += var13; + var19 -= var12; } - var14 += var12; // L: 753 - var15 += var13; // L: 754 - var16 += Rasterizer2D.Rasterizer2D_width; // L: 755 + var14 += var12; + var15 += var13; + var16 += Rasterizer2D.Rasterizer2D_width; } - } catch (Exception var22) { // L: 758 + } catch (Exception var22) { } - } // L: 759 + } @ObfuscatedName("ax") public void method7781(int var1, int var2, int var3, int var4) { - this.method7782(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); // L: 762 - } // L: 763 + this.method7782(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); + } @ObfuscatedName("am") void method7782(int var1, int var2, int var3, int var4, int var5, int var6) { - if (var6 != 0) { // L: 766 - var1 -= this.xOffset << 4; // L: 767 - var2 -= this.yOffset << 4; // L: 768 - double var7 = (double)(var5 & 65535) * 9.587379924285257E-5D; // L: 769 - int var9 = (int)Math.floor(Math.sin(var7) * (double)var6 + 0.5D); // L: 770 - int var10 = (int)Math.floor(Math.cos(var7) * (double)var6 + 0.5D); // L: 771 - int var11 = var10 * -var1 + -var2 * var9; // L: 772 - int var12 = -var2 * var10 + var9 * -(-var1); // L: 773 - int var13 = var10 * ((this.subWidth << 4) - var1) + -var2 * var9; // L: 774 - int var14 = var9 * -((this.subWidth << 4) - var1) + -var2 * var10; // L: 775 - int var15 = ((this.subHeight << 4) - var2) * var9 + var10 * -var1; // L: 776 - int var16 = ((this.subHeight << 4) - var2) * var10 + var9 * -(-var1); // L: 777 - int var17 = ((this.subHeight << 4) - var2) * var9 + var10 * ((this.subWidth << 4) - var1); // L: 778 - int var18 = ((this.subHeight << 4) - var2) * var10 + var9 * -((this.subWidth << 4) - var1); // L: 779 + if (var6 != 0) { + var1 -= this.xOffset << 4; + var2 -= this.yOffset << 4; + double var7 = (double)(var5 & 65535) * 9.587379924285257E-5D; + int var9 = (int)Math.floor(Math.sin(var7) * (double)var6 + 0.5D); + int var10 = (int)Math.floor(Math.cos(var7) * (double)var6 + 0.5D); + int var11 = var10 * -var1 + -var2 * var9; + int var12 = -var2 * var10 + var9 * -(-var1); + int var13 = var10 * ((this.subWidth << 4) - var1) + -var2 * var9; + int var14 = var9 * -((this.subWidth << 4) - var1) + -var2 * var10; + int var15 = ((this.subHeight << 4) - var2) * var9 + var10 * -var1; + int var16 = ((this.subHeight << 4) - var2) * var10 + var9 * -(-var1); + int var17 = ((this.subHeight << 4) - var2) * var9 + var10 * ((this.subWidth << 4) - var1); + int var18 = ((this.subHeight << 4) - var2) * var10 + var9 * -((this.subWidth << 4) - var1); int var19; int var20; - if (var11 < var13) { // L: 782 - var19 = var11; // L: 783 - var20 = var13; // L: 784 + if (var11 < var13) { + var19 = var11; + var20 = var13; } else { - var19 = var13; // L: 787 - var20 = var11; // L: 788 + var19 = var13; + var20 = var11; } - if (var15 < var19) { // L: 790 + if (var15 < var19) { var19 = var15; } - if (var17 < var19) { // L: 791 + if (var17 < var19) { var19 = var17; } - if (var15 > var20) { // L: 792 + if (var15 > var20) { var20 = var15; } - if (var17 > var20) { // L: 793 + if (var17 > var20) { var20 = var17; } int var21; int var22; - if (var12 < var14) { // L: 796 - var21 = var12; // L: 797 - var22 = var14; // L: 798 + if (var12 < var14) { + var21 = var12; + var22 = var14; } else { - var21 = var14; // L: 801 - var22 = var12; // L: 802 + var21 = var14; + var22 = var12; } - if (var16 < var21) { // L: 804 + if (var16 < var21) { var21 = var16; } - if (var18 < var21) { // L: 805 + if (var18 < var21) { var21 = var18; } - if (var16 > var22) { // L: 806 + if (var16 > var22) { var22 = var16; } - if (var18 > var22) { // L: 807 + if (var18 > var22) { var22 = var18; } - var19 >>= 12; // L: 808 - var20 = var20 + 4095 >> 12; // L: 809 - var21 >>= 12; // L: 810 - var22 = var22 + 4095 >> 12; // L: 811 - var19 += var3; // L: 812 - var20 += var3; // L: 813 - var21 += var4; // L: 814 - var22 += var4; // L: 815 - var19 >>= 4; // L: 816 - var20 = var20 + 15 >> 4; // L: 817 - var21 >>= 4; // L: 818 - var22 = var22 + 15 >> 4; // L: 819 - if (var19 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 820 + var19 >>= 12; + var20 = var20 + 4095 >> 12; + var21 >>= 12; + var22 = var22 + 4095 >> 12; + var19 += var3; + var20 += var3; + var21 += var4; + var22 += var4; + var19 >>= 4; + var20 = var20 + 15 >> 4; + var21 >>= 4; + var22 = var22 + 15 >> 4; + if (var19 < Rasterizer2D.Rasterizer2D_xClipStart) { var19 = Rasterizer2D.Rasterizer2D_xClipStart; } - if (var20 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 821 + if (var20 > Rasterizer2D.Rasterizer2D_xClipEnd) { var20 = Rasterizer2D.Rasterizer2D_xClipEnd; } - if (var21 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 822 + if (var21 < Rasterizer2D.Rasterizer2D_yClipStart) { var21 = Rasterizer2D.Rasterizer2D_yClipStart; } - if (var22 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 823 + if (var22 > Rasterizer2D.Rasterizer2D_yClipEnd) { var22 = Rasterizer2D.Rasterizer2D_yClipEnd; } - var20 = var19 - var20; // L: 824 - if (var20 < 0) { // L: 825 - var22 = var21 - var22; // L: 826 - if (var22 < 0) { // L: 827 - int var23 = var19 + var21 * Rasterizer2D.Rasterizer2D_width; // L: 828 - double var24 = 1.6777216E7D / (double)var6; // L: 829 - int var26 = (int)Math.floor(Math.sin(var7) * var24 + 0.5D); // L: 830 - int var27 = (int)Math.floor(Math.cos(var7) * var24 + 0.5D); // L: 831 - int var28 = (var19 << 4) + 8 - var3; // L: 832 - int var29 = (var21 << 4) + 8 - var4; // L: 833 - int var30 = (var1 << 8) - (var29 * var26 >> 4); // L: 834 - int var31 = (var29 * var27 >> 4) + (var2 << 8); // L: 835 + var20 = var19 - var20; + if (var20 < 0) { + var22 = var21 - var22; + if (var22 < 0) { + int var23 = var19 + var21 * Rasterizer2D.Rasterizer2D_width; + double var24 = 1.6777216E7D / (double)var6; + int var26 = (int)Math.floor(Math.sin(var7) * var24 + 0.5D); + int var27 = (int)Math.floor(Math.cos(var7) * var24 + 0.5D); + int var28 = (var19 << 4) + 8 - var3; + int var29 = (var21 << 4) + 8 - var4; + int var30 = (var1 << 8) - (var29 * var26 >> 4); + int var31 = (var29 * var27 >> 4) + (var2 << 8); int var32; int var33; int var34; @@ -903,350 +903,350 @@ public final class SpritePixels extends Rasterizer2D { int var36; int var37; int var38; - if (var27 == 0) { // L: 837 - if (var26 == 0) { // L: 838 + if (var27 == 0) { + if (var26 == 0) { for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; // L: 840 - var35 = var30; // L: 841 - var36 = var31; // L: 842 - var37 = var20; // L: 843 - if (var30 >= 0 && var31 >= 0 && var30 - (this.subWidth << 12) < 0 && var31 - (this.subHeight << 12) < 0) { // L: 844 845 846 847 - for (; var37 < 0; ++var37) { // L: 848 - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 849 - if (var38 != 0) { // L: 850 + var34 = var23; + var35 = var30; + var36 = var31; + var37 = var20; + if (var30 >= 0 && var31 >= 0 && var30 - (this.subWidth << 12) < 0 && var31 - (this.subHeight << 12) < 0) { + for (; var37 < 0; ++var37) { + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; + if (var38 != 0) { Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; // L: 851 + ++var34; } } } - ++var33; // L: 839 + ++var33; } - } else if (var26 < 0) { // L: 855 + } else if (var26 < 0) { for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; // L: 857 - var35 = var30; // L: 858 - var36 = (var28 * var26 >> 4) + var31; // L: 859 - var37 = var20; // L: 860 - if (var30 >= 0 && var30 - (this.subWidth << 12) < 0) { // L: 861 862 - if ((var32 = var36 - (this.subHeight << 12)) >= 0) { // L: 863 - var32 = (var26 - var32) / var26; // L: 864 - var37 = var20 + var32; // L: 865 - var36 += var26 * var32; // L: 866 - var34 = var23 + var32; // L: 867 + var34 = var23; + var35 = var30; + var36 = (var28 * var26 >> 4) + var31; + var37 = var20; + if (var30 >= 0 && var30 - (this.subWidth << 12) < 0) { + if ((var32 = var36 - (this.subHeight << 12)) >= 0) { + var32 = (var26 - var32) / var26; + var37 = var20 + var32; + var36 += var26 * var32; + var34 = var23 + var32; } - if ((var32 = (var36 - var26) / var26) > var37) { // L: 869 + if ((var32 = (var36 - var26) / var26) > var37) { var37 = var32; } while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 871 - if (var38 != 0) { // L: 872 + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; + if (var38 != 0) { Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; // L: 873 + ++var34; } - var36 += var26; // L: 874 - ++var37; // L: 870 + var36 += var26; + ++var37; } } - ++var33; // L: 856 + ++var33; var30 -= var26; } } else { for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; // L: 880 - var35 = var30; // L: 881 - var36 = (var28 * var26 >> 4) + var31; // L: 882 - var37 = var20; // L: 883 - if (var30 >= 0 && var30 - (this.subWidth << 12) < 0) { // L: 884 885 - if (var36 < 0) { // L: 886 - var32 = (var26 - 1 - var36) / var26; // L: 887 - var37 = var20 + var32; // L: 888 - var36 += var26 * var32; // L: 889 - var34 = var23 + var32; // L: 890 + var34 = var23; + var35 = var30; + var36 = (var28 * var26 >> 4) + var31; + var37 = var20; + if (var30 >= 0 && var30 - (this.subWidth << 12) < 0) { + if (var36 < 0) { + var32 = (var26 - 1 - var36) / var26; + var37 = var20 + var32; + var36 += var26 * var32; + var34 = var23 + var32; } - if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { // L: 892 + if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { var37 = var32; } while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 894 - if (var38 != 0) { // L: 895 + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; + if (var38 != 0) { Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; // L: 896 + ++var34; } - var36 += var26; // L: 897 - ++var37; // L: 893 + var36 += var26; + ++var37; } } - ++var33; // L: 879 + ++var33; var30 -= var26; } } - } else if (var27 < 0) { // L: 902 - if (var26 == 0) { // L: 903 + } else if (var27 < 0) { + if (var26 == 0) { for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; // L: 905 - var35 = (var28 * var27 >> 4) + var30; // L: 906 - var36 = var31; // L: 907 - var37 = var20; // L: 908 - if (var31 >= 0 && var31 - (this.subHeight << 12) < 0) { // L: 909 910 - if ((var32 = var35 - (this.subWidth << 12)) >= 0) { // L: 911 - var32 = (var27 - var32) / var27; // L: 912 - var37 = var20 + var32; // L: 913 - var35 += var27 * var32; // L: 914 - var34 = var23 + var32; // L: 915 + var34 = var23; + var35 = (var28 * var27 >> 4) + var30; + var36 = var31; + var37 = var20; + if (var31 >= 0 && var31 - (this.subHeight << 12) < 0) { + if ((var32 = var35 - (this.subWidth << 12)) >= 0) { + var32 = (var27 - var32) / var27; + var37 = var20 + var32; + var35 += var27 * var32; + var34 = var23 + var32; } - if ((var32 = (var35 - var27) / var27) > var37) { // L: 917 + if ((var32 = (var35 - var27) / var27) > var37) { var37 = var32; } while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 919 - if (var38 != 0) { // L: 920 + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; + if (var38 != 0) { Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; // L: 921 + ++var34; } - var35 += var27; // L: 922 - ++var37; // L: 918 + var35 += var27; + ++var37; } } - ++var33; // L: 904 + ++var33; var31 += var27; } - } else if (var26 < 0) { // L: 926 + } else if (var26 < 0) { for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; // L: 928 - var35 = (var28 * var27 >> 4) + var30; // L: 929 - var36 = (var28 * var26 >> 4) + var31; // L: 930 - var37 = var20; // L: 931 - if ((var32 = var35 - (this.subWidth << 12)) >= 0) { // L: 932 - var32 = (var27 - var32) / var27; // L: 933 - var37 = var20 + var32; // L: 934 - var35 += var27 * var32; // L: 935 - var36 += var26 * var32; // L: 936 - var34 = var23 + var32; // L: 937 + var34 = var23; + var35 = (var28 * var27 >> 4) + var30; + var36 = (var28 * var26 >> 4) + var31; + var37 = var20; + if ((var32 = var35 - (this.subWidth << 12)) >= 0) { + var32 = (var27 - var32) / var27; + var37 = var20 + var32; + var35 += var27 * var32; + var36 += var26 * var32; + var34 = var23 + var32; } - if ((var32 = (var35 - var27) / var27) > var37) { // L: 939 + if ((var32 = (var35 - var27) / var27) > var37) { var37 = var32; } - if ((var32 = var36 - (this.subHeight << 12)) >= 0) { // L: 940 - var32 = (var26 - var32) / var26; // L: 941 - var37 += var32; // L: 942 - var35 += var27 * var32; // L: 943 - var36 += var26 * var32; // L: 944 - var34 += var32; // L: 945 + if ((var32 = var36 - (this.subHeight << 12)) >= 0) { + var32 = (var26 - var32) / var26; + var37 += var32; + var35 += var27 * var32; + var36 += var26 * var32; + var34 += var32; } - if ((var32 = (var36 - var26) / var26) > var37) { // L: 947 + if ((var32 = (var36 - var26) / var26) > var37) { var37 = var32; } while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 949 - if (var38 != 0) { // L: 950 + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; + if (var38 != 0) { Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; // L: 951 + ++var34; } - var35 += var27; // L: 952 - var36 += var26; // L: 953 - ++var37; // L: 948 + var35 += var27; + var36 += var26; + ++var37; } - ++var33; // L: 927 + ++var33; var30 -= var26; var31 += var27; } } else { for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; // L: 959 - var35 = (var28 * var27 >> 4) + var30; // L: 960 - var36 = (var28 * var26 >> 4) + var31; // L: 961 - var37 = var20; // L: 962 - if ((var32 = var35 - (this.subWidth << 12)) >= 0) { // L: 963 - var32 = (var27 - var32) / var27; // L: 964 - var37 = var20 + var32; // L: 965 - var35 += var27 * var32; // L: 966 - var36 += var26 * var32; // L: 967 - var34 = var23 + var32; // L: 968 + var34 = var23; + var35 = (var28 * var27 >> 4) + var30; + var36 = (var28 * var26 >> 4) + var31; + var37 = var20; + if ((var32 = var35 - (this.subWidth << 12)) >= 0) { + var32 = (var27 - var32) / var27; + var37 = var20 + var32; + var35 += var27 * var32; + var36 += var26 * var32; + var34 = var23 + var32; } - if ((var32 = (var35 - var27) / var27) > var37) { // L: 970 + if ((var32 = (var35 - var27) / var27) > var37) { var37 = var32; } - if (var36 < 0) { // L: 971 - var32 = (var26 - 1 - var36) / var26; // L: 972 - var37 += var32; // L: 973 - var35 += var27 * var32; // L: 974 - var36 += var26 * var32; // L: 975 - var34 += var32; // L: 976 + if (var36 < 0) { + var32 = (var26 - 1 - var36) / var26; + var37 += var32; + var35 += var27 * var32; + var36 += var26 * var32; + var34 += var32; } - if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { // L: 978 + if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { var37 = var32; } while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 980 - if (var38 != 0) { // L: 981 + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; + if (var38 != 0) { Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; // L: 982 + ++var34; } - var35 += var27; // L: 983 - var36 += var26; // L: 984 - ++var37; // L: 979 + var35 += var27; + var36 += var26; + ++var37; } - ++var33; // L: 958 + ++var33; var30 -= var26; var31 += var27; } } - } else if (var26 == 0) { // L: 990 + } else if (var26 == 0) { for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; // L: 992 - var35 = (var28 * var27 >> 4) + var30; // L: 993 - var36 = var31; // L: 994 - var37 = var20; // L: 995 - if (var31 >= 0 && var31 - (this.subHeight << 12) < 0) { // L: 996 997 - if (var35 < 0) { // L: 998 - var32 = (var27 - 1 - var35) / var27; // L: 999 - var37 = var20 + var32; // L: 1000 - var35 += var27 * var32; // L: 1001 - var34 = var23 + var32; // L: 1002 + var34 = var23; + var35 = (var28 * var27 >> 4) + var30; + var36 = var31; + var37 = var20; + if (var31 >= 0 && var31 - (this.subHeight << 12) < 0) { + if (var35 < 0) { + var32 = (var27 - 1 - var35) / var27; + var37 = var20 + var32; + var35 += var27 * var32; + var34 = var23 + var32; } - if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { // L: 1004 + if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { var37 = var32; } while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 1006 - if (var38 != 0) { // L: 1007 + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; + if (var38 != 0) { Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; // L: 1008 + ++var34; } - var35 += var27; // L: 1009 - ++var37; // L: 1005 + var35 += var27; + ++var37; } } - ++var33; // L: 991 + ++var33; var31 += var27; } - } else if (var26 < 0) { // L: 1013 + } else if (var26 < 0) { for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; // L: 1015 - var35 = (var28 * var27 >> 4) + var30; // L: 1016 - var36 = (var28 * var26 >> 4) + var31; // L: 1017 - var37 = var20; // L: 1018 - if (var35 < 0) { // L: 1019 - var32 = (var27 - 1 - var35) / var27; // L: 1020 - var37 = var20 + var32; // L: 1021 - var35 += var27 * var32; // L: 1022 - var36 += var26 * var32; // L: 1023 - var34 = var23 + var32; // L: 1024 + var34 = var23; + var35 = (var28 * var27 >> 4) + var30; + var36 = (var28 * var26 >> 4) + var31; + var37 = var20; + if (var35 < 0) { + var32 = (var27 - 1 - var35) / var27; + var37 = var20 + var32; + var35 += var27 * var32; + var36 += var26 * var32; + var34 = var23 + var32; } - if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { // L: 1026 + if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { var37 = var32; } - if ((var32 = var36 - (this.subHeight << 12)) >= 0) { // L: 1027 - var32 = (var26 - var32) / var26; // L: 1028 - var37 += var32; // L: 1029 - var35 += var27 * var32; // L: 1030 - var36 += var26 * var32; // L: 1031 - var34 += var32; // L: 1032 + if ((var32 = var36 - (this.subHeight << 12)) >= 0) { + var32 = (var26 - var32) / var26; + var37 += var32; + var35 += var27 * var32; + var36 += var26 * var32; + var34 += var32; } - if ((var32 = (var36 - var26) / var26) > var37) { // L: 1034 + if ((var32 = (var36 - var26) / var26) > var37) { var37 = var32; } while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 1036 - if (var38 != 0) { // L: 1037 + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; + if (var38 != 0) { Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; // L: 1038 + ++var34; } - var35 += var27; // L: 1039 - var36 += var26; // L: 1040 - ++var37; // L: 1035 + var35 += var27; + var36 += var26; + ++var37; } - ++var33; // L: 1014 + ++var33; var30 -= var26; var31 += var27; } } else { for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; // L: 1046 - var35 = (var28 * var27 >> 4) + var30; // L: 1047 - var36 = (var28 * var26 >> 4) + var31; // L: 1048 - var37 = var20; // L: 1049 - if (var35 < 0) { // L: 1050 - var32 = (var27 - 1 - var35) / var27; // L: 1051 - var37 = var20 + var32; // L: 1052 - var35 += var27 * var32; // L: 1053 - var36 += var26 * var32; // L: 1054 - var34 = var23 + var32; // L: 1055 + var34 = var23; + var35 = (var28 * var27 >> 4) + var30; + var36 = (var28 * var26 >> 4) + var31; + var37 = var20; + if (var35 < 0) { + var32 = (var27 - 1 - var35) / var27; + var37 = var20 + var32; + var35 += var27 * var32; + var36 += var26 * var32; + var34 = var23 + var32; } - if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { // L: 1057 + if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { var37 = var32; } - if (var36 < 0) { // L: 1058 - var32 = (var26 - 1 - var36) / var26; // L: 1059 - var37 += var32; // L: 1060 - var35 += var27 * var32; // L: 1061 - var36 += var26 * var32; // L: 1062 - var34 += var32; // L: 1063 + if (var36 < 0) { + var32 = (var26 - 1 - var36) / var26; + var37 += var32; + var35 += var27 * var32; + var36 += var26 * var32; + var34 += var32; } - if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { // L: 1065 + if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { var37 = var32; } while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 1067 - if (var38 != 0) { // L: 1068 + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; + if (var38 != 0) { Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; // L: 1069 + ++var34; } - var35 += var27; // L: 1070 - var36 += var26; // L: 1071 - ++var37; // L: 1066 + var35 += var27; + var36 += var26; + ++var37; } - ++var33; // L: 1045 + ++var33; var30 -= var26; var31 += var27; } @@ -1255,405 +1255,405 @@ public final class SpritePixels extends Rasterizer2D { } } } - } // L: 1076 + } @ObfuscatedName("az") @Export("drawScaledWorldmap") public void drawScaledWorldmap(int var1, int var2, int var3, int var4) { - if (var3 <= this.width && var4 <= this.height) { // L: 1079 - int var5 = var3 * this.xOffset / this.width + var1; // L: 1082 - int var6 = (var3 * (this.xOffset + this.subWidth) + this.width - 1) / this.width + var1; // L: 1083 - int var7 = var2 + var4 * this.yOffset / this.height; // L: 1084 - int var8 = var2 + (this.height + (this.yOffset + this.subHeight) * var4 - 1) / this.height; // L: 1085 - if (var5 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 1086 + if (var3 <= this.width && var4 <= this.height) { + int var5 = var3 * this.xOffset / this.width + var1; + int var6 = (var3 * (this.xOffset + this.subWidth) + this.width - 1) / this.width + var1; + int var7 = var2 + var4 * this.yOffset / this.height; + int var8 = var2 + (this.height + (this.yOffset + this.subHeight) * var4 - 1) / this.height; + if (var5 < Rasterizer2D.Rasterizer2D_xClipStart) { var5 = Rasterizer2D.Rasterizer2D_xClipStart; } - if (var6 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 1087 + if (var6 > Rasterizer2D.Rasterizer2D_xClipEnd) { var6 = Rasterizer2D.Rasterizer2D_xClipEnd; } - if (var7 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 1088 + if (var7 < Rasterizer2D.Rasterizer2D_yClipStart) { var7 = Rasterizer2D.Rasterizer2D_yClipStart; } - if (var8 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 1089 + if (var8 > Rasterizer2D.Rasterizer2D_yClipEnd) { var8 = Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var5 < var6 && var7 < var8) { // L: 1090 - int var9 = var5 + var7 * Rasterizer2D.Rasterizer2D_width; // L: 1091 - int var10 = Rasterizer2D.Rasterizer2D_width - (var6 - var5); // L: 1092 - if (var9 < Rasterizer2D.Rasterizer2D_pixels.length) { // L: 1093 - for (int var11 = var7; var11 < var8; ++var11) { // L: 1096 - for (int var12 = var5; var12 < var6; ++var12) { // L: 1097 - int var13 = var12 - var1 << 4; // L: 1098 - int var14 = var11 - var2 << 4; // L: 1099 - int var15 = var13 * this.width / var3 - (this.xOffset << 4); // L: 1100 - int var16 = (var13 + 16) * this.width / var3 - (this.xOffset << 4); // L: 1101 - int var17 = var14 * this.height / var4 - (this.yOffset << 4); // L: 1102 - int var18 = (var14 + 16) * this.height / var4 - (this.yOffset << 4); // L: 1103 - int var19 = (var16 - var15) * (var18 - var17) >> 1; // L: 1104 - if (var19 != 0) { // L: 1105 - if (var15 < 0) { // L: 1106 + if (var5 < var6 && var7 < var8) { + int var9 = var5 + var7 * Rasterizer2D.Rasterizer2D_width; + int var10 = Rasterizer2D.Rasterizer2D_width - (var6 - var5); + if (var9 < Rasterizer2D.Rasterizer2D_pixels.length) { + for (int var11 = var7; var11 < var8; ++var11) { + for (int var12 = var5; var12 < var6; ++var12) { + int var13 = var12 - var1 << 4; + int var14 = var11 - var2 << 4; + int var15 = var13 * this.width / var3 - (this.xOffset << 4); + int var16 = (var13 + 16) * this.width / var3 - (this.xOffset << 4); + int var17 = var14 * this.height / var4 - (this.yOffset << 4); + int var18 = (var14 + 16) * this.height / var4 - (this.yOffset << 4); + int var19 = (var16 - var15) * (var18 - var17) >> 1; + if (var19 != 0) { + if (var15 < 0) { var15 = 0; } - if (var16 >= this.subWidth << 4) { // L: 1107 + if (var16 >= this.subWidth << 4) { var16 = this.subWidth << 4; } - if (var17 < 0) { // L: 1108 + if (var17 < 0) { var17 = 0; } - if (var18 >= this.subHeight << 4) { // L: 1109 + if (var18 >= this.subHeight << 4) { var18 = this.subHeight << 4; } - --var16; // L: 1110 - --var18; // L: 1111 - int var20 = 16 - (var15 & 15); // L: 1112 - int var21 = (var16 & 15) + 1; // L: 1113 - int var22 = 16 - (var17 & 15); // L: 1114 - int var23 = (var18 & 15) + 1; // L: 1115 - var15 >>= 4; // L: 1116 - var16 >>= 4; // L: 1117 - var17 >>= 4; // L: 1118 - var18 >>= 4; // L: 1119 - int var24 = 0; // L: 1120 - int var25 = 0; // L: 1121 - int var26 = 0; // L: 1122 - int var27 = 0; // L: 1123 + --var16; + --var18; + int var20 = 16 - (var15 & 15); + int var21 = (var16 & 15) + 1; + int var22 = 16 - (var17 & 15); + int var23 = (var18 & 15) + 1; + var15 >>= 4; + var16 >>= 4; + var17 >>= 4; + var18 >>= 4; + int var24 = 0; + int var25 = 0; + int var26 = 0; + int var27 = 0; int var28; - for (var28 = var17; var28 <= var18; ++var28) { // L: 1124 - int var29 = 16; // L: 1125 - if (var28 == var17) { // L: 1126 + for (var28 = var17; var28 <= var18; ++var28) { + int var29 = 16; + if (var28 == var17) { var29 = var22; } - if (var28 == var18) { // L: 1127 + if (var28 == var18) { var29 = var23; } - for (int var30 = var15; var30 <= var16; ++var30) { // L: 1128 - int var31 = this.pixels[var30 + var28 * this.subWidth]; // L: 1129 - if (var31 != 0) { // L: 1130 + for (int var30 = var15; var30 <= var16; ++var30) { + int var31 = this.pixels[var30 + var28 * this.subWidth]; + if (var31 != 0) { int var32; - if (var30 == var15) { // L: 1132 + if (var30 == var15) { var32 = var29 * var20; - } else if (var30 == var16) { // L: 1133 + } else if (var30 == var16) { var32 = var29 * var21; } else { - var32 = var29 << 4; // L: 1134 + var32 = var29 << 4; } - var27 += var32; // L: 1135 - var24 += var32 * (var31 >> 16 & 255); // L: 1136 - var25 += var32 * (var31 >> 8 & 255); // L: 1137 - var26 += (var31 & 255) * var32; // L: 1138 + var27 += var32; + var24 += var32 * (var31 >> 16 & 255); + var25 += var32 * (var31 >> 8 & 255); + var26 += (var31 & 255) * var32; } } } - if (var27 >= var19) { // L: 1142 - var28 = var26 / var27 + (var24 / var27 << 16) + (var25 / var27 << 8); // L: 1143 - if (var28 == 0) { // L: 1144 + if (var27 >= var19) { + var28 = var26 / var27 + (var24 / var27 << 16) + (var25 / var27 << 8); + if (var28 == 0) { var28 = 1; } - Rasterizer2D.Rasterizer2D_pixels[var9] = var28; // L: 1145 + Rasterizer2D.Rasterizer2D_pixels[var9] = var28; } - ++var9; // L: 1147 + ++var9; } } - var9 += var10; // L: 1149 + var9 += var10; } } } } else { - throw new IllegalArgumentException(); // L: 1080 + throw new IllegalArgumentException(); } - } // L: 1094 1151 + } @ObfuscatedName("o") @Export("Sprite_draw") static void Sprite_draw(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7) { - for (int var8 = -var5; var8 < 0; ++var8) { // L: 185 + for (int var8 = -var5; var8 < 0; ++var8) { int var9; - for (var9 = var3 + var4 - 3; var3 < var9; var0[var3++] = var1[var2++]) { // L: 186 187 191 - var0[var3++] = var1[var2++]; // L: 188 - var0[var3++] = var1[var2++]; // L: 189 - var0[var3++] = var1[var2++]; // L: 190 + for (var9 = var3 + var4 - 3; var3 < var9; var0[var3++] = var1[var2++]) { + var0[var3++] = var1[var2++]; + var0[var3++] = var1[var2++]; + var0[var3++] = var1[var2++]; } - for (var9 += 3; var3 < var9; var0[var3++] = var1[var2++]) { // L: 193 194 195 + for (var9 += 3; var3 < var9; var0[var3++] = var1[var2++]) { } - var3 += var6; // L: 197 - var2 += var7; // L: 198 + var3 += var6; + var2 += var7; } - } // L: 200 + } @ObfuscatedName("d") @Export("Sprite_drawTransBg") static void Sprite_drawTransBg(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - int var9 = -(var5 >> 2); // L: 239 - var5 = -(var5 & 3); // L: 240 + int var9 = -(var5 >> 2); + var5 = -(var5 & 3); - for (int var10 = -var6; var10 < 0; ++var10) { // L: 241 + for (int var10 = -var6; var10 < 0; ++var10) { int var11; - for (var11 = var9; var11 < 0; ++var11) { // L: 242 - var2 = var1[var3++]; // L: 243 - if (var2 != 0) { // L: 244 + for (var11 = var9; var11 < 0; ++var11) { + var2 = var1[var3++]; + if (var2 != 0) { var0[var4++] = var2; } else { - ++var4; // L: 245 + ++var4; } - var2 = var1[var3++]; // L: 246 - if (var2 != 0) { // L: 247 + var2 = var1[var3++]; + if (var2 != 0) { var0[var4++] = var2; } else { - ++var4; // L: 248 + ++var4; } - var2 = var1[var3++]; // L: 249 - if (var2 != 0) { // L: 250 + var2 = var1[var3++]; + if (var2 != 0) { var0[var4++] = var2; } else { - ++var4; // L: 251 + ++var4; } - var2 = var1[var3++]; // L: 252 - if (var2 != 0) { // L: 253 + var2 = var1[var3++]; + if (var2 != 0) { var0[var4++] = var2; } else { - ++var4; // L: 254 + ++var4; } } - for (var11 = var5; var11 < 0; ++var11) { // L: 256 - var2 = var1[var3++]; // L: 257 - if (var2 != 0) { // L: 258 + for (var11 = var5; var11 < 0; ++var11) { + var2 = var1[var3++]; + if (var2 != 0) { var0[var4++] = var2; } else { - ++var4; // L: 259 + ++var4; } } - var4 += var7; // L: 261 - var3 += var8; // L: 262 + var4 += var7; + var3 += var8; } - } // L: 264 + } @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: 313 + int var12 = var3; - for (int var13 = -var8; var13 < 0; ++var13) { // L: 314 - int var14 = var11 * (var4 >> 16); // L: 315 + for (int var13 = -var8; var13 < 0; ++var13) { + int var14 = var11 * (var4 >> 16); - for (int var15 = -var7; var15 < 0; ++var15) { // L: 316 - var2 = var1[(var3 >> 16) + var14]; // L: 317 - if (var2 != 0) { // L: 318 + for (int var15 = -var7; var15 < 0; ++var15) { + var2 = var1[(var3 >> 16) + var14]; + if (var2 != 0) { var0[var5++] = var2; } else { - ++var5; // L: 319 + ++var5; } - var3 += var9; // L: 320 + var3 += var9; } - var4 += var10; // L: 322 - var3 = var12; // L: 323 - var5 += var6; // L: 324 + var4 += var10; + var3 = var12; + var5 += var6; } - } // L: 326 + } @ObfuscatedName("a") @Export("Sprite_drawTransOverlay") static void Sprite_drawTransOverlay(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { - int var11 = 256 - var9; // L: 369 - int var12 = (var10 & 16711935) * var11 & -16711936; // L: 370 - int var13 = (var10 & 65280) * var11 & 16711680; // L: 371 - var10 = (var12 | var13) >>> 8; // L: 372 + int var11 = 256 - var9; + int var12 = (var10 & 16711935) * var11 & -16711936; + int var13 = (var10 & 65280) * var11 & 16711680; + var10 = (var12 | var13) >>> 8; - for (int var14 = -var6; var14 < 0; ++var14) { // L: 373 - for (int var15 = -var5; var15 < 0; ++var15) { // L: 374 - var2 = var1[var3++]; // L: 375 - if (var2 != 0) { // L: 376 - var12 = var9 * (var2 & 16711935) & -16711936; // L: 377 - var13 = (var2 & 65280) * var9 & 16711680; // L: 378 - var0[var4++] = var10 + ((var12 | var13) >>> 8); // L: 379 + for (int var14 = -var6; var14 < 0; ++var14) { + for (int var15 = -var5; var15 < 0; ++var15) { + var2 = var1[var3++]; + if (var2 != 0) { + var12 = var9 * (var2 & 16711935) & -16711936; + var13 = (var2 & 65280) * var9 & 16711680; + var0[var4++] = var10 + ((var12 | var13) >>> 8); } else { - ++var4; // L: 381 + ++var4; } } - var4 += var7; // L: 383 - var3 += var8; // L: 384 + var4 += var7; + var3 += var8; } - } // L: 386 + } @ObfuscatedName("k") @Export("Sprite_drawTransparent") static void Sprite_drawTransparent(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { - int var10 = 256 - var9; // L: 425 + int var10 = 256 - var9; - for (int var11 = -var6; var11 < 0; ++var11) { // L: 426 - for (int var12 = -var5; var12 < 0; ++var12) { // L: 427 - var2 = var1[var3++]; // L: 428 - if (var2 != 0) { // L: 429 - int var13 = var0[var4]; // L: 430 - var0[var4++] = ((var13 & 16711935) * var10 + var9 * (var2 & 16711935) & -16711936) + ((var2 & 65280) * var9 + var10 * (var13 & 65280) & 16711680) >> 8; // L: 431 + for (int var11 = -var6; var11 < 0; ++var11) { + for (int var12 = -var5; var12 < 0; ++var12) { + var2 = var1[var3++]; + if (var2 != 0) { + int var13 = var0[var4]; + var0[var4++] = ((var13 & 16711935) * var10 + var9 * (var2 & 16711935) & -16711936) + ((var2 & 65280) * var9 + var10 * (var13 & 65280) & 16711680) >> 8; } else { - ++var4; // L: 433 + ++var4; } } - var4 += var7; // L: 435 - var3 += var8; // L: 436 + var4 += var7; + var3 += var8; } - } // L: 438 + } @ObfuscatedName("l") @Export("Sprite_drawTransScaled") static void Sprite_drawTransScaled(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { - int var13 = 256 - var12; // L: 487 - int var14 = var3; // L: 488 + int var13 = 256 - var12; + int var14 = var3; - for (int var15 = -var8; var15 < 0; ++var15) { // L: 489 - int var16 = var11 * (var4 >> 16); // L: 490 + for (int var15 = -var8; var15 < 0; ++var15) { + int var16 = var11 * (var4 >> 16); - for (int var17 = -var7; var17 < 0; ++var17) { // L: 491 - var2 = var1[(var3 >> 16) + var16]; // L: 492 - if (var2 != 0) { // L: 493 - int var18 = var0[var5]; // L: 494 - var0[var5++] = ((var2 & 65280) * var12 + var13 * (var18 & 65280) & 16711680) + ((var18 & 16711935) * var13 + var12 * (var2 & 16711935) & -16711936) >> 8; // L: 495 + for (int var17 = -var7; var17 < 0; ++var17) { + var2 = var1[(var3 >> 16) + var16]; + if (var2 != 0) { + int var18 = var0[var5]; + var0[var5++] = ((var2 & 65280) * var12 + var13 * (var18 & 65280) & 16711680) + ((var18 & 16711935) * var13 + var12 * (var2 & 16711935) & -16711936) >> 8; } else { - ++var5; // L: 497 + ++var5; } - var3 += var9; // L: 498 + var3 += var9; } - var4 += var10; // L: 500 - var3 = var14; // L: 501 - var5 += var6; // L: 502 + var4 += var10; + var3 = var14; + var5 += var6; } - } // L: 504 + } @ObfuscatedName("x") static void method7774(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { - for (var8 = -var10; var8 < 0; ++var8) { // L: 544 - for (var6 = -var9; var6 < 0; ++var6) { // L: 545 - var0 = var4[var5++]; // L: 546 - if (var0 != 0) { // L: 547 - var1 = var3[var7]; // L: 548 - var2 = var0 + var1; // L: 549 - var0 = (var0 & 16711935) + (var1 & 16711935); // L: 550 - var1 = (var0 & 16777472) + (var2 - var0 & 65536); // L: 551 - var3[var7++] = var2 - var1 | var1 - (var1 >>> 8); // L: 552 + for (var8 = -var10; var8 < 0; ++var8) { + for (var6 = -var9; var6 < 0; ++var6) { + var0 = var4[var5++]; + if (var0 != 0) { + var1 = var3[var7]; + var2 = var0 + var1; + var0 = (var0 & 16711935) + (var1 & 16711935); + var1 = (var0 & 16777472) + (var2 - var0 & 65536); + var3[var7++] = var2 - var1 | var1 - (var1 >>> 8); } else { - ++var7; // L: 554 + ++var7; } } - var7 += var11; // L: 556 - var5 += var12; // L: 557 + var7 += var11; + var5 += var12; } - } // L: 559 + } @ObfuscatedName("z") static void method7798(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13) { - for (var8 = -var10; var8 < 0; ++var8) { // L: 562 - for (var6 = -var9; var6 < 0; ++var6) { // L: 563 - var0 = var4[var5++]; // L: 564 - if (var0 != 0) { // L: 565 - var1 = var13 * (var0 & 16711935); // L: 566 - var0 = (var1 & -16711936) + (var13 * var0 - var1 & 16711680) >>> 8; // L: 567 - var1 = var3[var7]; // L: 568 - var2 = var0 + var1; // L: 569 - var0 = (var0 & 16711935) + (var1 & 16711935); // L: 570 - var1 = (var0 & 16777472) + (var2 - var0 & 65536); // L: 571 - var3[var7++] = var2 - var1 | var1 - (var1 >>> 8); // L: 572 + for (var8 = -var10; var8 < 0; ++var8) { + for (var6 = -var9; var6 < 0; ++var6) { + var0 = var4[var5++]; + if (var0 != 0) { + var1 = var13 * (var0 & 16711935); + var0 = (var1 & -16711936) + (var13 * var0 - var1 & 16711680) >>> 8; + var1 = var3[var7]; + var2 = var0 + var1; + var0 = (var0 & 16711935) + (var1 & 16711935); + var1 = (var0 & 16777472) + (var2 - var0 & 65536); + var3[var7++] = var2 - var1 | var1 - (var1 >>> 8); } else { - ++var7; // L: 574 + ++var7; } } - var7 += var11; // L: 576 - var5 += var12; // L: 577 + var7 += var11; + var5 += var12; } - } // L: 579 + } @ObfuscatedName("y") static void method7777(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { - for (int var16 = var3; var8 < 0; ++var8) { // L: 629 630 - var7 = var15 * (var9 >> 16); // L: 631 + for (int var16 = var3; var8 < 0; ++var8) { + var7 = var15 * (var9 >> 16); - for (var6 = -var12; var6 < 0; ++var6) { // L: 632 - var0 = var4[(var3 >> 16) + var7]; // L: 633 - if (var0 != 0) { // L: 634 - var1 = var5[var10]; // L: 635 - var2 = var0 + var1; // L: 636 - var0 = (var0 & 16711935) + (var1 & 16711935); // L: 637 - var1 = (var0 & 16777472) + (var2 - var0 & 65536); // L: 638 - var5[var10++] = var2 - var1 | var1 - (var1 >>> 8); // L: 639 + for (var6 = -var12; var6 < 0; ++var6) { + var0 = var4[(var3 >> 16) + var7]; + if (var0 != 0) { + var1 = var5[var10]; + var2 = var0 + var1; + var0 = (var0 & 16711935) + (var1 & 16711935); + var1 = (var0 & 16777472) + (var2 - var0 & 65536); + var5[var10++] = var2 - var1 | var1 - (var1 >>> 8); } else { - ++var10; // L: 641 + ++var10; } - var3 += var13; // L: 642 + var3 += var13; } - var9 += var14; // L: 644 - var3 = var16; // L: 645 - var10 += var11; // L: 646 + var9 += var14; + var3 = var16; + var10 += var11; } - } // L: 648 + } @ObfuscatedName("ah") static void method7780(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16) { - for (int var17 = var3; var8 < 0; ++var8) { // L: 651 652 - var7 = var15 * (var9 >> 16); // L: 653 + for (int var17 = var3; var8 < 0; ++var8) { + var7 = var15 * (var9 >> 16); - for (var6 = -var12; var6 < 0; ++var6) { // L: 654 - var0 = var4[(var3 >> 16) + var7]; // L: 655 - if (var0 != 0) { // L: 656 - var1 = (var0 & 16711935) * var16; // L: 657 - var0 = (var1 & -16711936) + (var0 * var16 - var1 & 16711680) >>> 8; // L: 658 - var1 = var5[var10]; // L: 659 - var2 = var0 + var1; // L: 660 - var0 = (var0 & 16711935) + (var1 & 16711935); // L: 661 - var1 = (var0 & 16777472) + (var2 - var0 & 65536); // L: 662 - var5[var10++] = var2 - var1 | var1 - (var1 >>> 8); // L: 663 + for (var6 = -var12; var6 < 0; ++var6) { + var0 = var4[(var3 >> 16) + var7]; + if (var0 != 0) { + var1 = (var0 & 16711935) * var16; + var0 = (var1 & -16711936) + (var0 * var16 - var1 & 16711680) >>> 8; + var1 = var5[var10]; + var2 = var0 + var1; + var0 = (var0 & 16711935) + (var1 & 16711935); + var1 = (var0 & 16777472) + (var2 - var0 & 65536); + var5[var10++] = var2 - var1 | var1 - (var1 >>> 8); } else { - ++var10; // L: 665 + ++var10; } - var3 += var13; // L: 666 + var3 += var13; } - var9 += var14; // L: 668 - var3 = var17; // L: 669 - var10 += var11; // L: 670 + var9 += var14; + var3 = var17; + var10 += var11; } - } // L: 672 + } } diff --git a/runescape-client/src/main/java/Strings.java b/runescape-client/src/main/java/Strings.java index bb8ae13014..bc454b6b44 100644 --- a/runescape-client/src/main/java/Strings.java +++ b/runescape-client/src/main/java/Strings.java @@ -18,12 +18,12 @@ public class Strings { public static String field3749; static { - field3523 = "Please visit the support page for assistance."; // L: 60 - field3562 = "Please visit the support page for assistance."; // L: 99 - field3747 = ""; // L: 284 - field3551 = "Page has opened in a new window."; // L: 285 - field3749 = "(Please check your popup blocker.)"; // L: 286 - } // L: 324 + field3523 = "Please visit the support page for assistance."; + field3562 = "Please visit the support page for assistance."; + field3747 = ""; + field3551 = "Page has opened in a new window."; + field3749 = "(Please check your popup blocker.)"; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -31,7 +31,7 @@ public class Strings { garbageValue = "82" ) static class369[] method5508() { - return new class369[]{class369.field4220, class369.field4216, class369.field4215, class369.field4214}; // L: 16 + return new class369[]{class369.field4220, class369.field4216, class369.field4215, class369.field4214}; } @ObfuscatedName("a") @@ -41,51 +41,51 @@ public class Strings { ) static int method5510(int var0, Script var1, boolean var2) { Widget var7; - if (var0 != ScriptOpcodes.CC_CALLONRESIZE && var0 != ScriptOpcodes.IF_CALLONRESIZE) { // L: 1221 + if (var0 != ScriptOpcodes.CC_CALLONRESIZE && var0 != ScriptOpcodes.IF_CALLONRESIZE) { int var4; - if (var0 == ScriptOpcodes.CC_TRIGGEROP) { // L: 1238 - var7 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; // L: 1239 - var4 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1240 - if (var4 >= 1 && var4 <= 10) { // L: 1241 - class92 var8 = new class92(var4, var7.id, var7.childIndex, var7.itemId); // L: 1244 - Interpreter.field817.add(var8); // L: 1245 - return 1; // L: 1246 + if (var0 == ScriptOpcodes.CC_TRIGGEROP) { + var7 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; + var4 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + if (var4 >= 1 && var4 <= 10) { + class92 var8 = new class92(var4, var7.id, var7.childIndex, var7.itemId); + Interpreter.field817.add(var8); + return 1; } else { - throw new RuntimeException(); // L: 1242 + throw new RuntimeException(); } - } else if (var0 == ScriptOpcodes.IF_TRIGGEROP) { // L: 1248 - IsaacCipher.Interpreter_intStackSize -= 3; // L: 1249 - int var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 1250 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 1251 - int var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 1252 - if (var5 >= 1 && var5 <= 10) { // L: 1253 - class92 var6 = new class92(var5, var3, var4, ChatChannel.getWidget(var3).itemId); // L: 1256 - Interpreter.field817.add(var6); // L: 1257 - return 1; // L: 1258 + } else if (var0 == ScriptOpcodes.IF_TRIGGEROP) { + IsaacCipher.Interpreter_intStackSize -= 3; + int var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + int var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; + if (var5 >= 1 && var5 <= 10) { + class92 var6 = new class92(var5, var3, var4, ChatChannel.getWidget(var3).itemId); + Interpreter.field817.add(var6); + return 1; } else { - throw new RuntimeException(); // L: 1254 + throw new RuntimeException(); } } else { - return 2; // L: 1260 + return 2; } - } else if (Interpreter.field815 >= 10) { // L: 1222 - throw new RuntimeException(); // L: 1223 + } else if (Interpreter.field815 >= 10) { + throw new RuntimeException(); } else { - if (var0 >= 2000) { // L: 1226 - var7 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 1227 + if (var0 >= 2000) { + var7 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); } else { - var7 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; // L: 1229 + var7 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; } - if (var7.onResize == null) { // L: 1230 + if (var7.onResize == null) { return 0; } else { - ScriptEvent var9 = new ScriptEvent(); // L: 1231 - var9.widget = var7; // L: 1232 - var9.args = var7.onResize; // L: 1233 - var9.field1018 = Interpreter.field815 + 1; // L: 1234 - Client.scriptEvents.addFirst(var9); // L: 1235 - return 1; // L: 1236 + ScriptEvent var9 = new ScriptEvent(); + var9.widget = var7; + var9.args = var7.onResize; + var9.field1018 = Interpreter.field815 + 1; + Client.scriptEvents.addFirst(var9); + return 1; } } } @@ -96,7 +96,7 @@ public class Strings { garbageValue = "-151275200" ) static final void method5509() { - Client.field673 = Client.cycleCntr; // L: 12481 - class121.field1470 = true; // L: 12482 - } // L: 12483 + Client.field673 = Client.cycleCntr; + class121.field1470 = true; + } } diff --git a/runescape-client/src/main/java/StructComposition.java b/runescape-client/src/main/java/StructComposition.java index 83c12ebdcb..6484a1ad8d 100644 --- a/runescape-client/src/main/java/StructComposition.java +++ b/runescape-client/src/main/java/StructComposition.java @@ -20,11 +20,11 @@ public class StructComposition extends DualNode { IterableNodeHashTable params; static { - StructDefinition_cached = new EvictingDualNodeHashTable(64); // L: 13 + StructDefinition_cached = new EvictingDualNodeHashTable(64); } StructComposition() { - } // L: 16 + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -33,7 +33,7 @@ public class StructComposition extends DualNode { ) @Export("postDecode") void postDecode() { - } // L: 33 + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -43,12 +43,12 @@ public class StructComposition extends DualNode { @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 37 - if (var2 == 0) { // L: 38 - return; // L: 41 + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; } - this.decodeNext(var1, var2); // L: 39 + this.decodeNext(var1, var2); } } @@ -63,7 +63,7 @@ public class StructComposition extends DualNode { this.params = Canvas.readStringIntParameters(var1, this.params); } - } // L: 46 + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -72,7 +72,7 @@ public class StructComposition extends DualNode { ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return class12.method158(this.params, var1, var2); // L: 49 + return class12.method158(this.params, var1, var2); } @ObfuscatedName("j") @@ -82,7 +82,7 @@ public class StructComposition extends DualNode { ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return Skeleton.method3948(this.params, var1, var2); // L: 53 + return Skeleton.method3948(this.params, var1, var2); } @ObfuscatedName("p") @@ -91,10 +91,10 @@ public class StructComposition extends DualNode { garbageValue = "-64" ) public static void method3444() { - class260.midiPcmStream.clear(); // L: 42 - class260.musicPlayerStatus = 1; // L: 43 - class124.musicTrackArchive = null; // L: 44 - } // L: 45 + class260.midiPcmStream.clear(); + class260.musicPlayerStatus = 1; + class124.musicTrackArchive = null; + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -102,7 +102,7 @@ public class StructComposition extends DualNode { garbageValue = "2" ) public static boolean method3424(int var0) { - return var0 >= 0 && var0 < 112 ? KeyHandler.field132[var0] : false; // L: 236 237 + return var0 >= 0 && var0 < 112 ? KeyHandler.field132[var0] : false; } @ObfuscatedName("lv") @@ -112,42 +112,42 @@ public class StructComposition extends DualNode { ) @Export("findItemDefinitions") static void findItemDefinitions(String var0, boolean var1) { - var0 = var0.toLowerCase(); // L: 12615 - short[] var2 = new short[16]; // L: 12616 - int var3 = 0; // L: 12617 + var0 = var0.toLowerCase(); + short[] var2 = new short[16]; + int var3 = 0; - for (int var4 = 0; var4 < WorldMapLabelSize.ItemDefinition_fileCount; ++var4) { // L: 12618 - ItemComposition var9 = UserComparator6.ItemDefinition_get(var4); // L: 12619 - if ((!var1 || var9.isTradable) && var9.noteTemplate == -1 && var9.name.toLowerCase().indexOf(var0) != -1) { // L: 12620 12621 12622 - if (var3 >= 250) { // L: 12623 - GraphicsDefaults.foundItemIdCount = -1; // L: 12624 - class113.foundItemIds = null; // L: 12625 - return; // L: 12626 + for (int var4 = 0; var4 < WorldMapLabelSize.ItemDefinition_fileCount; ++var4) { + ItemComposition var9 = UserComparator6.ItemDefinition_get(var4); + if ((!var1 || var9.isTradable) && var9.noteTemplate == -1 && var9.name.toLowerCase().indexOf(var0) != -1) { + if (var3 >= 250) { + GraphicsDefaults.foundItemIdCount = -1; + class113.foundItemIds = null; + return; } - if (var3 >= var2.length) { // L: 12628 - short[] var6 = new short[var2.length * 2]; // L: 12629 + if (var3 >= var2.length) { + short[] var6 = new short[var2.length * 2]; - for (int var7 = 0; var7 < var3; ++var7) { // L: 12630 + for (int var7 = 0; var7 < var3; ++var7) { var6[var7] = var2[var7]; } - var2 = var6; // L: 12631 + var2 = var6; } - var2[var3++] = (short)var4; // L: 12633 + var2[var3++] = (short)var4; } } - class113.foundItemIds = var2; // L: 12635 - class336.foundItemIndex = 0; // L: 12636 - GraphicsDefaults.foundItemIdCount = var3; // L: 12637 - String[] var8 = new String[GraphicsDefaults.foundItemIdCount]; // L: 12638 + class113.foundItemIds = var2; + class336.foundItemIndex = 0; + GraphicsDefaults.foundItemIdCount = var3; + String[] var8 = new String[GraphicsDefaults.foundItemIdCount]; - for (int var5 = 0; var5 < GraphicsDefaults.foundItemIdCount; ++var5) { // L: 12639 + for (int var5 = 0; var5 < GraphicsDefaults.foundItemIdCount; ++var5) { var8[var5] = UserComparator6.ItemDefinition_get(var2[var5]).name; } - KeyHandler.method390(var8, class113.foundItemIds); // L: 12640 - } // L: 12641 + KeyHandler.method390(var8, class113.foundItemIds); + } } diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java index 079708aefe..0f6db29504 100644 --- a/runescape-client/src/main/java/StudioGame.java +++ b/runescape-client/src/main/java/StudioGame.java @@ -62,9 +62,9 @@ public enum StudioGame implements MouseWheel { final int id; StudioGame(String var3, String var4, int var5) { - this.name = var3; // L: 21 - this.id = var5; // L: 22 - } // L: 23 + this.name = var3; + this.id = var5; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -73,7 +73,7 @@ public enum StudioGame implements MouseWheel { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 26 + return this.id; } @ObfuscatedName("am") @@ -84,172 +84,172 @@ public enum StudioGame implements MouseWheel { static int method5500(int var0, Script var1, boolean var2) { String var3; int var9; - if (var0 == ScriptOpcodes.APPEND_NUM) { // L: 3056 - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3057 - var9 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3058 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3 + var9; // L: 3059 - return 1; // L: 3060 + if (var0 == ScriptOpcodes.APPEND_NUM) { + var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3 + var9; + return 1; } else { String var4; - if (var0 == ScriptOpcodes.APPEND) { // L: 3062 - class13.Interpreter_stringStackSize -= 2; // L: 3063 - var3 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; // L: 3064 - var4 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; // L: 3065 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3 + var4; // L: 3066 - return 1; // L: 3067 - } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { // L: 3069 - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3070 - var9 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3071 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3 + ByteArrayPool.intToString(var9, true); // L: 3072 - return 1; // L: 3073 - } else if (var0 == ScriptOpcodes.LOWERCASE) { // L: 3075 - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3076 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.toLowerCase(); // L: 3077 - return 1; // L: 3078 + if (var0 == ScriptOpcodes.APPEND) { + class13.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3 + var4; + return 1; + } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { + var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3 + ByteArrayPool.intToString(var9, true); + return 1; + } else if (var0 == ScriptOpcodes.LOWERCASE) { + var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.toLowerCase(); + return 1; } else { int var6; int var10; - if (var0 == ScriptOpcodes.FROMDATE) { // L: 3080 - var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3081 - long var13 = 86400000L * (11745L + (long)var10); // L: 3082 - Interpreter.Interpreter_calendar.setTime(new Date(var13)); // L: 3083 - var6 = Interpreter.Interpreter_calendar.get(5); // L: 3084 - int var17 = Interpreter.Interpreter_calendar.get(2); // L: 3085 - int var8 = Interpreter.Interpreter_calendar.get(1); // L: 3086 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; // L: 3087 - return 1; // L: 3088 - } else if (var0 != ScriptOpcodes.TEXT_GENDER) { // L: 3090 - if (var0 == ScriptOpcodes.TOSTRING) { // L: 3098 - var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3099 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Integer.toString(var10); // L: 3100 - return 1; // L: 3101 - } else if (var0 == ScriptOpcodes.COMPARE) { // L: 3103 - class13.Interpreter_stringStackSize -= 2; // L: 3104 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class194.method3926(class144.compareStrings(Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1], ScriptFrame.clientLanguage)); // L: 3105 - return 1; // L: 3106 + if (var0 == ScriptOpcodes.FROMDATE) { + var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + long var13 = 86400000L * (11745L + (long)var10); + Interpreter.Interpreter_calendar.setTime(new Date(var13)); + var6 = Interpreter.Interpreter_calendar.get(5); + int var17 = Interpreter.Interpreter_calendar.get(2); + int var8 = Interpreter.Interpreter_calendar.get(1); + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; + return 1; + } else if (var0 != ScriptOpcodes.TEXT_GENDER) { + if (var0 == ScriptOpcodes.TOSTRING) { + var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Integer.toString(var10); + return 1; + } else if (var0 == ScriptOpcodes.COMPARE) { + class13.Interpreter_stringStackSize -= 2; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class194.method3926(class144.compareStrings(Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1], ScriptFrame.clientLanguage)); + return 1; } else { int var5; byte[] var11; Font var12; - if (var0 == ScriptOpcodes.PARAHEIGHT) { // L: 3108 - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3109 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 3110 - var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3111 - var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3112 - var11 = class1.archive13.takeFile(var5, 0); // L: 3113 - var12 = new Font(var11); // L: 3114 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var12.lineCount(var3, var9); // L: 3115 - return 1; // L: 3116 - } else if (var0 == ScriptOpcodes.PARAWIDTH) { // L: 3118 - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3119 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 3120 - var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3121 - var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3122 - var11 = class1.archive13.takeFile(var5, 0); // L: 3123 - var12 = new Font(var11); // L: 3124 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var12.lineWidth(var3, var9); // L: 3125 - return 1; // L: 3126 - } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { // L: 3128 - class13.Interpreter_stringStackSize -= 2; // L: 3129 - var3 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; // L: 3130 - var4 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; // L: 3131 - if (Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1) { // L: 3132 + if (var0 == ScriptOpcodes.PARAHEIGHT) { + var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + IsaacCipher.Interpreter_intStackSize -= 2; + var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + var11 = class1.archive13.takeFile(var5, 0); + var12 = new Font(var11); + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var12.lineCount(var3, var9); + return 1; + } else if (var0 == ScriptOpcodes.PARAWIDTH) { + var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + IsaacCipher.Interpreter_intStackSize -= 2; + var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + var11 = class1.archive13.takeFile(var5, 0); + var12 = new Font(var11); + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var12.lineWidth(var3, var9); + return 1; + } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { + class13.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; + if (Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1) { Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3; } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4; // L: 3133 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4; } - return 1; // L: 3134 - } else if (var0 == ScriptOpcodes.ESCAPE) { // L: 3136 - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3137 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); // L: 3138 - return 1; // L: 3139 - } else if (var0 == ScriptOpcodes.APPEND_CHAR) { // L: 3141 - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3142 - var9 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3143 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3 + (char)var9; // L: 3144 - return 1; // L: 3145 - } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { // L: 3147 - var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3148 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = AbstractWorldMapData.isCharPrintable((char)var10) ? 1 : 0; // L: 3149 - return 1; // L: 3150 - } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { // L: 3152 - var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3153 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapIcon_0.isAlphaNumeric((char)var10) ? 1 : 0; // L: 3154 - return 1; // L: 3155 - } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { // L: 3157 - var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3158 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = HealthBarDefinition.isCharAlphabetic((char)var10) ? 1 : 0; // L: 3159 - return 1; // L: 3160 - } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { // L: 3162 - var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3163 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class277.isDigit((char)var10) ? 1 : 0; // L: 3164 - return 1; // L: 3165 - } else if (var0 == ScriptOpcodes.STRING_LENGTH) { // L: 3167 - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3168 - if (var3 != null) { // L: 3169 + return 1; + } else if (var0 == ScriptOpcodes.ESCAPE) { + var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); + return 1; + } else if (var0 == ScriptOpcodes.APPEND_CHAR) { + var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3 + (char)var9; + return 1; + } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { + var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = AbstractWorldMapData.isCharPrintable((char)var10) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { + var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapIcon_0.isAlphaNumeric((char)var10) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { + var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = HealthBarDefinition.isCharAlphabetic((char)var10) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { + var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class277.isDigit((char)var10) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.STRING_LENGTH) { + var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + if (var3 != null) { Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.length(); } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3170 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; } - return 1; // L: 3171 - } else if (var0 == ScriptOpcodes.SUBSTRING) { // L: 3173 - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3174 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 3175 - var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3176 - var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3177 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.substring(var9, var5); // L: 3178 - return 1; // L: 3179 - } else if (var0 == ScriptOpcodes.REMOVETAGS) { // L: 3181 - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3182 - StringBuilder var15 = new StringBuilder(var3.length()); // L: 3183 - boolean var16 = false; // L: 3184 + return 1; + } else if (var0 == ScriptOpcodes.SUBSTRING) { + var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + IsaacCipher.Interpreter_intStackSize -= 2; + var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.substring(var9, var5); + return 1; + } else if (var0 == ScriptOpcodes.REMOVETAGS) { + var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + StringBuilder var15 = new StringBuilder(var3.length()); + boolean var16 = false; - for (var6 = 0; var6 < var3.length(); ++var6) { // L: 3185 - char var7 = var3.charAt(var6); // L: 3186 - if (var7 == '<') { // L: 3187 + for (var6 = 0; var6 < var3.length(); ++var6) { + char var7 = var3.charAt(var6); + if (var7 == '<') { var16 = true; - } else if (var7 == '>') { // L: 3188 + } else if (var7 == '>') { var16 = false; - } else if (!var16) { // L: 3189 + } else if (!var16) { var15.append(var7); } } - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var15.toString(); // L: 3191 - return 1; // L: 3192 - } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { // L: 3194 - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3195 - var9 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3196 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.indexOf(var9); // L: 3197 - return 1; // L: 3198 - } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { // L: 3200 - class13.Interpreter_stringStackSize -= 2; // L: 3201 - var3 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; // L: 3202 - var4 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; // L: 3203 - var5 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3204 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.indexOf(var4, var5); // L: 3205 - return 1; // L: 3206 - } else if (var0 == 4122) { // L: 3208 - var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3209 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.toUpperCase(); // L: 3210 - return 1; // L: 3211 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var15.toString(); + return 1; + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { + var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.indexOf(var9); + return 1; + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { + class13.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.indexOf(var4, var5); + return 1; + } else if (var0 == 4122) { + var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.toUpperCase(); + return 1; } else { - return 2; // L: 3213 + return 2; } } } else { - class13.Interpreter_stringStackSize -= 2; // L: 3091 - var3 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; // L: 3092 - var4 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; // L: 3093 - if (class340.localPlayer.appearance != null && class340.localPlayer.appearance.isFemale) { // L: 3094 + class13.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; + if (class340.localPlayer.appearance != null && class340.localPlayer.appearance.isFemale) { Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4; } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3; // L: 3095 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3; } - return 1; // L: 3096 + return 1; } } } @@ -262,6 +262,6 @@ public enum StudioGame implements MouseWheel { ) @Export("isComponentHidden") static boolean isComponentHidden(Widget var0) { - return var0.isHidden; // L: 12577 + return var0.isHidden; } } diff --git a/runescape-client/src/main/java/Task.java b/runescape-client/src/main/java/Task.java index 24eaec4448..ee486eb9e6 100644 --- a/runescape-client/src/main/java/Task.java +++ b/runescape-client/src/main/java/Task.java @@ -33,6 +33,6 @@ public class Task { public volatile Object result; Task() { - this.status = 0; // L: 11 - } // L: 23 + this.status = 0; + } } diff --git a/runescape-client/src/main/java/TaskHandler.java b/runescape-client/src/main/java/TaskHandler.java index 2e15a4b1c7..56daaa4129 100644 --- a/runescape-client/src/main/java/TaskHandler.java +++ b/runescape-client/src/main/java/TaskHandler.java @@ -39,24 +39,24 @@ public class TaskHandler implements Runnable { boolean isClosed; public TaskHandler() { - this.current = null; // L: 11 - this.task = null; // L: 12 - this.isClosed = false; // L: 14 - javaVendor = "Unknown"; // L: 20 - NPC.javaVersion = "1.6"; // L: 21 + this.current = null; + this.task = null; + this.isClosed = false; + javaVendor = "Unknown"; + NPC.javaVersion = "1.6"; try { javaVendor = System.getProperty("java.vendor"); NPC.javaVersion = System.getProperty("java.version"); - } catch (Exception var2) { // L: 26 + } catch (Exception var2) { } - this.isClosed = false; // L: 27 - this.thread = new Thread(this); // L: 28 - this.thread.setPriority(10); // L: 29 - this.thread.setDaemon(true); // L: 30 - this.thread.start(); // L: 31 - } // L: 32 + this.isClosed = false; + this.thread = new Thread(this); + this.thread.setPriority(10); + this.thread.setDaemon(true); + this.thread.start(); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -65,17 +65,17 @@ public class TaskHandler implements Runnable { ) @Export("close") public final void close() { - synchronized(this) { // L: 35 - this.isClosed = true; // L: 36 - this.notifyAll(); // L: 37 - } // L: 38 - - try { - this.thread.join(); // L: 40 - } catch (InterruptedException var3) { // L: 42 + synchronized(this) { + this.isClosed = true; + this.notifyAll(); } - } // L: 43 + try { + this.thread.join(); + } catch (InterruptedException var3) { + } + + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -84,20 +84,20 @@ public class TaskHandler implements Runnable { ) @Export("newTask") final Task newTask(int var1, int var2, int var3, Object var4) { - Task var5 = new Task(); // L: 90 - var5.type = var1; // L: 91 - var5.intArgument = var2; // L: 92 - var5.objectArgument = var4; // L: 93 - synchronized(this) { // L: 94 - if (this.task != null) { // L: 95 - this.task.next = var5; // L: 96 - this.task = var5; // L: 97 + Task var5 = new Task(); + var5.type = var1; + var5.intArgument = var2; + var5.objectArgument = var4; + synchronized(this) { + if (this.task != null) { + this.task.next = var5; + this.task = var5; } else { - this.task = this.current = var5; // L: 100 + this.task = this.current = var5; } - this.notify(); // L: 102 - return var5; // L: 104 + this.notify(); + return var5; } } @@ -108,7 +108,7 @@ public class TaskHandler implements Runnable { ) @Export("newSocketTask") public final Task newSocketTask(String var1, int var2) { - return this.newTask(1, var2, 0, var1); // L: 108 + return this.newTask(1, var2, 0, var1); } @ObfuscatedName("m") @@ -118,53 +118,53 @@ public class TaskHandler implements Runnable { ) @Export("newThreadTask") public final Task newThreadTask(Runnable var1, int var2) { - return this.newTask(2, var2, 0, var1); // L: 112 + return this.newTask(2, var2, 0, var1); } public final void run() { while (true) { Task var1; - synchronized(this) { // L: 48 + synchronized(this) { while (true) { - if (this.isClosed) { // L: 50 + if (this.isClosed) { return; } - if (this.current != null) { // L: 51 - var1 = this.current; // L: 52 - this.current = this.current.next; // L: 53 - if (this.current == null) { // L: 54 + if (this.current != null) { + var1 = this.current; + this.current = this.current.next; + if (this.current == null) { this.task = null; } break; } try { - this.wait(); // L: 58 - } catch (InterruptedException var8) { // L: 60 + this.wait(); + } catch (InterruptedException var8) { } } } try { - int var5 = var1.type; // L: 64 - if (var5 == 1) { // L: 65 - var1.result = new Socket(InetAddress.getByName((String)var1.objectArgument), var1.intArgument); // L: 66 - } else if (var5 == 2) { // L: 68 - Thread var3 = new Thread((Runnable)var1.objectArgument); // L: 69 - var3.setDaemon(true); // L: 70 - var3.start(); // L: 71 - var3.setPriority(var1.intArgument); // L: 72 - var1.result = var3; // L: 73 - } else if (var5 == 4) { // L: 75 - var1.result = new DataInputStream(((URL)var1.objectArgument).openStream()); // L: 76 + int var5 = var1.type; + if (var5 == 1) { + var1.result = new Socket(InetAddress.getByName((String)var1.objectArgument), var1.intArgument); + } else if (var5 == 2) { + Thread var3 = new Thread((Runnable)var1.objectArgument); + var3.setDaemon(true); + var3.start(); + var3.setPriority(var1.intArgument); + var1.result = var3; + } else if (var5 == 4) { + var1.result = new DataInputStream(((URL)var1.objectArgument).openStream()); } - var1.status = 1; // L: 78 - } catch (ThreadDeath var6) { // L: 80 - throw var6; // L: 81 - } catch (Throwable var7) { // L: 83 - var1.status = 2; // L: 84 + var1.status = 1; + } catch (ThreadDeath var6) { + throw var6; + } catch (Throwable var7) { + var1.status = 2; } } } @@ -175,9 +175,9 @@ public class TaskHandler implements Runnable { garbageValue = "-1643511224" ) public static byte[] method3047(byte[] var0) { - int var1 = var0.length; // L: 22 - byte[] var2 = new byte[var1]; // L: 23 - System.arraycopy(var0, 0, var2, 0, var1); // L: 24 - return var2; // L: 25 + int var1 = var0.length; + byte[] var2 = new byte[var1]; + System.arraycopy(var0, 0, var2, 0, var1); + return var2; } } diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java index 7c80de8bd1..034908d999 100644 --- a/runescape-client/src/main/java/Texture.java +++ b/runescape-client/src/main/java/Texture.java @@ -40,47 +40,47 @@ public class Texture extends Node { descriptor = "(Lpi;)V" ) Texture(Buffer var1) { - this.isLoaded = false; // L: 25 - this.averageRGB = var1.readUnsignedShort(); // L: 29 - this.field2206 = 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 + this.isLoaded = false; + this.averageRGB = var1.readUnsignedShort(); + this.field2206 = var1.readUnsignedByte() == 1; + int var2 = var1.readUnsignedByte(); + if (var2 >= 1 && var2 <= 4) { + this.fileIds = new int[var2]; int var3; - for (var3 = 0; var3 < var2; ++var3) { // L: 36 + for (var3 = 0; var3 < var2; ++var3) { this.fileIds[var3] = var1.readUnsignedShort(); } - if (var2 > 1) { // L: 37 - this.field2208 = new int[var2 - 1]; // L: 38 + if (var2 > 1) { + this.field2208 = new int[var2 - 1]; - for (var3 = 0; var3 < var2 - 1; ++var3) { // L: 39 + for (var3 = 0; var3 < var2 - 1; ++var3) { this.field2208[var3] = var1.readUnsignedByte(); } } - if (var2 > 1) { // L: 41 - this.field2209 = new int[var2 - 1]; // L: 42 + if (var2 > 1) { + this.field2209 = new int[var2 - 1]; - for (var3 = 0; var3 < var2 - 1; ++var3) { // L: 43 + for (var3 = 0; var3 < var2 - 1; ++var3) { this.field2209[var3] = var1.readUnsignedByte(); } } - this.field2201 = new int[var2]; // L: 45 + this.field2201 = new int[var2]; - for (var3 = 0; var3 < var2; ++var3) { // L: 46 + for (var3 = 0; var3 < var2; ++var3) { this.field2201[var3] = var1.readInt(); } - this.animationDirection = var1.readUnsignedByte(); // L: 47 - this.animationSpeed = var1.readUnsignedByte(); // L: 48 - this.pixels = null; // L: 49 + this.animationDirection = var1.readUnsignedByte(); + this.animationSpeed = var1.readUnsignedByte(); + this.pixels = null; } else { - throw new RuntimeException(); // L: 33 + throw new RuntimeException(); } - } // L: 50 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -89,105 +89,105 @@ public class Texture extends Node { @Export("load") boolean load(double var1, int var3, AbstractArchive var4) { int var5; - for (var5 = 0; var5 < this.fileIds.length; ++var5) { // L: 53 - if (var4.getFileFlat(this.fileIds[var5]) == null) { // L: 54 + for (var5 = 0; var5 < this.fileIds.length; ++var5) { + if (var4.getFileFlat(this.fileIds[var5]) == null) { return false; } } - var5 = var3 * var3; // L: 56 - this.pixels = new int[var5]; // L: 57 + var5 = var3 * var3; + this.pixels = new int[var5]; - for (int var6 = 0; var6 < this.fileIds.length; ++var6) { // L: 58 - IndexedSprite var7 = VarbitComposition.method3396(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.field2201[var6]; // L: 63 - if ((var10 & -16777216) == 16777216) { // L: 64 + for (int var6 = 0; var6 < this.fileIds.length; ++var6) { + IndexedSprite var7 = VarbitComposition.method3396(var4, this.fileIds[var6]); + var7.normalize(); + byte[] var8 = var7.pixels; + int[] var9 = var7.palette; + int var10 = this.field2201[var6]; + if ((var10 & -16777216) == 16777216) { } - if ((var10 & -16777216) == 33554432) { // L: 65 + if ((var10 & -16777216) == 33554432) { } int var11; int var12; int var13; int var14; - if ((var10 & -16777216) == 50331648) { // L: 66 - var11 = var10 & 16711935; // L: 67 - var12 = var10 >> 8 & 255; // L: 68 + if ((var10 & -16777216) == 50331648) { + var11 = var10 & 16711935; + var12 = var10 >> 8 & 255; - 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 < var9.length; ++var13) { + var14 = var9[var13]; + if (var14 >> 8 == (var14 & 65535)) { + var14 &= 255; + var9[var13] = var11 * var14 >> 8 & 16711935 | var12 * var14 & 65280; } } } - for (var11 = 0; var11 < var9.length; ++var11) { // L: 77 + for (var11 = 0; var11 < var9.length; ++var11) { var9[var11] = Rasterizer3D.Rasterizer3D_brighten(var9[var11], var1); } - if (var6 == 0) { // L: 79 + if (var6 == 0) { var11 = 0; } else { - var11 = this.field2208[var6 - 1]; // L: 80 + var11 = this.field2208[var6 - 1]; } - if (var11 == 0) { // L: 81 - if (var3 == var7.subWidth) { // L: 82 - for (var12 = 0; var12 < var5; ++var12) { // L: 83 + if (var11 == 0) { + if (var3 == var7.subWidth) { + for (var12 = 0; var12 < var5; ++var12) { this.pixels[var12] = var9[var8[var12] & 255]; } - } else if (var7.subWidth == 64 && var3 == 128) { // L: 85 - var12 = 0; // L: 86 + } else if (var7.subWidth == 64 && var3 == 128) { + var12 = 0; - for (var13 = 0; var13 < var3; ++var13) { // L: 87 - for (var14 = 0; var14 < var3; ++var14) { // L: 88 + for (var13 = 0; var13 < var3; ++var13) { + for (var14 = 0; var14 < var3; ++var14) { this.pixels[var12++] = var9[var8[(var13 >> 1 << 6) + (var14 >> 1)] & 255]; } } } else { - if (var7.subWidth != 128 || var3 != 64) { // L: 91 - throw new RuntimeException(); // L: 98 + if (var7.subWidth != 128 || var3 != 64) { + throw new RuntimeException(); } - var12 = 0; // L: 92 + var12 = 0; - for (var13 = 0; var13 < var3; ++var13) { // L: 93 - for (var14 = 0; var14 < var3; ++var14) { // L: 94 + for (var13 = 0; var13 < var3; ++var13) { + for (var14 = 0; var14 < var3; ++var14) { this.pixels[var12++] = var9[var8[(var14 << 1) + (var13 << 1 << 7)] & 255]; } } } } - if (var11 == 1) { // L: 101 + if (var11 == 1) { } - if (var11 == 2) { // L: 102 + if (var11 == 2) { } - if (var11 == 3) { // L: 103 + if (var11 == 3) { } } - return true; // L: 105 + return true; } @ObfuscatedName("b") @Export("reset") void reset() { - this.pixels = null; // L: 109 - } // L: 110 + this.pixels = null; + } @ObfuscatedName("p") @Export("animate") void animate(int var1) { - if (this.pixels != null) { // L: 113 + if (this.pixels != null) { short var2; int var3; int var4; @@ -195,65 +195,65 @@ public class Texture extends Node { int var6; int var7; int[] var10; - if (this.animationDirection == 1 || this.animationDirection == 3) { // L: 114 - if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { // L: 115 + if (this.animationDirection == 1 || this.animationDirection == 3) { + if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { Texture_animatedPixels = new int[this.pixels.length]; } - if (this.pixels.length == 4096) { // L: 117 + if (this.pixels.length == 4096) { var2 = 64; } else { - var2 = 128; // L: 118 + var2 = 128; } - var3 = this.pixels.length; // L: 119 - var4 = var2 * this.animationSpeed * var1; // L: 120 - var5 = var3 - 1; // L: 121 - if (this.animationDirection == 1) { // L: 122 + var3 = this.pixels.length; + var4 = var2 * this.animationSpeed * var1; + var5 = var3 - 1; + if (this.animationDirection == 1) { var4 = -var4; } - for (var6 = 0; var6 < var3; ++var6) { // L: 123 - var7 = var6 + var4 & var5; // L: 124 - Texture_animatedPixels[var6] = this.pixels[var7]; // L: 125 + for (var6 = 0; var6 < var3; ++var6) { + var7 = var6 + var4 & var5; + Texture_animatedPixels[var6] = this.pixels[var7]; } - var10 = this.pixels; // L: 127 - this.pixels = Texture_animatedPixels; // L: 128 - Texture_animatedPixels = var10; // L: 129 + var10 = this.pixels; + this.pixels = Texture_animatedPixels; + Texture_animatedPixels = var10; } - if (this.animationDirection == 2 || this.animationDirection == 4) { // L: 131 - if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { // L: 132 + if (this.animationDirection == 2 || this.animationDirection == 4) { + if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { Texture_animatedPixels = new int[this.pixels.length]; } - if (this.pixels.length == 4096) { // L: 134 + if (this.pixels.length == 4096) { var2 = 64; } else { - var2 = 128; // L: 135 + var2 = 128; } - var3 = this.pixels.length; // L: 136 - var4 = this.animationSpeed * var1; // L: 137 - var5 = var2 - 1; // L: 138 - if (this.animationDirection == 2) { // L: 139 + var3 = this.pixels.length; + var4 = this.animationSpeed * var1; + var5 = var2 - 1; + if (this.animationDirection == 2) { var4 = -var4; } - 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 + for (var6 = 0; var6 < var3; var6 += var2) { + for (var7 = 0; var7 < var2; ++var7) { + int var8 = var6 + var7; + int var9 = var6 + (var7 + var4 & var5); + Texture_animatedPixels[var8] = this.pixels[var9]; } } - var10 = this.pixels; // L: 147 - this.pixels = Texture_animatedPixels; // L: 148 - Texture_animatedPixels = var10; // L: 149 + var10 = this.pixels; + this.pixels = Texture_animatedPixels; + Texture_animatedPixels = var10; } } - } // L: 151 + } } diff --git a/runescape-client/src/main/java/TextureProvider.java b/runescape-client/src/main/java/TextureProvider.java index f5838ab787..906e732de3 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -51,25 +51,25 @@ public class TextureProvider implements TextureLoader { descriptor = "(Lku;Lku;IDI)V" ) public TextureProvider(AbstractArchive var1, AbstractArchive var2, int var3, double var4, int var6) { - this.deque = new NodeDeque(); // L: 9 - this.remaining = 0; // L: 11 - this.brightness = 1.0D; // L: 12 - this.textureSize = 128; // L: 13 - this.archive = var2; // L: 17 - this.capacity = var3; // L: 18 - this.remaining = this.capacity; // L: 19 - this.brightness = var4; // L: 20 - this.textureSize = var6; // L: 21 - int[] var7 = var1.getGroupFileIds(0); // L: 22 - int var8 = var7.length; // L: 23 - this.textures = new Texture[var1.getGroupFileCount(0)]; // L: 24 + this.deque = new NodeDeque(); + this.remaining = 0; + this.brightness = 1.0D; + this.textureSize = 128; + this.archive = var2; + this.capacity = var3; + this.remaining = this.capacity; + this.brightness = var4; + this.textureSize = var6; + int[] var7 = var1.getGroupFileIds(0); + int var8 = var7.length; + this.textures = new Texture[var1.getGroupFileCount(0)]; - for (int var9 = 0; var9 < var8; ++var9) { // L: 25 - Buffer var10 = new Buffer(var1.takeFile(0, var7[var9])); // L: 26 - this.textures[var7[var9]] = new Texture(var10); // L: 27 + for (int var9 = 0; var9 < var8; ++var9) { + Buffer var10 = new Buffer(var1.takeFile(0, var7[var9])); + this.textures[var7[var9]] = new Texture(var10); } - } // L: 29 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -78,38 +78,38 @@ public class TextureProvider implements TextureLoader { ) @Export("getLoadedPercentage") public int getLoadedPercentage() { - int var1 = 0; // L: 32 - int var2 = 0; // L: 33 - Texture[] var3 = this.textures; // L: 35 + int var1 = 0; + int var2 = 0; + Texture[] var3 = this.textures; - for (int var4 = 0; var4 < var3.length; ++var4) { // L: 36 - Texture var5 = var3[var4]; // L: 37 - if (var5 != null && var5.fileIds != null) { // L: 39 - var1 += var5.fileIds.length; // L: 40 - int[] var6 = var5.fileIds; // L: 42 + for (int var4 = 0; var4 < var3.length; ++var4) { + Texture var5 = var3[var4]; + if (var5 != null && var5.fileIds != null) { + var1 += var5.fileIds.length; + int[] var6 = var5.fileIds; - for (int var7 = 0; var7 < var6.length; ++var7) { // L: 43 - int var8 = var6[var7]; // L: 44 - if (this.archive.method5595(var8)) { // L: 46 - ++var2; // L: 47 + for (int var7 = 0; var7 < var6.length; ++var7) { + int var8 = var6[var7]; + if (this.archive.method5595(var8)) { + ++var2; } } } } - if (var1 == 0) { // L: 55 + if (var1 == 0) { return 0; } else { - return var2 * 100 / var1; // L: 56 + return var2 * 100 / var1; } } @ObfuscatedName("b") @Export("setBrightness") public void setBrightness(double var1) { - this.brightness = var1; // L: 60 - this.clear(); // L: 61 - } // L: 62 + this.brightness = var1; + this.clear(); + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -118,30 +118,30 @@ public class TextureProvider implements TextureLoader { ) @Export("getTexturePixels") public int[] getTexturePixels(int var1) { - Texture var2 = this.textures[var1]; // L: 65 - if (var2 != null) { // L: 66 - if (var2.pixels != null) { // L: 67 - this.deque.addLast(var2); // L: 68 - var2.isLoaded = true; // L: 69 - return var2.pixels; // L: 70 + Texture var2 = this.textures[var1]; + if (var2 != null) { + if (var2.pixels != null) { + this.deque.addLast(var2); + var2.isLoaded = true; + return var2.pixels; } - boolean var3 = var2.load(this.brightness, this.textureSize, this.archive); // L: 72 - if (var3) { // L: 73 - if (this.remaining == 0) { // L: 74 - Texture var4 = (Texture)this.deque.removeFirst(); // L: 75 - var4.reset(); // L: 76 + boolean var3 = var2.load(this.brightness, this.textureSize, this.archive); + if (var3) { + if (this.remaining == 0) { + Texture var4 = (Texture)this.deque.removeFirst(); + var4.reset(); } else { - --this.remaining; // L: 78 + --this.remaining; } - this.deque.addLast(var2); // L: 79 - var2.isLoaded = true; // L: 80 - return var2.pixels; // L: 81 + this.deque.addLast(var2); + var2.isLoaded = true; + return var2.pixels; } } - return null; // L: 84 + return null; } @ObfuscatedName("m") @@ -151,7 +151,7 @@ public class TextureProvider implements TextureLoader { ) @Export("getAverageTextureRGB") public int getAverageTextureRGB(int var1) { - return this.textures[var1] != null ? this.textures[var1].averageRGB : 0; // L: 88 89 + return this.textures[var1] != null ? this.textures[var1].averageRGB : 0; } @ObfuscatedName("t") @@ -160,7 +160,7 @@ public class TextureProvider implements TextureLoader { garbageValue = "-1579340371" ) public boolean vmethod4324(int var1) { - return this.textures[var1].field2206; // L: 93 + return this.textures[var1].field2206; } @ObfuscatedName("s") @@ -170,7 +170,7 @@ public class TextureProvider implements TextureLoader { ) @Export("isLowDetail") public boolean isLowDetail(int var1) { - return this.textureSize == 64; // L: 97 + return this.textureSize == 64; } @ObfuscatedName("j") @@ -180,15 +180,15 @@ public class TextureProvider implements TextureLoader { ) @Export("clear") public void clear() { - for (int var1 = 0; var1 < this.textures.length; ++var1) { // L: 101 - if (this.textures[var1] != null) { // L: 102 + for (int var1 = 0; var1 < this.textures.length; ++var1) { + if (this.textures[var1] != null) { this.textures[var1].reset(); } } - this.deque = new NodeDeque(); // L: 104 - this.remaining = this.capacity; // L: 105 - } // L: 106 + this.deque = new NodeDeque(); + this.remaining = this.capacity; + } @ObfuscatedName("w") @ObfuscatedSignature( @@ -197,15 +197,15 @@ public class TextureProvider implements TextureLoader { ) @Export("animate") public void animate(int var1) { - for (int var2 = 0; var2 < this.textures.length; ++var2) { // L: 109 - Texture var3 = this.textures[var2]; // L: 110 - if (var3 != null && var3.animationDirection != 0 && var3.isLoaded) { // L: 111 - var3.animate(var1); // L: 112 - var3.isLoaded = false; // L: 113 + for (int var2 = 0; var2 < this.textures.length; ++var2) { + Texture var3 = this.textures[var2]; + if (var3 != null && var3.animationDirection != 0 && var3.isLoaded) { + var3.animate(var1); + var3.isLoaded = false; } } - } // L: 116 + } @ObfuscatedName("lk") @ObfuscatedSignature( @@ -213,11 +213,11 @@ public class TextureProvider implements TextureLoader { garbageValue = "-28" ) static void method4185(int var0) { - for (IntegerNode var1 = (IntegerNode)Client.widgetFlags.first(); var1 != null; var1 = (IntegerNode)Client.widgetFlags.next()) { // L: 12553 - if ((var1.key >> 48 & 65535L) == (long)var0) { // L: 12554 - var1.remove(); // L: 12555 + for (IntegerNode var1 = (IntegerNode)Client.widgetFlags.first(); var1 != null; var1 = (IntegerNode)Client.widgetFlags.next()) { + if ((var1.key >> 48 & 65535L) == (long)var0) { + var1.remove(); } } - } // L: 12558 + } } diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java index 30f7b7575d..650eb215c5 100644 --- a/runescape-client/src/main/java/Tile.java +++ b/runescape-client/src/main/java/Tile.java @@ -132,13 +132,13 @@ public final class Tile extends Node { Tile linkedBelowTile; Tile(int var1, int var2, int var3) { - this.gameObjects = new GameObject[5]; // L: 17 - this.gameObjectEdgeMasks = new int[5]; // L: 18 - this.gameObjectsEdgeMask = 0; // L: 19 - this.originalPlane = this.plane = var1; // L: 31 - this.x = var2; // L: 32 - this.y = var3; // L: 33 - } // L: 34 + this.gameObjects = new GameObject[5]; + this.gameObjectEdgeMasks = new int[5]; + this.gameObjectsEdgeMask = 0; + this.originalPlane = this.plane = var1; + this.x = var2; + this.y = var3; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -146,32 +146,32 @@ public final class Tile extends Node { garbageValue = "-68" ) public static void method3843(int var0, int var1) { - VarbitComposition var3 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); // L: 48 + VarbitComposition var3 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); VarbitComposition var2; - if (var3 != null) { // L: 49 - var2 = var3; // L: 50 + if (var3 != null) { + var2 = var3; } else { - byte[] var4 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); // L: 53 - var3 = new VarbitComposition(); // L: 54 - if (var4 != null) { // L: 55 + byte[] var4 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); + var3 = new VarbitComposition(); + if (var4 != null) { var3.decode(new Buffer(var4)); } - VarbitComposition.VarbitDefinition_cached.put(var3, (long)var0); // L: 56 - var2 = var3; // L: 57 + VarbitComposition.VarbitDefinition_cached.put(var3, (long)var0); + var2 = var3; } - int var8 = var2.baseVar; // L: 60 - int var5 = var2.startBit; // L: 61 - int var6 = var2.endBit; // L: 62 - int var7 = Varps.Varps_masks[var6 - var5]; // L: 63 - if (var1 < 0 || var1 > var7) { // L: 64 + int var8 = var2.baseVar; + int var5 = var2.startBit; + int var6 = var2.endBit; + int var7 = Varps.Varps_masks[var6 - var5]; + if (var1 < 0 || var1 > var7) { var1 = 0; } - var7 <<= var5; // L: 65 - Varps.Varps_main[var8] = Varps.Varps_main[var8] & ~var7 | var1 << var5 & var7; // L: 66 - } // L: 67 + var7 <<= var5; + Varps.Varps_main[var8] = Varps.Varps_main[var8] & ~var7 | var1 << var5 & var7; + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -179,22 +179,22 @@ public final class Tile extends Node { garbageValue = "-1" ) static void method3844(Float var0, Float var1) { - var1 = 1.0F - var1; // L: 336 - if (var0 < 0.0F) { // L: 337 + var1 = 1.0F - var1; + if (var0 < 0.0F) { var0 = 0.0F; } - if (var1 < 0.0F) { // L: 338 + if (var1 < 0.0F) { var1 = 0.0F; } - if (var0 > 1.0F || var1 > 1.0F) { // L: 339 - float var2 = (float)((double)(var0 * (var0 - 2.0F + var1)) + (double)var1 * ((double)var1 - 2.0D) + 1.0D); // L: 340 - if (class112.field1361 + var2 > 0.0F) { // L: 341 - HorizontalAlignment.method3294(var0, var1); // L: 342 + if (var0 > 1.0F || var1 > 1.0F) { + float var2 = (float)((double)(var0 * (var0 - 2.0F + var1)) + (double)var1 * ((double)var1 - 2.0D) + 1.0D); + if (class112.field1361 + var2 > 0.0F) { + HorizontalAlignment.method3294(var0, var1); } } - var1 = 1.0F - var1; // L: 345 - } // L: 346 + var1 = 1.0F - var1; + } } diff --git a/runescape-client/src/main/java/TileItem.java b/runescape-client/src/main/java/TileItem.java index fdf6dfd6d9..fc3187511f 100644 --- a/runescape-client/src/main/java/TileItem.java +++ b/runescape-client/src/main/java/TileItem.java @@ -30,7 +30,7 @@ public final class TileItem extends Renderable { int quantity; TileItem() { - } // L: 11 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -39,7 +39,7 @@ public final class TileItem extends Renderable { ) @Export("getModel") protected final Model getModel() { - return UserComparator6.ItemDefinition_get(this.id).getModel(this.quantity); // L: 14 + return UserComparator6.ItemDefinition_get(this.id).getModel(this.quantity); } @ObfuscatedName("c") @@ -48,7 +48,7 @@ public final class TileItem extends Renderable { garbageValue = "37" ) public static void method2368(AbstractArchive var0, AbstractArchive var1) { - SpotAnimationDefinition.SpotAnimationDefinition_archive = var0; // L: 32 - SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var1; // L: 33 - } // L: 34 + SpotAnimationDefinition.SpotAnimationDefinition_archive = var0; + SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var1; + } } diff --git a/runescape-client/src/main/java/Tiles.java b/runescape-client/src/main/java/Tiles.java index 789db42b44..6cb6abe01a 100644 --- a/runescape-client/src/main/java/Tiles.java +++ b/runescape-client/src/main/java/Tiles.java @@ -63,17 +63,17 @@ public final class Tiles { static int[] regionMapArchiveIds; static { - Tiles_heights = new int[4][105][105]; // L: 16 - Tiles_renderFlags = new byte[4][104][104]; // L: 17 - Tiles_minPlane = 99; // L: 18 - field969 = new int[]{1, 2, 4, 8}; // L: 34 - field970 = new int[]{16, 32, 64, 128}; // L: 35 - field976 = new int[]{1, 0, -1, 0}; // L: 36 - field966 = new int[]{0, -1, 0, 1}; // L: 37 - field973 = new int[]{1, -1, -1, 1}; // L: 38 - field974 = 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 + Tiles_heights = new int[4][105][105]; + Tiles_renderFlags = new byte[4][104][104]; + Tiles_minPlane = 99; + field969 = new int[]{1, 2, 4, 8}; + field970 = new int[]{16, 32, 64, 128}; + field976 = new int[]{1, 0, -1, 0}; + field966 = new int[]{0, -1, 0, 1}; + field973 = new int[]{1, -1, -1, 1}; + field974 = new int[]{-1, -1, 1, 1}; + rndHue = (int)(Math.random() * 17.0D) - 8; + rndLightness = (int)(Math.random() * 33.0D) - 16; } @ObfuscatedName("jd") @@ -82,23 +82,23 @@ public final class Tiles { garbageValue = "1455768075" ) static final String method2108(int var0, int var1) { - int var2 = var1 - var0; // L: 10359 - if (var2 < -9) { // L: 10360 + int var2 = var1 - var0; + if (var2 < -9) { return UserComparator5.colorStartTag(16711680); - } else if (var2 < -6) { // L: 10361 + } else if (var2 < -6) { return UserComparator5.colorStartTag(16723968); - } else if (var2 < -3) { // L: 10362 + } else if (var2 < -3) { return UserComparator5.colorStartTag(16740352); - } else if (var2 < 0) { // L: 10363 + } else if (var2 < 0) { return UserComparator5.colorStartTag(16756736); - } else if (var2 > 9) { // L: 10364 + } else if (var2 > 9) { return UserComparator5.colorStartTag(65280); - } else if (var2 > 6) { // L: 10365 + } else if (var2 > 6) { return UserComparator5.colorStartTag(4259584); - } else if (var2 > 3) { // L: 10366 + } else if (var2 > 3) { return UserComparator5.colorStartTag(8453888); } else { - return var2 > 0 ? UserComparator5.colorStartTag(12648192) : UserComparator5.colorStartTag(16776960); // L: 10367 10368 + return var2 > 0 ? UserComparator5.colorStartTag(12648192) : UserComparator5.colorStartTag(16776960); } } @@ -109,6 +109,6 @@ public final class Tiles { ) @Export("getTapToDrop") static boolean getTapToDrop() { - return Client.tapToDrop; // L: 11372 + return Client.tapToDrop; } } diff --git a/runescape-client/src/main/java/Timer.java b/runescape-client/src/main/java/Timer.java index 7cbec7b2ff..2b44b1c729 100644 --- a/runescape-client/src/main/java/Timer.java +++ b/runescape-client/src/main/java/Timer.java @@ -56,16 +56,16 @@ public class Timer { int field4042; public Timer() { - this.field4041 = -1L; // L: 7 - this.field4048 = -1L; // L: 8 - this.field4043 = false; // L: 9 - this.field4044 = 0L; // L: 10 - this.field4045 = 0L; // L: 11 - this.field4050 = 0L; // L: 12 - this.field4046 = 0; // L: 13 - this.field4047 = 0; // L: 14 - this.field4049 = 0; // L: 15 - this.field4042 = 0; // L: 16 + this.field4041 = -1L; + this.field4048 = -1L; + this.field4043 = false; + this.field4044 = 0L; + this.field4045 = 0L; + this.field4050 = 0L; + this.field4046 = 0; + this.field4047 = 0; + this.field4049 = 0; + this.field4042 = 0; } @ObfuscatedName("c") @@ -74,8 +74,8 @@ public class Timer { garbageValue = "59649257" ) public void method6253() { - this.field4041 = Ignored.method6459(); // L: 19 - } // L: 20 + this.field4041 = Ignored.method6459(); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -83,12 +83,12 @@ public class Timer { garbageValue = "511000597" ) public void method6231() { - if (-1L != this.field4041) { // L: 23 - this.field4045 = Ignored.method6459() - this.field4041; // L: 24 - this.field4041 = -1L; // L: 25 + if (-1L != this.field4041) { + this.field4045 = Ignored.method6459() - this.field4041; + this.field4041 = -1L; } - } // L: 27 + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -96,9 +96,9 @@ public class Timer { garbageValue = "1146982108" ) public void method6232(int var1) { - this.field4048 = Ignored.method6459(); // L: 30 - this.field4046 = var1; // L: 31 - } // L: 32 + this.field4048 = Ignored.method6459(); + this.field4046 = var1; + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -106,14 +106,14 @@ public class Timer { garbageValue = "-14983826" ) public void method6234() { - if (this.field4048 != -1L) { // L: 35 - this.field4044 = Ignored.method6459() - this.field4048; // L: 36 - this.field4048 = -1L; // L: 37 + if (this.field4048 != -1L) { + this.field4044 = Ignored.method6459() - this.field4048; + this.field4048 = -1L; } - ++this.field4049; // L: 39 - this.field4043 = true; // L: 40 - } // L: 41 + ++this.field4049; + this.field4043 = true; + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -121,9 +121,9 @@ public class Timer { garbageValue = "1689549111" ) public void method6238() { - this.field4043 = false; // L: 44 - this.field4047 = 0; // L: 45 - } // L: 46 + this.field4043 = false; + this.field4047 = 0; + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -131,8 +131,8 @@ public class Timer { garbageValue = "145143672" ) public void method6244() { - this.method6234(); // L: 49 - } // L: 50 + this.method6234(); + } @ObfuscatedName("j") @ObfuscatedSignature( @@ -141,38 +141,38 @@ public class Timer { ) @Export("write") public void write(Buffer var1) { - long var2 = this.field4045; // L: 53 - var2 /= 10L; // L: 55 - if (var2 < 0L) { // L: 56 + long var2 = this.field4045; + var2 /= 10L; + if (var2 < 0L) { var2 = 0L; - } else if (var2 > 65535L) { // L: 57 + } else if (var2 > 65535L) { var2 = 65535L; } - var1.writeShort((int)var2); // L: 58 - long var4 = this.field4044; // L: 60 - var4 /= 10L; // L: 62 - if (var4 < 0L) { // L: 63 + var1.writeShort((int)var2); + long var4 = this.field4044; + var4 /= 10L; + if (var4 < 0L) { var4 = 0L; - } else if (var4 > 65535L) { // L: 64 + } else if (var4 > 65535L) { var4 = 65535L; } - var1.writeShort((int)var4); // L: 65 - long var6 = this.field4050; // L: 67 - var6 /= 10L; // L: 69 - if (var6 < 0L) { // L: 70 + var1.writeShort((int)var4); + long var6 = this.field4050; + var6 /= 10L; + if (var6 < 0L) { var6 = 0L; - } else if (var6 > 65535L) { // L: 71 + } else if (var6 > 65535L) { var6 = 65535L; } - var1.writeShort((int)var6); // L: 72 - var1.writeShort(this.field4046); // L: 74 - var1.writeShort(this.field4047); // L: 75 - var1.writeShort(this.field4049); // L: 76 - var1.writeShort(this.field4042); // L: 77 - } // L: 78 + var1.writeShort((int)var6); + var1.writeShort(this.field4046); + var1.writeShort(this.field4047); + var1.writeShort(this.field4049); + var1.writeShort(this.field4042); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -180,6 +180,6 @@ public class Timer { garbageValue = "1360000717" ) public static class253[] method6230() { - return new class253[]{class253.field2918, class253.field2911, class253.field2912, class253.field2913, class253.field2914, class253.field2915, class253.field2916, class253.field2917, class253.field2920, class253.field2919}; // L: 17 + return new class253[]{class253.field2918, class253.field2911, class253.field2912, class253.field2913, class253.field2914, class253.field2915, class253.field2916, class253.field2917, class253.field2920, class253.field2919}; } } diff --git a/runescape-client/src/main/java/TriBool.java b/runescape-client/src/main/java/TriBool.java index 09f327adf9..8117d25288 100644 --- a/runescape-client/src/main/java/TriBool.java +++ b/runescape-client/src/main/java/TriBool.java @@ -27,13 +27,13 @@ public class TriBool { public static final TriBool TriBool_false; static { - TriBool_unknown = new TriBool(); // L: 4 - TriBool_true = new TriBool(); // L: 5 - TriBool_false = new TriBool(); // L: 6 + TriBool_unknown = new TriBool(); + TriBool_true = new TriBool(); + TriBool_false = new TriBool(); } TriBool() { - } // L: 8 + } @ObfuscatedName("az") @ObfuscatedSignature( @@ -42,122 +42,122 @@ public class TriBool { ) static int method6472(int var0, Script var1, boolean var2) { int var3; - if (var0 == ScriptOpcodes.OC_NAME) { // L: 3217 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3218 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = UserComparator6.ItemDefinition_get(var3).name; // L: 3219 - return 1; // L: 3220 + if (var0 == ScriptOpcodes.OC_NAME) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = UserComparator6.ItemDefinition_get(var3).name; + return 1; } else { int var4; ItemComposition var5; - if (var0 == ScriptOpcodes.OC_OP) { // L: 3222 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 3223 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3224 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3225 - var5 = UserComparator6.ItemDefinition_get(var3); // L: 3226 + if (var0 == ScriptOpcodes.OC_OP) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + var5 = UserComparator6.ItemDefinition_get(var3); if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; // L: 3227 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3228 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; } - return 1; // L: 3229 - } else if (var0 == ScriptOpcodes.OC_IOP) { // L: 3231 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 3232 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3233 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3234 - var5 = UserComparator6.ItemDefinition_get(var3); // L: 3235 - if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { // L: 3236 + return 1; + } else if (var0 == ScriptOpcodes.OC_IOP) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + var5 = UserComparator6.ItemDefinition_get(var3); + if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3237 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; } - return 1; // L: 3238 - } else if (var0 == ScriptOpcodes.OC_COST) { // L: 3240 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3241 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = UserComparator6.ItemDefinition_get(var3).price; // L: 3242 - return 1; // L: 3243 - } else if (var0 == ScriptOpcodes.OC_STACKABLE) { // L: 3245 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3246 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = UserComparator6.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; // L: 3247 - return 1; // L: 3248 + return 1; + } else if (var0 == ScriptOpcodes.OC_COST) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = UserComparator6.ItemDefinition_get(var3).price; + return 1; + } else if (var0 == ScriptOpcodes.OC_STACKABLE) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = UserComparator6.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; + return 1; } else { ItemComposition var7; - if (var0 == ScriptOpcodes.OC_CERT) { // L: 3250 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3251 - var7 = UserComparator6.ItemDefinition_get(var3); // L: 3252 - if (var7.noteTemplate == -1 && var7.note >= 0) { // L: 3253 + if (var0 == ScriptOpcodes.OC_CERT) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + var7 = UserComparator6.ItemDefinition_get(var3); + if (var7.noteTemplate == -1 && var7.note >= 0) { Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.note; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3; // L: 3254 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3; } - return 1; // L: 3255 - } else if (var0 == ScriptOpcodes.OC_UNCERT) { // L: 3257 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3258 - var7 = UserComparator6.ItemDefinition_get(var3); // L: 3259 - if (var7.noteTemplate >= 0 && var7.note >= 0) { // L: 3260 + return 1; + } else if (var0 == ScriptOpcodes.OC_UNCERT) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + var7 = UserComparator6.ItemDefinition_get(var3); + if (var7.noteTemplate >= 0 && var7.note >= 0) { Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.note; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3; // L: 3261 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3; } - return 1; // L: 3262 - } else if (var0 == ScriptOpcodes.OC_MEMBERS) { // L: 3264 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3265 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = UserComparator6.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; // L: 3266 - return 1; // L: 3267 - } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { // L: 3269 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3270 - var7 = UserComparator6.ItemDefinition_get(var3); // L: 3271 - if (var7.placeholderTemplate == -1 && var7.placeholder >= 0) { // L: 3272 + return 1; + } else if (var0 == ScriptOpcodes.OC_MEMBERS) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = UserComparator6.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + var7 = UserComparator6.ItemDefinition_get(var3); + if (var7.placeholderTemplate == -1 && var7.placeholder >= 0) { Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.placeholder; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3; // L: 3273 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3; } - return 1; // L: 3274 - } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { // L: 3276 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3277 - var7 = UserComparator6.ItemDefinition_get(var3); // L: 3278 - if (var7.placeholderTemplate >= 0 && var7.placeholder >= 0) { // L: 3279 + return 1; + } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + var7 = UserComparator6.ItemDefinition_get(var3); + if (var7.placeholderTemplate >= 0 && var7.placeholder >= 0) { Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.placeholder; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3; // L: 3280 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3; } - return 1; // L: 3281 - } else if (var0 == ScriptOpcodes.OC_FIND) { // L: 3283 - String var6 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3284 - var4 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3285 - StructComposition.findItemDefinitions(var6, var4 == 1); // L: 3286 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = GraphicsDefaults.foundItemIdCount; // L: 3287 - return 1; // L: 3288 - } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { // L: 3290 - if (var0 == ScriptOpcodes.OC_FINDRESET) { // L: 3295 - class336.foundItemIndex = 0; // L: 3296 - return 1; // L: 3297 - } else if (var0 == 4213) { // L: 3299 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3300 - var4 = UserComparator6.ItemDefinition_get(var3).getShiftClickIndex(); // L: 3301 - if (var4 == -1) { // L: 3302 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4; // L: 3303 + return 1; + } else if (var0 == ScriptOpcodes.OC_FIND) { + String var6 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + StructComposition.findItemDefinitions(var6, var4 == 1); + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = GraphicsDefaults.foundItemIdCount; + return 1; + } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { + if (var0 == ScriptOpcodes.OC_FINDRESET) { + class336.foundItemIndex = 0; + return 1; + } else if (var0 == 4213) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + var4 = UserComparator6.ItemDefinition_get(var3).getShiftClickIndex(); + if (var4 == -1) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4 + 1; // L: 3306 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4 + 1; } - return 1; // L: 3308 + return 1; } else { - return 2; // L: 3310 + return 2; } } else { - if (class113.foundItemIds != null && class336.foundItemIndex < GraphicsDefaults.foundItemIdCount) { // L: 3291 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class113.foundItemIds[++class336.foundItemIndex - 1] & '\uffff'; // L: 3292 + if (class113.foundItemIds != null && class336.foundItemIndex < GraphicsDefaults.foundItemIdCount) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class113.foundItemIds[++class336.foundItemIndex - 1] & '\uffff'; } else { Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; } - return 1; // L: 3293 + return 1; } } } diff --git a/runescape-client/src/main/java/UrlRequest.java b/runescape-client/src/main/java/UrlRequest.java index 96c568e232..f4ee2280c9 100644 --- a/runescape-client/src/main/java/UrlRequest.java +++ b/runescape-client/src/main/java/UrlRequest.java @@ -24,8 +24,8 @@ public class UrlRequest { volatile byte[] response0; UrlRequest(URL var1) { - this.url = var1; // L: 97 - } // L: 98 + this.url = var1; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -34,7 +34,7 @@ public class UrlRequest { ) @Export("isDone") public boolean isDone() { - return this.isDone0; // L: 101 + return this.isDone0; } @ObfuscatedName("b") @@ -44,7 +44,7 @@ public class UrlRequest { ) @Export("getResponse") public byte[] getResponse() { - return this.response0; // L: 105 + return this.response0; } @ObfuscatedName("fc") @@ -53,46 +53,46 @@ public class UrlRequest { garbageValue = "1703812589" ) static final void method2496() { - class364.method6623(); // L: 3587 - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); // L: 3589 - ScriptFrame.method1110(); // L: 3591 - UserComparator5.method2524(); // L: 3592 - NPCComposition.NpcDefinition_cached.clear(); // L: 3594 - NPCComposition.NpcDefinition_cachedModels.clear(); // L: 3595 - ItemComposition.ItemDefinition_cached.clear(); // L: 3598 - ItemComposition.ItemDefinition_cachedModels.clear(); // L: 3599 - ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 3600 - SequenceDefinition.SequenceDefinition_cached.clear(); // L: 3603 - SequenceDefinition.SequenceDefinition_cachedFrames.clear(); // L: 3604 - SequenceDefinition.field2086.clear(); // L: 3605 - InterfaceParent.method2143(); // L: 3607 - class1.method8(); // L: 3608 - VarpDefinition.VarpDefinition_cached.clear(); // L: 3610 - AbstractSocket.HitSplatDefinition_cachedSprites.method7216(); // L: 3612 - Ignored.HitSplatDefinition_cached.method7216(); // L: 3613 - ObjectSound.method1796(); // L: 3614 - HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); // L: 3616 - HealthBarDefinition.field1795.clear(); // L: 3617 - ObjectComposition.method3542(); // L: 3619 - ParamComposition.ParamDefinition_cached.clear(); // L: 3621 - WorldMapElement.PlayerAppearance_cachedModels.clear(); // L: 3624 - PlayerComposition.Widget_cachedSprites.clear(); // L: 3627 - WorldMapSection2.method4417(); // L: 3629 - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); // L: 3630 - Script.Script_cached.clear(); // L: 3631 - class115.archive1.clearFiles(); // L: 3632 - class9.archive3.clearFiles(); // L: 3633 - class19.archive4.clearFiles(); // L: 3634 - KeyHandler.archive4.clearFiles(); // L: 3635 - class140.archive5.clearFiles(); // L: 3636 - WorldMapScaleHandler.archive6.clearFiles(); // L: 3637 - class115.archive7.clearFiles(); // L: 3638 - UserComparator6.archive8.clearFiles(); // L: 3639 - NetSocket.archive9.clearFiles(); // L: 3640 - class257.archive10.clearFiles(); // L: 3641 - Players.archive11.clearFiles(); // L: 3642 - TaskHandler.archive12.clearFiles(); // L: 3643 - } // L: 3644 + class364.method6623(); + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); + ScriptFrame.method1110(); + UserComparator5.method2524(); + NPCComposition.NpcDefinition_cached.clear(); + NPCComposition.NpcDefinition_cachedModels.clear(); + ItemComposition.ItemDefinition_cached.clear(); + ItemComposition.ItemDefinition_cachedModels.clear(); + ItemComposition.ItemDefinition_cachedSprites.clear(); + SequenceDefinition.SequenceDefinition_cached.clear(); + SequenceDefinition.SequenceDefinition_cachedFrames.clear(); + SequenceDefinition.field2086.clear(); + InterfaceParent.method2143(); + class1.method8(); + VarpDefinition.VarpDefinition_cached.clear(); + AbstractSocket.HitSplatDefinition_cachedSprites.method7216(); + Ignored.HitSplatDefinition_cached.method7216(); + ObjectSound.method1796(); + HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); + HealthBarDefinition.field1795.clear(); + ObjectComposition.method3542(); + ParamComposition.ParamDefinition_cached.clear(); + WorldMapElement.PlayerAppearance_cachedModels.clear(); + PlayerComposition.Widget_cachedSprites.clear(); + WorldMapSection2.method4417(); + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); + Script.Script_cached.clear(); + class115.archive1.clearFiles(); + class9.archive3.clearFiles(); + class19.archive4.clearFiles(); + KeyHandler.field151.clearFiles(); + class140.archive5.clearFiles(); + WorldMapScaleHandler.archive6.clearFiles(); + class115.archive7.clearFiles(); + UserComparator6.archive8.clearFiles(); + NetSocket.archive9.clearFiles(); + class257.archive10.clearFiles(); + Players.archive11.clearFiles(); + TaskHandler.archive12.clearFiles(); + } @ObfuscatedName("hk") @ObfuscatedSignature( @@ -100,9 +100,9 @@ public class UrlRequest { garbageValue = "-1546953811" ) static void method2489() { - Client.menuOptionsCount = 0; // L: 8781 - Client.isMenuOpen = false; // L: 8782 - } // L: 8783 + Client.menuOptionsCount = 0; + Client.isMenuOpen = false; + } @ObfuscatedName("iz") @ObfuscatedSignature( @@ -111,19 +111,19 @@ public class UrlRequest { ) @Export("selectSpell") static void selectSpell(int var0, int var1, int var2, int var3) { - Widget var4 = class126.getWidgetChild(var0, var1); // L: 9865 - if (var4 != null && var4.onTargetEnter != null) { // L: 9866 - ScriptEvent var5 = new ScriptEvent(); // L: 9867 - var5.widget = var4; // L: 9868 - var5.args = var4.onTargetEnter; // L: 9869 - class285.runScriptEvent(var5); // L: 9870 + Widget var4 = class126.getWidgetChild(var0, var1); + if (var4 != null && var4.onTargetEnter != null) { + ScriptEvent var5 = new ScriptEvent(); + var5.widget = var4; + var5.args = var4.onTargetEnter; + class285.runScriptEvent(var5); } - Client.field633 = var3; // L: 9872 - Client.isSpellSelected = true; // L: 9873 - class20.selectedSpellWidget = var0; // L: 9874 - Client.selectedSpellChildIndex = var1; // L: 9875 - class91.selectedSpellFlags = var2; // L: 9876 - SecureRandomCallable.invalidateWidget(var4); // L: 9877 - } // L: 9878 + Client.field633 = var3; + Client.isSpellSelected = true; + class20.selectedSpellWidget = var0; + Client.selectedSpellChildIndex = var1; + class91.selectedSpellFlags = var2; + SecureRandomCallable.invalidateWidget(var4); + } } diff --git a/runescape-client/src/main/java/UrlRequester.java b/runescape-client/src/main/java/UrlRequester.java index 4d5c6793ee..dd5a9f1feb 100644 --- a/runescape-client/src/main/java/UrlRequester.java +++ b/runescape-client/src/main/java/UrlRequester.java @@ -25,11 +25,11 @@ public class UrlRequester implements Runnable { Queue requests; public UrlRequester() { - this.requests = new LinkedList(); // L: 15 - this.thread = new Thread(this); // L: 18 - this.thread.setPriority(1); // L: 19 - this.thread.start(); // L: 20 - } // L: 21 + this.requests = new LinkedList(); + this.thread = new Thread(this); + this.thread.setPriority(1); + this.thread.start(); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -38,11 +38,11 @@ public class UrlRequester implements Runnable { ) @Export("request") public UrlRequest request(URL var1) { - UrlRequest var2 = new UrlRequest(var1); // L: 72 - synchronized(this) { // L: 73 - this.requests.add(var2); // L: 74 - this.notify(); // L: 75 - return var2; // L: 77 + UrlRequest var2 = new UrlRequest(var1); + synchronized(this) { + this.requests.add(var2); + this.notify(); + return var2; } } @@ -53,70 +53,70 @@ public class UrlRequester implements Runnable { ) @Export("close") public void close() { - this.isClosed = true; // L: 81 + this.isClosed = true; try { - synchronized(this) { // L: 83 - this.notify(); // L: 84 - } // L: 85 + synchronized(this) { + this.notify(); + } - this.thread.join(); // L: 86 - } catch (InterruptedException var4) { // L: 88 + this.thread.join(); + } catch (InterruptedException var4) { } - } // L: 89 + } public void run() { - while (!this.isClosed) { // L: 25 + while (!this.isClosed) { try { UrlRequest var1; - synchronized(this) { // L: 28 - var1 = (UrlRequest)this.requests.poll(); // L: 29 - if (var1 == null) { // L: 30 + synchronized(this) { + var1 = (UrlRequest)this.requests.poll(); + if (var1 == null) { try { - this.wait(); // L: 32 - } catch (InterruptedException var13) { // L: 34 + this.wait(); + } catch (InterruptedException var13) { } continue; } } - DataInputStream var2 = null; // L: 38 - URLConnection var3 = null; // L: 39 + DataInputStream var2 = null; + URLConnection var3 = null; try { - var3 = var1.url.openConnection(); // L: 41 - var3.setConnectTimeout(5000); // L: 42 - var3.setReadTimeout(5000); // L: 43 - var3.setUseCaches(false); // L: 44 - var3.setRequestProperty("Connection", "close"); // L: 45 - int var7 = var3.getContentLength(); // L: 46 - if (var7 >= 0) { // L: 47 - byte[] var5 = new byte[var7]; // L: 48 - var2 = new DataInputStream(var3.getInputStream()); // L: 49 - var2.readFully(var5); // L: 50 - var1.response0 = var5; // L: 51 + var3 = var1.url.openConnection(); + var3.setConnectTimeout(5000); + var3.setReadTimeout(5000); + var3.setUseCaches(false); + var3.setRequestProperty("Connection", "close"); + int var7 = var3.getContentLength(); + if (var7 >= 0) { + byte[] var5 = new byte[var7]; + var2 = new DataInputStream(var3.getInputStream()); + var2.readFully(var5); + var1.response0 = var5; } - var1.isDone0 = true; // L: 53 - } catch (IOException var14) { // L: 55 - var1.isDone0 = true; // L: 56 + var1.isDone0 = true; + } catch (IOException var14) { + var1.isDone0 = true; } finally { - if (var2 != null) { // L: 59 + if (var2 != null) { var2.close(); } - if (var3 != null && var3 instanceof HttpURLConnection) { // L: 60 - ((HttpURLConnection)var3).disconnect(); // L: 61 + if (var3 != null && var3 instanceof HttpURLConnection) { + ((HttpURLConnection)var3).disconnect(); } } - } catch (Exception var17) { // L: 65 - AccessFile.RunException_sendStackTrace((String)null, var17); // L: 66 + } catch (Exception var17) { + AccessFile.RunException_sendStackTrace((String)null, var17); } } - } // L: 69 + } @ObfuscatedName("k") @ObfuscatedSignature( @@ -124,57 +124,57 @@ public class UrlRequester implements Runnable { garbageValue = "-33577073" ) static int method2486(int var0, Script var1, boolean var2) { - Widget var3 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 1293 - if (var0 == ScriptOpcodes.IF_GETSCROLLX) { // L: 1294 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1295 - return 1; // L: 1296 - } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { // L: 1298 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1299 - return 1; // L: 1300 - } else if (var0 == ScriptOpcodes.IF_GETTEXT) { // L: 1302 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.text; // L: 1303 - return 1; // L: 1304 - } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { // L: 1306 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1307 - return 1; // L: 1308 - } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { // L: 1310 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1311 - return 1; // L: 1312 - } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { // L: 1314 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1315 - return 1; // L: 1316 - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { // L: 1318 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1319 - return 1; // L: 1320 - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { // L: 1322 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1323 - return 1; // L: 1324 - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { // L: 1326 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1327 - return 1; // L: 1328 - } else if (var0 == ScriptOpcodes.IF_GETTRANS) { // L: 1330 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1331 - return 1; // L: 1332 - } else if (var0 == 2610) { // L: 1334 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1335 - return 1; // L: 1336 - } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { // L: 1338 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.color; // L: 1339 - return 1; // L: 1340 - } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { // L: 1342 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.color2; // L: 1343 - return 1; // L: 1344 - } else if (var0 == 2613) { // L: 1346 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1347 - return 1; // L: 1348 - } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { // L: 1350 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1351 - return 1; // L: 1352 - } else if (var0 != 2615 && var0 != 2616) { // L: 1354 - return 2; // L: 1358 + Widget var3 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); + if (var0 == ScriptOpcodes.IF_GETSCROLLX) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.scrollX; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.scrollY; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETTEXT) { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.text; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.scrollWidth; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.scrollHeight; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelZoom; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelAngleX; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelAngleZ; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelAngleY; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETTRANS) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.transparencyTop; + return 1; + } else if (var0 == 2610) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.transparencyBot; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.color; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.color2; + return 1; + } else if (var0 == 2613) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; + return 1; + } else if (var0 != 2615 && var0 != 2616) { + return 2; } else { - ++IsaacCipher.Interpreter_intStackSize; // L: 1355 - return 1; // L: 1356 + ++IsaacCipher.Interpreter_intStackSize; + return 1; } } } diff --git a/runescape-client/src/main/java/User.java b/runescape-client/src/main/java/User.java index fb391e01a7..1fbf32296d 100644 --- a/runescape-client/src/main/java/User.java +++ b/runescape-client/src/main/java/User.java @@ -23,7 +23,7 @@ public class User implements Comparable { Username previousUsername; User() { - } // L: 9 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -32,7 +32,7 @@ public class User implements Comparable { ) @Export("compareTo_user") public int compareTo_user(User var1) { - return this.username.compareToTyped(var1.username); // L: 32 + return this.username.compareToTyped(var1.username); } @ObfuscatedName("ax") @@ -42,7 +42,7 @@ public class User implements Comparable { ) @Export("getUsername") public Username getUsername() { - return this.username; // L: 12 + return this.username; } @ObfuscatedName("am") @@ -52,7 +52,7 @@ public class User implements Comparable { ) @Export("getName") public String getName() { - return this.username == null ? "" : this.username.getName(); // L: 16 17 + return this.username == null ? "" : this.username.getName(); } @ObfuscatedName("az") @@ -62,7 +62,7 @@ public class User implements Comparable { ) @Export("getPreviousName") public String getPreviousName() { - return this.previousUsername == null ? "" : this.previousUsername.getName(); // L: 21 22 + return this.previousUsername == null ? "" : this.previousUsername.getName(); } @ObfuscatedName("au") @@ -72,16 +72,16 @@ public class User implements Comparable { ) @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("kq") @@ -91,14 +91,14 @@ public class User implements Comparable { ) @Export("drawCompass") static final void drawCompass(Widget var0, int var1, int var2, int var3) { - SpriteMask var4 = var0.getSpriteMask(false); // L: 12409 - if (var4 != null) { // L: 12410 - if (Client.minimapState < 3) { // L: 12411 + SpriteMask var4 = var0.getSpriteMask(false); + if (var4 != null) { + if (Client.minimapState < 3) { LoginScreenAnimation.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: 12412 + Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); } } - } // L: 12413 + } } diff --git a/runescape-client/src/main/java/UserComparator1.java b/runescape-client/src/main/java/UserComparator1.java index 126d3e6679..9be600d49c 100644 --- a/runescape-client/src/main/java/UserComparator1.java +++ b/runescape-client/src/main/java/UserComparator1.java @@ -12,8 +12,8 @@ public class UserComparator1 implements Comparator { final boolean reversed; public UserComparator1(boolean var1) { - this.reversed = var1; // L: 10 - } // L: 11 + this.reversed = var1; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -22,14 +22,14 @@ public class UserComparator1 implements Comparator { ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { - return this.reversed ? var1.compareTo_user(var2) : var2.compareTo_user(var1); // L: 14 + return this.reversed ? var1.compareTo_user(var2) : var2.compareTo_user(var1); } public int compare(Object var1, Object var2) { - return this.compare_bridged((User)var1, (User)var2); // L: 18 + return this.compare_bridged((User)var1, (User)var2); } public boolean equals(Object var1) { - return super.equals(var1); // L: 22 + return super.equals(var1); } } diff --git a/runescape-client/src/main/java/UserComparator10.java b/runescape-client/src/main/java/UserComparator10.java index b7c30ed595..7dc57a63dd 100644 --- a/runescape-client/src/main/java/UserComparator10.java +++ b/runescape-client/src/main/java/UserComparator10.java @@ -23,8 +23,8 @@ public class UserComparator10 extends AbstractUserComparator { final boolean reversed; public UserComparator10(boolean var1) { - this.reversed = var1; // L: 11 - } // L: 12 + this.reversed = var1; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -33,15 +33,15 @@ public class UserComparator10 extends AbstractUserComparator { ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (Client.worldId == var1.world && var2.world == Client.worldId) { // L: 15 - return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; // L: 16 + if (Client.worldId == var1.world && var2.world == Client.worldId) { + return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; } else { - return this.compareUser(var1, var2); // L: 18 + return this.compareUser(var1, var2); } } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 22 + return this.compareBuddy((Buddy)var1, (Buddy)var2); } @ObfuscatedName("fb") @@ -52,231 +52,231 @@ public class UserComparator10 extends AbstractUserComparator { @Export("load") static void load() { int var18; - if (Client.titleLoadingStage == 0) { // L: 2172 - class7.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); // L: 2173 + if (Client.titleLoadingStage == 0) { + class7.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); - for (var18 = 0; var18 < 4; ++var18) { // L: 2174 + for (var18 = 0; var18 < 4; ++var18) { Client.collisionMaps[var18] = new CollisionMap(104, 104); } - class29.sceneMinimapSprite = new SpritePixels(512, 512); // L: 2175 - Login.Login_loadingText = "Starting game engine..."; // L: 2176 - Login.Login_loadingPercent = 5; // L: 2177 - Client.titleLoadingStage = 20; // L: 2178 - } else if (Client.titleLoadingStage == 20) { // L: 2181 - Login.Login_loadingText = "Prepared visibility map"; // L: 2182 - Login.Login_loadingPercent = 10; // L: 2183 - Client.titleLoadingStage = 30; // L: 2184 - } else if (Client.titleLoadingStage == 30) { // L: 2187 - class115.archive1 = VarcInt.newArchive(0, false, true, true); // L: 2188 - class9.archive3 = VarcInt.newArchive(1, false, true, true); // L: 2189 - class131.archive2 = VarcInt.newArchive(2, true, false, true); // L: 2190 - class19.archive4 = VarcInt.newArchive(3, false, true, true); // L: 2191 - KeyHandler.archive4 = VarcInt.newArchive(4, false, true, true); // L: 2192 - class140.archive5 = VarcInt.newArchive(5, true, true, true); // L: 2193 - WorldMapScaleHandler.archive6 = VarcInt.newArchive(6, true, true, true); // L: 2194 - class115.archive7 = VarcInt.newArchive(7, false, true, true); // L: 2195 - UserComparator6.archive8 = VarcInt.newArchive(8, false, true, true); // L: 2196 - NetSocket.archive9 = VarcInt.newArchive(9, false, true, true); // L: 2197 - class257.archive10 = VarcInt.newArchive(10, false, true, true); // L: 2198 - Players.archive11 = VarcInt.newArchive(11, false, true, true); // L: 2199 - TaskHandler.archive12 = VarcInt.newArchive(12, false, true, true); // L: 2200 - class1.archive13 = VarcInt.newArchive(13, true, false, true); // L: 2201 - ChatChannel.archive14 = VarcInt.newArchive(14, false, true, true); // L: 2202 - class133.archive15 = VarcInt.newArchive(15, false, true, true); // L: 2203 - class126.archive17 = VarcInt.newArchive(17, true, true, true); // L: 2204 - VertexNormal.archive18 = VarcInt.newArchive(18, false, true, true); // L: 2205 - class148.archive19 = VarcInt.newArchive(19, false, true, true); // L: 2206 - HealthBarUpdate.archive20 = VarcInt.newArchive(20, false, true, true); // L: 2207 - Login.Login_loadingText = "Connecting to update server"; // L: 2208 - Login.Login_loadingPercent = 20; // L: 2209 - Client.titleLoadingStage = 40; // L: 2210 - } else if (Client.titleLoadingStage == 40) { // L: 2213 - byte var41 = 0; // L: 2214 - var18 = var41 + class115.archive1.percentage() * 4 / 100; // L: 2215 - var18 += class9.archive3.percentage() * 4 / 100; // L: 2216 - var18 += class131.archive2.percentage() * 2 / 100; // L: 2217 - var18 += class19.archive4.percentage() * 2 / 100; // L: 2218 - var18 += KeyHandler.archive4.percentage() * 6 / 100; // L: 2219 - var18 += class140.archive5.percentage() * 4 / 100; // L: 2220 - var18 += WorldMapScaleHandler.archive6.percentage() * 2 / 100; // L: 2221 - var18 += class115.archive7.percentage() * 56 / 100; // L: 2222 - var18 += UserComparator6.archive8.percentage() * 2 / 100; // L: 2223 - var18 += NetSocket.archive9.percentage() * 2 / 100; // L: 2224 - var18 += class257.archive10.percentage() * 2 / 100; // L: 2225 - var18 += Players.archive11.percentage() * 2 / 100; // L: 2226 - var18 += TaskHandler.archive12.percentage() * 2 / 100; // L: 2227 - var18 += class1.archive13.percentage() * 2 / 100; // L: 2228 - var18 += ChatChannel.archive14.percentage() * 2 / 100; // L: 2229 - var18 += class133.archive15.percentage() * 2 / 100; // L: 2230 - var18 += class148.archive19.percentage() / 100; // L: 2231 - var18 += VertexNormal.archive18.percentage() / 100; // L: 2232 - var18 += HealthBarUpdate.archive20.percentage() / 100; // L: 2233 - var18 += class126.archive17.method5540() && class126.archive17.isFullyLoaded() ? 1 : 0; // L: 2234 - if (var18 != 100) { // L: 2235 - if (var18 != 0) { // L: 2236 + class29.sceneMinimapSprite = new SpritePixels(512, 512); + Login.Login_loadingText = "Starting game engine..."; + Login.Login_loadingPercent = 5; + Client.titleLoadingStage = 20; + } else if (Client.titleLoadingStage == 20) { + Login.Login_loadingText = "Prepared visibility map"; + Login.Login_loadingPercent = 10; + Client.titleLoadingStage = 30; + } else if (Client.titleLoadingStage == 30) { + class115.archive1 = VarcInt.newArchive(0, false, true, true); + class9.archive3 = VarcInt.newArchive(1, false, true, true); + class131.archive2 = VarcInt.newArchive(2, true, false, true); + class19.archive4 = VarcInt.newArchive(3, false, true, true); + KeyHandler.field151 = VarcInt.newArchive(4, false, true, true); + class140.archive5 = VarcInt.newArchive(5, true, true, true); + WorldMapScaleHandler.archive6 = VarcInt.newArchive(6, true, true, true); + class115.archive7 = VarcInt.newArchive(7, false, true, true); + UserComparator6.archive8 = VarcInt.newArchive(8, false, true, true); + NetSocket.archive9 = VarcInt.newArchive(9, false, true, true); + class257.archive10 = VarcInt.newArchive(10, false, true, true); + Players.archive11 = VarcInt.newArchive(11, false, true, true); + TaskHandler.archive12 = VarcInt.newArchive(12, false, true, true); + class1.archive13 = VarcInt.newArchive(13, true, false, true); + ChatChannel.archive14 = VarcInt.newArchive(14, false, true, true); + class133.archive15 = VarcInt.newArchive(15, false, true, true); + class126.archive17 = VarcInt.newArchive(17, true, true, true); + VertexNormal.archive18 = VarcInt.newArchive(18, false, true, true); + class148.archive19 = VarcInt.newArchive(19, false, true, true); + HealthBarUpdate.archive20 = VarcInt.newArchive(20, false, true, true); + Login.Login_loadingText = "Connecting to update server"; + Login.Login_loadingPercent = 20; + Client.titleLoadingStage = 40; + } else if (Client.titleLoadingStage == 40) { + byte var41 = 0; + var18 = var41 + class115.archive1.percentage() * 4 / 100; + var18 += class9.archive3.percentage() * 4 / 100; + var18 += class131.archive2.percentage() * 2 / 100; + var18 += class19.archive4.percentage() * 2 / 100; + var18 += KeyHandler.field151.percentage() * 6 / 100; + var18 += class140.archive5.percentage() * 4 / 100; + var18 += WorldMapScaleHandler.archive6.percentage() * 2 / 100; + var18 += class115.archive7.percentage() * 56 / 100; + var18 += UserComparator6.archive8.percentage() * 2 / 100; + var18 += NetSocket.archive9.percentage() * 2 / 100; + var18 += class257.archive10.percentage() * 2 / 100; + var18 += Players.archive11.percentage() * 2 / 100; + var18 += TaskHandler.archive12.percentage() * 2 / 100; + var18 += class1.archive13.percentage() * 2 / 100; + var18 += ChatChannel.archive14.percentage() * 2 / 100; + var18 += class133.archive15.percentage() * 2 / 100; + var18 += class148.archive19.percentage() / 100; + var18 += VertexNormal.archive18.percentage() / 100; + var18 += HealthBarUpdate.archive20.percentage() / 100; + var18 += class126.archive17.method5540() && class126.archive17.isFullyLoaded() ? 1 : 0; + if (var18 != 100) { + if (var18 != 0) { Login.Login_loadingText = "Checking for updates - " + var18 + "%"; } - Login.Login_loadingPercent = 30; // L: 2237 + Login.Login_loadingPercent = 30; } else { - NetFileRequest.method5587(class115.archive1, "Animations"); // L: 2240 - NetFileRequest.method5587(class9.archive3, "Skeletons"); // L: 2241 - NetFileRequest.method5587(KeyHandler.archive4, "Sound FX"); // L: 2242 - NetFileRequest.method5587(class140.archive5, "Maps"); // L: 2243 - NetFileRequest.method5587(WorldMapScaleHandler.archive6, "Music Tracks"); // L: 2244 - NetFileRequest.method5587(class115.archive7, "Models"); // L: 2245 - NetFileRequest.method5587(UserComparator6.archive8, "Sprites"); // L: 2246 - NetFileRequest.method5587(Players.archive11, "Music Jingles"); // L: 2247 - NetFileRequest.method5587(ChatChannel.archive14, "Music Samples"); // L: 2248 - NetFileRequest.method5587(class133.archive15, "Music Patches"); // L: 2249 - NetFileRequest.method5587(class148.archive19, "World Map"); // L: 2250 - NetFileRequest.method5587(VertexNormal.archive18, "World Map Geography"); // L: 2251 - NetFileRequest.method5587(HealthBarUpdate.archive20, "World Map Ground"); // L: 2252 - class6.spriteIds = new GraphicsDefaults(); // L: 2253 - class6.spriteIds.decode(class126.archive17); // L: 2254 - Login.Login_loadingText = "Loaded update list"; // L: 2255 - Login.Login_loadingPercent = 30; // L: 2256 - Client.titleLoadingStage = 45; // L: 2257 + NetFileRequest.method5587(class115.archive1, "Animations"); + NetFileRequest.method5587(class9.archive3, "Skeletons"); + NetFileRequest.method5587(KeyHandler.field151, "Sound FX"); + NetFileRequest.method5587(class140.archive5, "Maps"); + NetFileRequest.method5587(WorldMapScaleHandler.archive6, "Music Tracks"); + NetFileRequest.method5587(class115.archive7, "Models"); + NetFileRequest.method5587(UserComparator6.archive8, "Sprites"); + NetFileRequest.method5587(Players.archive11, "Music Jingles"); + NetFileRequest.method5587(ChatChannel.archive14, "Music Samples"); + NetFileRequest.method5587(class133.archive15, "Music Patches"); + NetFileRequest.method5587(class148.archive19, "World Map"); + NetFileRequest.method5587(VertexNormal.archive18, "World Map Geography"); + NetFileRequest.method5587(HealthBarUpdate.archive20, "World Map Ground"); + class6.spriteIds = new GraphicsDefaults(); + class6.spriteIds.decode(class126.archive17); + Login.Login_loadingText = "Loaded update list"; + Login.Login_loadingPercent = 30; + Client.titleLoadingStage = 45; } } else { Archive var2; - if (Client.titleLoadingStage == 45) { // L: 2260 - boolean var40 = !Client.isLowDetail; // L: 2261 - class339.field4058 = 22050; // L: 2264 - SpriteMask.PcmPlayer_stereo = var40; // L: 2265 - field1339 = 2; // L: 2266 - MidiPcmStream var37 = new MidiPcmStream(); // L: 2268 - var37.method5079(9, 128); // L: 2269 - JagexCache.pcmPlayer0 = class4.method29(GameEngine.taskHandler, 0, 22050); // L: 2270 - JagexCache.pcmPlayer0.setStream(var37); // L: 2271 - var2 = class133.archive15; // L: 2272 - Archive var39 = ChatChannel.archive14; // L: 2273 - Archive var29 = KeyHandler.archive4; // L: 2274 - class260.musicPatchesArchive = var2; // L: 2276 - class331.musicSamplesArchive = var39; // L: 2277 - class260.soundEffectsArchive = var29; // L: 2278 - class260.midiPcmStream = var37; // L: 2279 - PacketWriter.pcmPlayer1 = class4.method29(GameEngine.taskHandler, 1, 2048); // L: 2281 - class281.pcmStreamMixer = new PcmStreamMixer(); // L: 2282 - PacketWriter.pcmPlayer1.setStream(class281.pcmStreamMixer); // L: 2283 - BoundaryObject.decimator = new Decimator(22050, class339.field4058); // L: 2284 - Login.Login_loadingText = "Prepared sound engine"; // L: 2285 - Login.Login_loadingPercent = 35; // L: 2286 - Client.titleLoadingStage = 50; // L: 2287 - class126.WorldMapElement_fonts = new Fonts(UserComparator6.archive8, class1.archive13); // L: 2288 + if (Client.titleLoadingStage == 45) { + boolean var40 = !Client.isLowDetail; + class339.field4058 = 22050; + SpriteMask.PcmPlayer_stereo = var40; + field1339 = 2; + MidiPcmStream var37 = new MidiPcmStream(); + var37.method5079(9, 128); + JagexCache.pcmPlayer0 = class4.method29(GameEngine.taskHandler, 0, 22050); + JagexCache.pcmPlayer0.setStream(var37); + var2 = class133.archive15; + Archive var39 = ChatChannel.archive14; + Archive var29 = KeyHandler.field151; + class260.musicPatchesArchive = var2; + class331.musicSamplesArchive = var39; + class260.soundEffectsArchive = var29; + class260.midiPcmStream = var37; + PacketWriter.pcmPlayer1 = class4.method29(GameEngine.taskHandler, 1, 2048); + class281.pcmStreamMixer = new PcmStreamMixer(); + PacketWriter.pcmPlayer1.setStream(class281.pcmStreamMixer); + BoundaryObject.decimator = new Decimator(22050, class339.field4058); + Login.Login_loadingText = "Prepared sound engine"; + Login.Login_loadingPercent = 35; + Client.titleLoadingStage = 50; + class126.WorldMapElement_fonts = new Fonts(UserComparator6.archive8, class1.archive13); } else { int var19; - if (Client.titleLoadingStage == 50) { // L: 2291 - FontName[] var27 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_plain11, FontName.FontName_verdana11, FontName.FontName_plain12, FontName.FontName_verdana13, FontName.FontName_bold12}; // L: 2294 - var19 = var27.length; // L: 2296 - Fonts var30 = class126.WorldMapElement_fonts; // L: 2297 - FontName[] var25 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_plain11, FontName.FontName_verdana11, FontName.FontName_plain12, FontName.FontName_verdana13, FontName.FontName_bold12}; // L: 2300 - Client.fontsMap = var30.createMap(var25); // L: 2302 - if (Client.fontsMap.size() < var19) { // L: 2303 - Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var19 + "%"; // L: 2304 - Login.Login_loadingPercent = 40; // L: 2305 + if (Client.titleLoadingStage == 50) { + FontName[] var27 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_plain11, FontName.FontName_verdana11, FontName.FontName_plain12, FontName.FontName_verdana13, FontName.FontName_bold12}; + var19 = var27.length; + Fonts var30 = class126.WorldMapElement_fonts; + FontName[] var25 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_plain11, FontName.FontName_verdana11, FontName.FontName_plain12, FontName.FontName_verdana13, FontName.FontName_bold12}; + Client.fontsMap = var30.createMap(var25); + if (Client.fontsMap.size() < var19) { + Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var19 + "%"; + Login.Login_loadingPercent = 40; } else { - class307.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); // L: 2308 - class114.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); // L: 2309 - class136.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); // L: 2310 - Interpreter.platformInfo = Client.platformInfoProvider.get(); // L: 2311 - Login.Login_loadingText = "Loaded fonts"; // L: 2312 - Login.Login_loadingPercent = 40; // L: 2313 - Client.titleLoadingStage = 60; // L: 2314 + class307.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); + class114.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); + class136.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); + Interpreter.platformInfo = Client.platformInfoProvider.get(); + Login.Login_loadingText = "Loaded fonts"; + Login.Login_loadingPercent = 40; + Client.titleLoadingStage = 60; } - } else if (Client.titleLoadingStage == 60) { // L: 2317 - var18 = WorldMapArea.method4490(class257.archive10, UserComparator6.archive8); // L: 2318 - var19 = Login.field893.length + Login.field892.length; // L: 2321 - if (var18 < var19) { // L: 2324 - Login.Login_loadingText = "Loading title screen - " + var18 * 100 / var19 + "%"; // L: 2325 - Login.Login_loadingPercent = 50; // L: 2326 + } else if (Client.titleLoadingStage == 60) { + var18 = WorldMapArea.method4490(class257.archive10, UserComparator6.archive8); + var19 = Login.field893.length + Login.field892.length; + if (var18 < var19) { + Login.Login_loadingText = "Loading title screen - " + var18 * 100 / var19 + "%"; + Login.Login_loadingPercent = 50; } else { - Login.Login_loadingText = "Loaded title screen"; // L: 2329 - Login.Login_loadingPercent = 50; // L: 2330 - VertexNormal.updateGameState(5); // L: 2331 - Client.titleLoadingStage = 70; // L: 2332 + Login.Login_loadingText = "Loaded title screen"; + Login.Login_loadingPercent = 50; + VertexNormal.updateGameState(5); + Client.titleLoadingStage = 70; } - } else if (Client.titleLoadingStage == 70) { // L: 2335 - if (!class131.archive2.isFullyLoaded()) { // L: 2336 - Login.Login_loadingText = "Loading config - " + class131.archive2.loadPercent() + "%"; // L: 2337 - Login.Login_loadingPercent = 60; // L: 2338 + } else if (Client.titleLoadingStage == 70) { + if (!class131.archive2.isFullyLoaded()) { + Login.Login_loadingText = "Loading config - " + class131.archive2.loadPercent() + "%"; + Login.Login_loadingPercent = 60; } else { - Archive var26 = class131.archive2; // L: 2341 - FloorOverlayDefinition.FloorOverlayDefinition_archive = var26; // L: 2343 - class19.method330(class131.archive2); // L: 2345 - GrandExchangeOfferTotalQuantityComparator.method5725(class131.archive2, class115.archive7); // L: 2346 - class186.method3740(class131.archive2, class115.archive7, Client.isLowDetail); // L: 2347 - class258.method5047(class131.archive2, class115.archive7); // L: 2348 - class221.method4700(class131.archive2); // L: 2349 - Archive var35 = class131.archive2; // L: 2350 - var2 = class115.archive7; // L: 2351 - boolean var32 = Client.isMembersWorld; // L: 2352 - Font var4 = class307.fontPlain11; // L: 2353 - ItemComposition.ItemDefinition_archive = var35; // L: 2355 - ItemComposition.ItemDefinition_modelArchive = var2; // L: 2356 - ItemComposition.ItemDefinition_inMembersWorld = var32; // L: 2357 - WorldMapLabelSize.ItemDefinition_fileCount = ItemComposition.ItemDefinition_archive.getGroupFileCount(10); // L: 2358 - ItemComposition.ItemDefinition_fontPlain11 = var4; // L: 2359 - Archive var34 = class131.archive2; // L: 2361 - Archive var22 = class115.archive1; // L: 2362 - Archive var36 = class9.archive3; // L: 2363 - Canvas.SequenceDefinition_archive = var34; // L: 2365 - SequenceDefinition.SequenceDefinition_animationsArchive = var22; // L: 2366 - class118.SequenceDefinition_skeletonsArchive = var36; // L: 2367 - TileItem.method2368(class131.archive2, class115.archive7); // L: 2369 - Archive var23 = class131.archive2; // L: 2370 - VarbitComposition.VarbitDefinition_archive = var23; // L: 2372 - Archive var38 = class131.archive2; // L: 2374 - VarpDefinition.VarpDefinition_archive = var38; // L: 2376 - class433.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); // L: 2377 - class194.method3937(class19.archive4, class115.archive7, UserComparator6.archive8, class1.archive13); // L: 2379 - Archive var24 = class131.archive2; // L: 2380 - InvDefinition.InvDefinition_archive = var24; // L: 2382 - Archive var11 = class131.archive2; // L: 2384 - EnumComposition.EnumDefinition_archive = var11; // L: 2386 - Archive var12 = class131.archive2; // L: 2388 - VarcInt.VarcInt_archive = var12; // L: 2390 - Archive var13 = class131.archive2; // L: 2392 - InterfaceParent.method2145(class131.archive2); // L: 2394 - AbstractSocket.HitSplatDefinition_cachedSprites = new class404(class338.field4054, 54, ScriptFrame.clientLanguage, class131.archive2); // L: 2395 - Ignored.HitSplatDefinition_cached = new class404(class338.field4054, 47, ScriptFrame.clientLanguage, class131.archive2); // L: 2396 - class339.varcs = new Varcs(); // L: 2397 - class331.method6174(class131.archive2, UserComparator6.archive8, class1.archive13); // L: 2398 - ObjectSound.method1803(class131.archive2, UserComparator6.archive8); // L: 2399 - Archive var14 = class131.archive2; // L: 2400 - Archive var15 = UserComparator6.archive8; // L: 2401 - WorldMapElement.WorldMapElement_archive = var15; // L: 2403 - if (var14.isFullyLoaded()) { // L: 2404 - class408.WorldMapElement_count = var14.getGroupFileCount(35); // L: 2407 - WorldMapElement.WorldMapElement_cached = new WorldMapElement[class408.WorldMapElement_count]; // L: 2408 + Archive var26 = class131.archive2; + FloorOverlayDefinition.FloorOverlayDefinition_archive = var26; + class19.method330(class131.archive2); + GrandExchangeOfferTotalQuantityComparator.method5725(class131.archive2, class115.archive7); + class186.method3740(class131.archive2, class115.archive7, Client.isLowDetail); + class258.method5047(class131.archive2, class115.archive7); + class221.method4700(class131.archive2); + Archive var35 = class131.archive2; + var2 = class115.archive7; + boolean var32 = Client.isMembersWorld; + Font var4 = class307.fontPlain11; + ItemComposition.ItemDefinition_archive = var35; + ItemComposition.ItemDefinition_modelArchive = var2; + ItemComposition.ItemDefinition_inMembersWorld = var32; + WorldMapLabelSize.ItemDefinition_fileCount = ItemComposition.ItemDefinition_archive.getGroupFileCount(10); + ItemComposition.ItemDefinition_fontPlain11 = var4; + Archive var34 = class131.archive2; + Archive var22 = class115.archive1; + Archive var36 = class9.archive3; + Canvas.SequenceDefinition_archive = var34; + SequenceDefinition.SequenceDefinition_animationsArchive = var22; + class118.SequenceDefinition_skeletonsArchive = var36; + TileItem.method2368(class131.archive2, class115.archive7); + Archive var23 = class131.archive2; + VarbitComposition.VarbitDefinition_archive = var23; + Archive var38 = class131.archive2; + VarpDefinition.VarpDefinition_archive = var38; + class433.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); + class194.method3937(class19.archive4, class115.archive7, UserComparator6.archive8, class1.archive13); + Archive var24 = class131.archive2; + InvDefinition.InvDefinition_archive = var24; + Archive var11 = class131.archive2; + EnumComposition.EnumDefinition_archive = var11; + Archive var12 = class131.archive2; + VarcInt.VarcInt_archive = var12; + Archive var13 = class131.archive2; + InterfaceParent.method2145(class131.archive2); + AbstractSocket.HitSplatDefinition_cachedSprites = new class404(class338.field4054, 54, ScriptFrame.clientLanguage, class131.archive2); + Ignored.HitSplatDefinition_cached = new class404(class338.field4054, 47, ScriptFrame.clientLanguage, class131.archive2); + class339.varcs = new Varcs(); + class331.method6174(class131.archive2, UserComparator6.archive8, class1.archive13); + ObjectSound.method1803(class131.archive2, UserComparator6.archive8); + Archive var14 = class131.archive2; + Archive var15 = UserComparator6.archive8; + WorldMapElement.WorldMapElement_archive = var15; + if (var14.isFullyLoaded()) { + class408.WorldMapElement_count = var14.getGroupFileCount(35); + WorldMapElement.WorldMapElement_cached = new WorldMapElement[class408.WorldMapElement_count]; - for (int var16 = 0; var16 < class408.WorldMapElement_count; ++var16) { // L: 2409 - byte[] var17 = var14.takeFile(35, var16); // L: 2410 - WorldMapElement.WorldMapElement_cached[var16] = new WorldMapElement(var16); // L: 2411 - if (var17 != null) { // L: 2412 - WorldMapElement.WorldMapElement_cached[var16].decode(new Buffer(var17)); // L: 2413 - WorldMapElement.WorldMapElement_cached[var16].method3173(); // L: 2414 + for (int var16 = 0; var16 < class408.WorldMapElement_count; ++var16) { + byte[] var17 = var14.takeFile(35, var16); + WorldMapElement.WorldMapElement_cached[var16] = new WorldMapElement(var16); + if (var17 != null) { + WorldMapElement.WorldMapElement_cached[var16].decode(new Buffer(var17)); + WorldMapElement.WorldMapElement_cached[var16].method3173(); } } } - Login.Login_loadingText = "Loaded config"; // L: 2418 - Login.Login_loadingPercent = 60; // L: 2419 - Client.titleLoadingStage = 80; // L: 2420 + Login.Login_loadingText = "Loaded config"; + Login.Login_loadingPercent = 60; + Client.titleLoadingStage = 80; } - } else if (Client.titleLoadingStage == 80) { // L: 2423 - var18 = 0; // L: 2424 - if (LoginScreenAnimation.compass == null) { // L: 2425 + } else if (Client.titleLoadingStage == 80) { + var18 = 0; + if (LoginScreenAnimation.compass == null) { LoginScreenAnimation.compass = class6.SpriteBuffer_getSprite(UserComparator6.archive8, class6.spriteIds.compass, 0); } else { - ++var18; // L: 2426 + ++var18; } - if (PcmPlayer.redHintArrowSprite == null) { // L: 2427 + if (PcmPlayer.redHintArrowSprite == null) { PcmPlayer.redHintArrowSprite = class6.SpriteBuffer_getSprite(UserComparator6.archive8, class6.spriteIds.field4163, 0); } else { - ++var18; // L: 2428 + ++var18; } IndexedSprite[] var1; @@ -284,33 +284,33 @@ public class UserComparator10 extends AbstractUserComparator { IndexedSprite[] var5; int var6; IndexedSprite var7; - if (AbstractWorldMapData.mapSceneSprites == null) { // L: 2429 - var2 = UserComparator6.archive8; // L: 2431 - var3 = class6.spriteIds.mapScenes; // L: 2432 - if (!class147.method3009(var2, var3, 0)) { // L: 2434 - var1 = null; // L: 2435 + if (AbstractWorldMapData.mapSceneSprites == null) { + var2 = UserComparator6.archive8; + var3 = class6.spriteIds.mapScenes; + if (!class147.method3009(var2, var3, 0)) { + var1 = null; } else { - var5 = new IndexedSprite[class440.SpriteBuffer_spriteCount]; // L: 2440 + var5 = new IndexedSprite[class440.SpriteBuffer_spriteCount]; - for (var6 = 0; var6 < class440.SpriteBuffer_spriteCount; ++var6) { // L: 2441 - var7 = var5[var6] = new IndexedSprite(); // L: 2442 - var7.width = class432.SpriteBuffer_spriteWidth; // L: 2443 - var7.height = class432.SpriteBuffer_spriteHeight; // L: 2444 - var7.xOffset = class141.SpriteBuffer_xOffsets[var6]; // L: 2445 - var7.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; // L: 2446 - var7.subWidth = class432.SpriteBuffer_spriteWidths[var6]; // L: 2447 - var7.subHeight = class330.SpriteBuffer_spriteHeights[var6]; // L: 2448 - var7.palette = class432.SpriteBuffer_spritePalette; // L: 2449 - var7.pixels = class369.SpriteBuffer_pixels[var6]; // L: 2450 + for (var6 = 0; var6 < class440.SpriteBuffer_spriteCount; ++var6) { + var7 = var5[var6] = new IndexedSprite(); + var7.width = class432.SpriteBuffer_spriteWidth; + var7.height = class432.SpriteBuffer_spriteHeight; + var7.xOffset = class141.SpriteBuffer_xOffsets[var6]; + var7.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; + var7.subWidth = class432.SpriteBuffer_spriteWidths[var6]; + var7.subHeight = class330.SpriteBuffer_spriteHeights[var6]; + var7.palette = class432.SpriteBuffer_spritePalette; + var7.pixels = class369.SpriteBuffer_pixels[var6]; } - UserComparator3.method2529(); // L: 2452 - var1 = var5; // L: 2455 + UserComparator3.method2529(); + var1 = var5; } - AbstractWorldMapData.mapSceneSprites = var1; // L: 2457 + AbstractWorldMapData.mapSceneSprites = var1; } else { - ++var18; // L: 2459 + ++var18; } int var8; @@ -319,390 +319,390 @@ public class UserComparator10 extends AbstractUserComparator { SpritePixels[] var28; SpritePixels[] var31; SpritePixels var33; - if (class286.headIconPkSprites == null) { // L: 2460 - var2 = UserComparator6.archive8; // L: 2462 - var3 = class6.spriteIds.headIconsPk; // L: 2463 - if (!class147.method3009(var2, var3, 0)) { // L: 2465 - var28 = null; // L: 2466 + if (class286.headIconPkSprites == null) { + var2 = UserComparator6.archive8; + var3 = class6.spriteIds.headIconsPk; + if (!class147.method3009(var2, var3, 0)) { + var28 = null; } else { - var31 = new SpritePixels[class440.SpriteBuffer_spriteCount]; // L: 2471 + var31 = new SpritePixels[class440.SpriteBuffer_spriteCount]; var6 = 0; while (true) { if (var6 >= class440.SpriteBuffer_spriteCount) { - UserComparator3.method2529(); // L: 2485 - var28 = var31; // L: 2488 + UserComparator3.method2529(); + var28 = var31; break; } - var33 = var31[var6] = new SpritePixels(); // L: 2473 - var33.width = class432.SpriteBuffer_spriteWidth; // L: 2474 - var33.height = class432.SpriteBuffer_spriteHeight; // L: 2475 - var33.xOffset = class141.SpriteBuffer_xOffsets[var6]; // L: 2476 - var33.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; // L: 2477 - var33.subWidth = class432.SpriteBuffer_spriteWidths[var6]; // L: 2478 - var33.subHeight = class330.SpriteBuffer_spriteHeights[var6]; // L: 2479 - var8 = var33.subHeight * var33.subWidth; // L: 2480 - var9 = class369.SpriteBuffer_pixels[var6]; // L: 2481 - var33.pixels = new int[var8]; // L: 2482 + var33 = var31[var6] = new SpritePixels(); + var33.width = class432.SpriteBuffer_spriteWidth; + var33.height = class432.SpriteBuffer_spriteHeight; + var33.xOffset = class141.SpriteBuffer_xOffsets[var6]; + var33.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; + var33.subWidth = class432.SpriteBuffer_spriteWidths[var6]; + var33.subHeight = class330.SpriteBuffer_spriteHeights[var6]; + var8 = var33.subHeight * var33.subWidth; + var9 = class369.SpriteBuffer_pixels[var6]; + var33.pixels = new int[var8]; - for (var10 = 0; var10 < var8; ++var10) { // L: 2483 + for (var10 = 0; var10 < var8; ++var10) { var33.pixels[var10] = class432.SpriteBuffer_spritePalette[var9[var10] & 255]; } - ++var6; // L: 2472 + ++var6; } } - class286.headIconPkSprites = var28; // L: 2490 + class286.headIconPkSprites = var28; } else { - ++var18; // L: 2492 + ++var18; } - if (PlayerComposition.headIconPrayerSprites == null) { // L: 2493 - var2 = UserComparator6.archive8; // L: 2495 - var3 = class6.spriteIds.field4166; // L: 2496 - if (!class147.method3009(var2, var3, 0)) { // L: 2498 - var28 = null; // L: 2499 + if (PlayerComposition.headIconPrayerSprites == null) { + var2 = UserComparator6.archive8; + var3 = class6.spriteIds.field4166; + if (!class147.method3009(var2, var3, 0)) { + var28 = null; } else { - var31 = new SpritePixels[class440.SpriteBuffer_spriteCount]; // L: 2504 + var31 = new SpritePixels[class440.SpriteBuffer_spriteCount]; var6 = 0; while (true) { if (var6 >= class440.SpriteBuffer_spriteCount) { - UserComparator3.method2529(); // L: 2518 - var28 = var31; // L: 2521 + UserComparator3.method2529(); + var28 = var31; break; } - var33 = var31[var6] = new SpritePixels(); // L: 2506 - var33.width = class432.SpriteBuffer_spriteWidth; // L: 2507 - var33.height = class432.SpriteBuffer_spriteHeight; // L: 2508 - var33.xOffset = class141.SpriteBuffer_xOffsets[var6]; // L: 2509 - var33.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; // L: 2510 - var33.subWidth = class432.SpriteBuffer_spriteWidths[var6]; // L: 2511 - var33.subHeight = class330.SpriteBuffer_spriteHeights[var6]; // L: 2512 - var8 = var33.subHeight * var33.subWidth; // L: 2513 - var9 = class369.SpriteBuffer_pixels[var6]; // L: 2514 - var33.pixels = new int[var8]; // L: 2515 + var33 = var31[var6] = new SpritePixels(); + var33.width = class432.SpriteBuffer_spriteWidth; + var33.height = class432.SpriteBuffer_spriteHeight; + var33.xOffset = class141.SpriteBuffer_xOffsets[var6]; + var33.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; + var33.subWidth = class432.SpriteBuffer_spriteWidths[var6]; + var33.subHeight = class330.SpriteBuffer_spriteHeights[var6]; + var8 = var33.subHeight * var33.subWidth; + var9 = class369.SpriteBuffer_pixels[var6]; + var33.pixels = new int[var8]; - for (var10 = 0; var10 < var8; ++var10) { // L: 2516 + for (var10 = 0; var10 < var8; ++var10) { var33.pixels[var10] = class432.SpriteBuffer_spritePalette[var9[var10] & 255]; } - ++var6; // L: 2505 + ++var6; } } - PlayerComposition.headIconPrayerSprites = var28; // L: 2523 + PlayerComposition.headIconPrayerSprites = var28; } else { - ++var18; // L: 2525 + ++var18; } - if (class260.headIconHintSprites == null) { // L: 2526 - var2 = UserComparator6.archive8; // L: 2528 - var3 = class6.spriteIds.field4173; // L: 2529 - if (!class147.method3009(var2, var3, 0)) { // L: 2531 - var28 = null; // L: 2532 + if (class260.headIconHintSprites == null) { + var2 = UserComparator6.archive8; + var3 = class6.spriteIds.field4173; + if (!class147.method3009(var2, var3, 0)) { + var28 = null; } else { - var31 = new SpritePixels[class440.SpriteBuffer_spriteCount]; // L: 2537 + var31 = new SpritePixels[class440.SpriteBuffer_spriteCount]; var6 = 0; while (true) { if (var6 >= class440.SpriteBuffer_spriteCount) { - UserComparator3.method2529(); // L: 2551 - var28 = var31; // L: 2554 + UserComparator3.method2529(); + var28 = var31; break; } - var33 = var31[var6] = new SpritePixels(); // L: 2539 - var33.width = class432.SpriteBuffer_spriteWidth; // L: 2540 - var33.height = class432.SpriteBuffer_spriteHeight; // L: 2541 - var33.xOffset = class141.SpriteBuffer_xOffsets[var6]; // L: 2542 - var33.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; // L: 2543 - var33.subWidth = class432.SpriteBuffer_spriteWidths[var6]; // L: 2544 - var33.subHeight = class330.SpriteBuffer_spriteHeights[var6]; // L: 2545 - var8 = var33.subHeight * var33.subWidth; // L: 2546 - var9 = class369.SpriteBuffer_pixels[var6]; // L: 2547 - var33.pixels = new int[var8]; // L: 2548 + var33 = var31[var6] = new SpritePixels(); + var33.width = class432.SpriteBuffer_spriteWidth; + var33.height = class432.SpriteBuffer_spriteHeight; + var33.xOffset = class141.SpriteBuffer_xOffsets[var6]; + var33.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; + var33.subWidth = class432.SpriteBuffer_spriteWidths[var6]; + var33.subHeight = class330.SpriteBuffer_spriteHeights[var6]; + var8 = var33.subHeight * var33.subWidth; + var9 = class369.SpriteBuffer_pixels[var6]; + var33.pixels = new int[var8]; - for (var10 = 0; var10 < var8; ++var10) { // L: 2549 + for (var10 = 0; var10 < var8; ++var10) { var33.pixels[var10] = class432.SpriteBuffer_spritePalette[var9[var10] & 255]; } - ++var6; // L: 2538 + ++var6; } } - class260.headIconHintSprites = var28; // L: 2556 + class260.headIconHintSprites = var28; } else { - ++var18; // L: 2558 + ++var18; } - if (UserComparator7.mapMarkerSprites == null) { // L: 2559 - var2 = UserComparator6.archive8; // L: 2561 - var3 = class6.spriteIds.field4169; // L: 2562 - if (!class147.method3009(var2, var3, 0)) { // L: 2564 - var28 = null; // L: 2565 + if (UserComparator7.mapMarkerSprites == null) { + var2 = UserComparator6.archive8; + var3 = class6.spriteIds.field4169; + if (!class147.method3009(var2, var3, 0)) { + var28 = null; } else { - var31 = new SpritePixels[class440.SpriteBuffer_spriteCount]; // L: 2570 + var31 = new SpritePixels[class440.SpriteBuffer_spriteCount]; var6 = 0; while (true) { if (var6 >= class440.SpriteBuffer_spriteCount) { - UserComparator3.method2529(); // L: 2584 - var28 = var31; // L: 2587 + UserComparator3.method2529(); + var28 = var31; break; } - var33 = var31[var6] = new SpritePixels(); // L: 2572 - var33.width = class432.SpriteBuffer_spriteWidth; // L: 2573 - var33.height = class432.SpriteBuffer_spriteHeight; // L: 2574 - var33.xOffset = class141.SpriteBuffer_xOffsets[var6]; // L: 2575 - var33.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; // L: 2576 - var33.subWidth = class432.SpriteBuffer_spriteWidths[var6]; // L: 2577 - var33.subHeight = class330.SpriteBuffer_spriteHeights[var6]; // L: 2578 - var8 = var33.subHeight * var33.subWidth; // L: 2579 - var9 = class369.SpriteBuffer_pixels[var6]; // L: 2580 - var33.pixels = new int[var8]; // L: 2581 + var33 = var31[var6] = new SpritePixels(); + var33.width = class432.SpriteBuffer_spriteWidth; + var33.height = class432.SpriteBuffer_spriteHeight; + var33.xOffset = class141.SpriteBuffer_xOffsets[var6]; + var33.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; + var33.subWidth = class432.SpriteBuffer_spriteWidths[var6]; + var33.subHeight = class330.SpriteBuffer_spriteHeights[var6]; + var8 = var33.subHeight * var33.subWidth; + var9 = class369.SpriteBuffer_pixels[var6]; + var33.pixels = new int[var8]; - for (var10 = 0; var10 < var8; ++var10) { // L: 2582 + for (var10 = 0; var10 < var8; ++var10) { var33.pixels[var10] = class432.SpriteBuffer_spritePalette[var9[var10] & 255]; } - ++var6; // L: 2571 + ++var6; } } - UserComparator7.mapMarkerSprites = var28; // L: 2589 + UserComparator7.mapMarkerSprites = var28; } else { - ++var18; // L: 2591 + ++var18; } - if (UserComparator5.crossSprites == null) { // L: 2592 - var2 = UserComparator6.archive8; // L: 2594 - var3 = class6.spriteIds.field4168; // L: 2595 - if (!class147.method3009(var2, var3, 0)) { // L: 2597 - var28 = null; // L: 2598 + if (UserComparator5.crossSprites == null) { + var2 = UserComparator6.archive8; + var3 = class6.spriteIds.field4168; + if (!class147.method3009(var2, var3, 0)) { + var28 = null; } else { - var31 = new SpritePixels[class440.SpriteBuffer_spriteCount]; // L: 2603 + var31 = new SpritePixels[class440.SpriteBuffer_spriteCount]; var6 = 0; while (true) { if (var6 >= class440.SpriteBuffer_spriteCount) { - UserComparator3.method2529(); // L: 2617 - var28 = var31; // L: 2620 + UserComparator3.method2529(); + var28 = var31; break; } - var33 = var31[var6] = new SpritePixels(); // L: 2605 - var33.width = class432.SpriteBuffer_spriteWidth; // L: 2606 - var33.height = class432.SpriteBuffer_spriteHeight; // L: 2607 - var33.xOffset = class141.SpriteBuffer_xOffsets[var6]; // L: 2608 - var33.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; // L: 2609 - var33.subWidth = class432.SpriteBuffer_spriteWidths[var6]; // L: 2610 - var33.subHeight = class330.SpriteBuffer_spriteHeights[var6]; // L: 2611 - var8 = var33.subHeight * var33.subWidth; // L: 2612 - var9 = class369.SpriteBuffer_pixels[var6]; // L: 2613 - var33.pixels = new int[var8]; // L: 2614 + var33 = var31[var6] = new SpritePixels(); + var33.width = class432.SpriteBuffer_spriteWidth; + var33.height = class432.SpriteBuffer_spriteHeight; + var33.xOffset = class141.SpriteBuffer_xOffsets[var6]; + var33.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; + var33.subWidth = class432.SpriteBuffer_spriteWidths[var6]; + var33.subHeight = class330.SpriteBuffer_spriteHeights[var6]; + var8 = var33.subHeight * var33.subWidth; + var9 = class369.SpriteBuffer_pixels[var6]; + var33.pixels = new int[var8]; - for (var10 = 0; var10 < var8; ++var10) { // L: 2615 + for (var10 = 0; var10 < var8; ++var10) { var33.pixels[var10] = class432.SpriteBuffer_spritePalette[var9[var10] & 255]; } - ++var6; // L: 2604 + ++var6; } } - UserComparator5.crossSprites = var28; // L: 2622 + UserComparator5.crossSprites = var28; } else { - ++var18; // L: 2624 + ++var18; } - if (class111.mapDotSprites == null) { // L: 2625 - var2 = UserComparator6.archive8; // L: 2627 - var3 = class6.spriteIds.field4170; // L: 2628 - if (!class147.method3009(var2, var3, 0)) { // L: 2630 - var28 = null; // L: 2631 + if (class111.mapDotSprites == null) { + var2 = UserComparator6.archive8; + var3 = class6.spriteIds.field4170; + if (!class147.method3009(var2, var3, 0)) { + var28 = null; } else { - var31 = new SpritePixels[class440.SpriteBuffer_spriteCount]; // L: 2636 + var31 = new SpritePixels[class440.SpriteBuffer_spriteCount]; var6 = 0; while (true) { if (var6 >= class440.SpriteBuffer_spriteCount) { - UserComparator3.method2529(); // L: 2650 - var28 = var31; // L: 2653 + UserComparator3.method2529(); + var28 = var31; break; } - var33 = var31[var6] = new SpritePixels(); // L: 2638 - var33.width = class432.SpriteBuffer_spriteWidth; // L: 2639 - var33.height = class432.SpriteBuffer_spriteHeight; // L: 2640 - var33.xOffset = class141.SpriteBuffer_xOffsets[var6]; // L: 2641 - var33.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; // L: 2642 - var33.subWidth = class432.SpriteBuffer_spriteWidths[var6]; // L: 2643 - var33.subHeight = class330.SpriteBuffer_spriteHeights[var6]; // L: 2644 - var8 = var33.subWidth * var33.subHeight; // L: 2645 - var9 = class369.SpriteBuffer_pixels[var6]; // L: 2646 - var33.pixels = new int[var8]; // L: 2647 + var33 = var31[var6] = new SpritePixels(); + var33.width = class432.SpriteBuffer_spriteWidth; + var33.height = class432.SpriteBuffer_spriteHeight; + var33.xOffset = class141.SpriteBuffer_xOffsets[var6]; + var33.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; + var33.subWidth = class432.SpriteBuffer_spriteWidths[var6]; + var33.subHeight = class330.SpriteBuffer_spriteHeights[var6]; + var8 = var33.subWidth * var33.subHeight; + var9 = class369.SpriteBuffer_pixels[var6]; + var33.pixels = new int[var8]; - for (var10 = 0; var10 < var8; ++var10) { // L: 2648 + for (var10 = 0; var10 < var8; ++var10) { var33.pixels[var10] = class432.SpriteBuffer_spritePalette[var9[var10] & 255]; } - ++var6; // L: 2637 + ++var6; } } - class111.mapDotSprites = var28; // L: 2655 + class111.mapDotSprites = var28; } else { - ++var18; // L: 2657 + ++var18; } - if (AbstractWorldMapData.scrollBarSprites == null) { // L: 2658 - var2 = UserComparator6.archive8; // L: 2660 - var3 = class6.spriteIds.field4171; // L: 2661 - if (!class147.method3009(var2, var3, 0)) { // L: 2663 - var1 = null; // L: 2664 + if (AbstractWorldMapData.scrollBarSprites == null) { + var2 = UserComparator6.archive8; + var3 = class6.spriteIds.field4171; + if (!class147.method3009(var2, var3, 0)) { + var1 = null; } else { - var5 = new IndexedSprite[class440.SpriteBuffer_spriteCount]; // L: 2669 + var5 = new IndexedSprite[class440.SpriteBuffer_spriteCount]; - for (var6 = 0; var6 < class440.SpriteBuffer_spriteCount; ++var6) { // L: 2670 - var7 = var5[var6] = new IndexedSprite(); // L: 2671 - var7.width = class432.SpriteBuffer_spriteWidth; // L: 2672 - var7.height = class432.SpriteBuffer_spriteHeight; // L: 2673 - var7.xOffset = class141.SpriteBuffer_xOffsets[var6]; // L: 2674 - var7.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; // L: 2675 - var7.subWidth = class432.SpriteBuffer_spriteWidths[var6]; // L: 2676 - var7.subHeight = class330.SpriteBuffer_spriteHeights[var6]; // L: 2677 - var7.palette = class432.SpriteBuffer_spritePalette; // L: 2678 - var7.pixels = class369.SpriteBuffer_pixels[var6]; // L: 2679 + for (var6 = 0; var6 < class440.SpriteBuffer_spriteCount; ++var6) { + var7 = var5[var6] = new IndexedSprite(); + var7.width = class432.SpriteBuffer_spriteWidth; + var7.height = class432.SpriteBuffer_spriteHeight; + var7.xOffset = class141.SpriteBuffer_xOffsets[var6]; + var7.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; + var7.subWidth = class432.SpriteBuffer_spriteWidths[var6]; + var7.subHeight = class330.SpriteBuffer_spriteHeights[var6]; + var7.palette = class432.SpriteBuffer_spritePalette; + var7.pixels = class369.SpriteBuffer_pixels[var6]; } - UserComparator3.method2529(); // L: 2681 - var1 = var5; // L: 2684 + UserComparator3.method2529(); + var1 = var5; } - AbstractWorldMapData.scrollBarSprites = var1; // L: 2686 + AbstractWorldMapData.scrollBarSprites = var1; } else { - ++var18; // L: 2688 + ++var18; } - if (World.modIconSprites == null) { // L: 2689 - var2 = UserComparator6.archive8; // L: 2691 - var3 = class6.spriteIds.field4172; // L: 2692 - if (!class147.method3009(var2, var3, 0)) { // L: 2694 - var1 = null; // L: 2695 + if (World.modIconSprites == null) { + var2 = UserComparator6.archive8; + var3 = class6.spriteIds.field4172; + if (!class147.method3009(var2, var3, 0)) { + var1 = null; } else { - var5 = new IndexedSprite[class440.SpriteBuffer_spriteCount]; // L: 2700 + var5 = new IndexedSprite[class440.SpriteBuffer_spriteCount]; - for (var6 = 0; var6 < class440.SpriteBuffer_spriteCount; ++var6) { // L: 2701 - var7 = var5[var6] = new IndexedSprite(); // L: 2702 - var7.width = class432.SpriteBuffer_spriteWidth; // L: 2703 - var7.height = class432.SpriteBuffer_spriteHeight; // L: 2704 - var7.xOffset = class141.SpriteBuffer_xOffsets[var6]; // L: 2705 - var7.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; // L: 2706 - var7.subWidth = class432.SpriteBuffer_spriteWidths[var6]; // L: 2707 - var7.subHeight = class330.SpriteBuffer_spriteHeights[var6]; // L: 2708 - var7.palette = class432.SpriteBuffer_spritePalette; // L: 2709 - var7.pixels = class369.SpriteBuffer_pixels[var6]; // L: 2710 + for (var6 = 0; var6 < class440.SpriteBuffer_spriteCount; ++var6) { + var7 = var5[var6] = new IndexedSprite(); + var7.width = class432.SpriteBuffer_spriteWidth; + var7.height = class432.SpriteBuffer_spriteHeight; + var7.xOffset = class141.SpriteBuffer_xOffsets[var6]; + var7.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; + var7.subWidth = class432.SpriteBuffer_spriteWidths[var6]; + var7.subHeight = class330.SpriteBuffer_spriteHeights[var6]; + var7.palette = class432.SpriteBuffer_spritePalette; + var7.pixels = class369.SpriteBuffer_pixels[var6]; } - UserComparator3.method2529(); // L: 2712 - var1 = var5; // L: 2715 + UserComparator3.method2529(); + var1 = var5; } - World.modIconSprites = var1; // L: 2717 + World.modIconSprites = var1; } else { - ++var18; // L: 2719 + ++var18; } - if (var18 < 11) { // L: 2720 - Login.Login_loadingText = "Loading sprites - " + var18 * 100 / 12 + "%"; // L: 2721 - Login.Login_loadingPercent = 70; // L: 2722 + if (var18 < 11) { + Login.Login_loadingText = "Loading sprites - " + var18 * 100 / 12 + "%"; + Login.Login_loadingPercent = 70; } else { - AbstractFont.AbstractFont_modIconSprites = World.modIconSprites; // L: 2725 - PcmPlayer.redHintArrowSprite.normalize(); // L: 2726 - var19 = (int)(Math.random() * 21.0D) - 10; // L: 2727 - int var20 = (int)(Math.random() * 21.0D) - 10; // L: 2728 - var3 = (int)(Math.random() * 21.0D) - 10; // L: 2729 - int var21 = (int)(Math.random() * 41.0D) - 20; // L: 2730 - AbstractWorldMapData.mapSceneSprites[0].shiftColors(var21 + var19, var20 + var21, var3 + var21); // L: 2731 - Login.Login_loadingText = "Loaded sprites"; // L: 2732 - Login.Login_loadingPercent = 70; // L: 2733 - Client.titleLoadingStage = 90; // L: 2734 + AbstractFont.AbstractFont_modIconSprites = World.modIconSprites; + PcmPlayer.redHintArrowSprite.normalize(); + var19 = (int)(Math.random() * 21.0D) - 10; + int var20 = (int)(Math.random() * 21.0D) - 10; + var3 = (int)(Math.random() * 21.0D) - 10; + int var21 = (int)(Math.random() * 41.0D) - 20; + AbstractWorldMapData.mapSceneSprites[0].shiftColors(var21 + var19, var20 + var21, var3 + var21); + Login.Login_loadingText = "Loaded sprites"; + Login.Login_loadingPercent = 70; + Client.titleLoadingStage = 90; } - } else if (Client.titleLoadingStage == 90) { // L: 2737 - if (!NetSocket.archive9.isFullyLoaded()) { // L: 2738 - Login.Login_loadingText = "Loading textures - " + "0%"; // L: 2739 - Login.Login_loadingPercent = 90; // L: 2740 + } else if (Client.titleLoadingStage == 90) { + if (!NetSocket.archive9.isFullyLoaded()) { + Login.Login_loadingText = "Loading textures - " + "0%"; + Login.Login_loadingPercent = 90; } else { - ItemContainer.textureProvider = new TextureProvider(NetSocket.archive9, UserComparator6.archive8, 20, SecureRandomFuture.clientPreferences.brightness, Client.isLowDetail ? 64 : 128); // L: 2743 - Rasterizer3D.Rasterizer3D_setTextureLoader(ItemContainer.textureProvider); // L: 2744 - Rasterizer3D.Rasterizer3D_setBrightness(SecureRandomFuture.clientPreferences.brightness); // L: 2745 - Client.titleLoadingStage = 100; // L: 2746 + ItemContainer.textureProvider = new TextureProvider(NetSocket.archive9, UserComparator6.archive8, 20, SecureRandomFuture.clientPreferences.brightness, Client.isLowDetail ? 64 : 128); + Rasterizer3D.Rasterizer3D_setTextureLoader(ItemContainer.textureProvider); + Rasterizer3D.Rasterizer3D_setBrightness(SecureRandomFuture.clientPreferences.brightness); + Client.titleLoadingStage = 100; } - } else if (Client.titleLoadingStage == 100) { // L: 2749 - var18 = ItemContainer.textureProvider.getLoadedPercentage(); // L: 2750 - if (var18 < 100) { // L: 2751 - Login.Login_loadingText = "Loading textures - " + var18 + "%"; // L: 2752 - Login.Login_loadingPercent = 90; // L: 2753 + } else if (Client.titleLoadingStage == 100) { + var18 = ItemContainer.textureProvider.getLoadedPercentage(); + if (var18 < 100) { + Login.Login_loadingText = "Loading textures - " + var18 + "%"; + Login.Login_loadingPercent = 90; } else { - Login.Login_loadingText = "Loaded textures"; // L: 2756 - Login.Login_loadingPercent = 90; // L: 2757 - Client.titleLoadingStage = 110; // L: 2758 + Login.Login_loadingText = "Loaded textures"; + Login.Login_loadingPercent = 90; + Client.titleLoadingStage = 110; } - } else if (Client.titleLoadingStage == 110) { // L: 2761 - Client.mouseRecorder = new MouseRecorder(); // L: 2762 - GameEngine.taskHandler.newThreadTask(Client.mouseRecorder, 10); // L: 2763 - Login.Login_loadingText = "Loaded input handler"; // L: 2764 - Login.Login_loadingPercent = 92; // L: 2765 - Client.titleLoadingStage = 120; // L: 2766 - } else if (Client.titleLoadingStage == 120) { // L: 2769 - if (!class257.archive10.tryLoadFileByNames("huffman", "")) { // L: 2770 - Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; // L: 2771 - Login.Login_loadingPercent = 94; // L: 2772 + } else if (Client.titleLoadingStage == 110) { + Client.mouseRecorder = new MouseRecorder(); + GameEngine.taskHandler.newThreadTask(Client.mouseRecorder, 10); + Login.Login_loadingText = "Loaded input handler"; + Login.Login_loadingPercent = 92; + Client.titleLoadingStage = 120; + } else if (Client.titleLoadingStage == 120) { + if (!class257.archive10.tryLoadFileByNames("huffman", "")) { + Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; + Login.Login_loadingPercent = 94; } else { - Huffman var0 = new Huffman(class257.archive10.takeFileByNames("huffman", "")); // L: 2775 - class410.huffman = var0; // L: 2777 - Login.Login_loadingText = "Loaded wordpack"; // L: 2779 - Login.Login_loadingPercent = 94; // L: 2780 - Client.titleLoadingStage = 130; // L: 2781 + Huffman var0 = new Huffman(class257.archive10.takeFileByNames("huffman", "")); + class410.huffman = var0; + Login.Login_loadingText = "Loaded wordpack"; + Login.Login_loadingPercent = 94; + Client.titleLoadingStage = 130; } - } else if (Client.titleLoadingStage == 130) { // L: 2784 - if (!class19.archive4.isFullyLoaded()) { // L: 2785 - Login.Login_loadingText = "Loading interfaces - " + class19.archive4.loadPercent() * 4 / 5 + "%"; // L: 2786 - Login.Login_loadingPercent = 96; // L: 2787 - } else if (!TaskHandler.archive12.isFullyLoaded()) { // L: 2790 - Login.Login_loadingText = "Loading interfaces - " + (80 + TaskHandler.archive12.loadPercent() / 6) + "%"; // L: 2791 - Login.Login_loadingPercent = 96; // L: 2792 - } else if (!class1.archive13.isFullyLoaded()) { // L: 2795 - Login.Login_loadingText = "Loading interfaces - " + (96 + class1.archive13.loadPercent() / 50) + "%"; // L: 2796 - Login.Login_loadingPercent = 96; // L: 2797 + } else if (Client.titleLoadingStage == 130) { + if (!class19.archive4.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + class19.archive4.loadPercent() * 4 / 5 + "%"; + Login.Login_loadingPercent = 96; + } else if (!TaskHandler.archive12.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + (80 + TaskHandler.archive12.loadPercent() / 6) + "%"; + Login.Login_loadingPercent = 96; + } else if (!class1.archive13.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + (96 + class1.archive13.loadPercent() / 50) + "%"; + Login.Login_loadingPercent = 96; } else { - Login.Login_loadingText = "Loaded interfaces"; // L: 2800 - Login.Login_loadingPercent = 98; // L: 2801 - Client.titleLoadingStage = 140; // L: 2802 + Login.Login_loadingText = "Loaded interfaces"; + Login.Login_loadingPercent = 98; + Client.titleLoadingStage = 140; } - } else if (Client.titleLoadingStage == 140) { // L: 2805 - Login.Login_loadingPercent = 100; // L: 2806 - if (!class148.archive19.tryLoadGroupByName(WorldMapCacheName.field2768.name)) { // L: 2807 - Login.Login_loadingText = "Loading world map - " + class148.archive19.groupLoadPercentByName(WorldMapCacheName.field2768.name) / 10 + "%"; // L: 2808 + } else if (Client.titleLoadingStage == 140) { + Login.Login_loadingPercent = 100; + if (!class148.archive19.tryLoadGroupByName(WorldMapCacheName.field2768.name)) { + Login.Login_loadingText = "Loading world map - " + class148.archive19.groupLoadPercentByName(WorldMapCacheName.field2768.name) / 10 + "%"; } else { - if (Varcs.worldMap == null) { // L: 2811 - Varcs.worldMap = new WorldMap(); // L: 2812 - Varcs.worldMap.init(class148.archive19, VertexNormal.archive18, HealthBarUpdate.archive20, class136.fontBold12, Client.fontsMap, AbstractWorldMapData.mapSceneSprites); // L: 2813 + if (Varcs.worldMap == null) { + Varcs.worldMap = new WorldMap(); + Varcs.worldMap.init(class148.archive19, VertexNormal.archive18, HealthBarUpdate.archive20, class136.fontBold12, Client.fontsMap, AbstractWorldMapData.mapSceneSprites); } - Login.Login_loadingText = "Loaded world map"; // L: 2815 - Client.titleLoadingStage = 150; // L: 2816 + Login.Login_loadingText = "Loaded world map"; + Client.titleLoadingStage = 150; } - } else if (Client.titleLoadingStage == 150) { // L: 2819 - VertexNormal.updateGameState(10); // L: 2820 + } else if (Client.titleLoadingStage == 150) { + VertexNormal.updateGameState(10); } } } - } // L: 2179 2185 2211 2238 2258 2289 2306 2315 2327 2333 2339 2421 2723 2735 2741 2747 2754 2759 2767 2773 2782 2788 2793 2798 2803 2809 2817 2821 2823 + } @ObfuscatedName("iw") @ObfuscatedSignature( @@ -710,6 +710,6 @@ public class UserComparator10 extends AbstractUserComparator { garbageValue = "-1832124278" ) static final int method2543() { - return Client.menuOptionsCount - 1; // L: 10059 + return Client.menuOptionsCount - 1; } } diff --git a/runescape-client/src/main/java/UserComparator2.java b/runescape-client/src/main/java/UserComparator2.java index 76a78221e9..ef9f1d2cc7 100644 --- a/runescape-client/src/main/java/UserComparator2.java +++ b/runescape-client/src/main/java/UserComparator2.java @@ -12,8 +12,8 @@ public class UserComparator2 implements Comparator { final boolean reversed; public UserComparator2(boolean var1) { - this.reversed = var1; // L: 10 - } // L: 11 + this.reversed = var1; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -22,15 +22,15 @@ public class UserComparator2 implements Comparator { ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { - return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); // L: 14 + return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); } public boolean equals(Object var1) { - return super.equals(var1); // L: 22 + return super.equals(var1); } public int compare(Object var1, Object var2) { - return this.compare_bridged((User)var1, (User)var2); // L: 18 + return this.compare_bridged((User)var1, (User)var2); } @ObfuscatedName("b") @@ -39,20 +39,20 @@ public class UserComparator2 implements Comparator { garbageValue = "-1521057603" ) public static final boolean method7617(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4) { - int var5 = var0; // L: 137 - int var6 = var1; // L: 138 - byte var7 = 64; // L: 139 - byte var8 = 64; // L: 140 - int var9 = var0 - var7; // L: 141 - int var10 = var1 - var8; // L: 142 - class186.directions[var7][var8] = 99; // L: 143 - class186.distances[var7][var8] = 0; // L: 144 - byte var11 = 0; // L: 145 - int var12 = 0; // L: 146 - class186.bufferX[var11] = var0; // L: 147 + int var5 = var0; + int var6 = var1; + byte var7 = 64; + byte var8 = 64; + int var9 = var0 - var7; + int var10 = var1 - var8; + class186.directions[var7][var8] = 99; + class186.distances[var7][var8] = 0; + byte var11 = 0; + int var12 = 0; + class186.bufferX[var11] = var0; int var20 = var11 + 1; - class186.bufferY[var11] = var1; // L: 148 - int[][] var13 = var4.flags; // L: 149 + class186.bufferY[var11] = var1; + int[][] var13 = var4.flags; while (true) { label305: @@ -68,181 +68,181 @@ public class UserComparator2 implements Comparator { do { label282: do { - if (var12 == var20) { // L: 150 - class186.field2129 = var5; // L: 269 - class186.field2130 = var6; // L: 270 - return false; // L: 271 + if (var12 == var20) { + class186.field2129 = var5; + class186.field2130 = var6; + return false; } - var5 = class186.bufferX[var12]; // L: 151 - var6 = class186.bufferY[var12]; // L: 152 - var12 = var12 + 1 & 4095; // L: 153 - var18 = var5 - var9; // L: 154 - var19 = var6 - var10; // L: 155 - var14 = var5 - var4.xInset; // L: 156 - var15 = var6 - var4.yInset; // L: 157 - if (var3.hasArrived(var2, var5, var6, var4)) { // L: 158 - class186.field2129 = var5; // L: 159 - class186.field2130 = var6; // L: 160 - return true; // L: 161 + var5 = class186.bufferX[var12]; + var6 = class186.bufferY[var12]; + var12 = var12 + 1 & 4095; + var18 = var5 - var9; + var19 = var6 - var10; + var14 = var5 - var4.xInset; + var15 = var6 - var4.yInset; + if (var3.hasArrived(var2, var5, var6, var4)) { + class186.field2129 = var5; + class186.field2130 = var6; + return true; } - var16 = class186.distances[var18][var19] + 1; // L: 163 - if (var18 > 0 && class186.directions[var18 - 1][var19] == 0 && (var13[var14 - 1][var15] & 19136782) == 0 && (var13[var14 - 1][var15 + var2 - 1] & 19136824) == 0) { // L: 164 165 166 167 + var16 = class186.distances[var18][var19] + 1; + if (var18 > 0 && class186.directions[var18 - 1][var19] == 0 && (var13[var14 - 1][var15] & 19136782) == 0 && (var13[var14 - 1][var15 + var2 - 1] & 19136824) == 0) { var17 = 1; while (true) { if (var17 >= var2 - 1) { - class186.bufferX[var20] = var5 - 1; // L: 171 - class186.bufferY[var20] = var6; // L: 172 - var20 = var20 + 1 & 4095; // L: 173 - class186.directions[var18 - 1][var19] = 2; // L: 174 - class186.distances[var18 - 1][var19] = var16; // L: 175 + class186.bufferX[var20] = var5 - 1; + class186.bufferY[var20] = var6; + var20 = var20 + 1 & 4095; + class186.directions[var18 - 1][var19] = 2; + class186.distances[var18 - 1][var19] = var16; break; } - if ((var13[var14 - 1][var15 + var17] & 19136830) != 0) { // L: 169 + if ((var13[var14 - 1][var15 + var17] & 19136830) != 0) { break; } - ++var17; // L: 168 + ++var17; } } - if (var18 < 128 - var2 && class186.directions[var18 + 1][var19] == 0 && (var13[var14 + var2][var15] & 19136899) == 0 && (var13[var14 + var2][var15 + var2 - 1] & 19136992) == 0) { // L: 177 178 179 180 + if (var18 < 128 - var2 && class186.directions[var18 + 1][var19] == 0 && (var13[var14 + var2][var15] & 19136899) == 0 && (var13[var14 + var2][var15 + var2 - 1] & 19136992) == 0) { var17 = 1; while (true) { if (var17 >= var2 - 1) { - class186.bufferX[var20] = var5 + 1; // L: 184 - class186.bufferY[var20] = var6; // L: 185 - var20 = var20 + 1 & 4095; // L: 186 - class186.directions[var18 + 1][var19] = 8; // L: 187 - class186.distances[var18 + 1][var19] = var16; // L: 188 + class186.bufferX[var20] = var5 + 1; + class186.bufferY[var20] = var6; + var20 = var20 + 1 & 4095; + class186.directions[var18 + 1][var19] = 8; + class186.distances[var18 + 1][var19] = var16; break; } - if ((var13[var14 + var2][var17 + var15] & 19136995) != 0) { // L: 182 + if ((var13[var14 + var2][var17 + var15] & 19136995) != 0) { break; } - ++var17; // L: 181 + ++var17; } } - if (var19 > 0 && class186.directions[var18][var19 - 1] == 0 && (var13[var14][var15 - 1] & 19136782) == 0 && (var13[var14 + var2 - 1][var15 - 1] & 19136899) == 0) { // L: 190 191 192 193 + if (var19 > 0 && class186.directions[var18][var19 - 1] == 0 && (var13[var14][var15 - 1] & 19136782) == 0 && (var13[var14 + var2 - 1][var15 - 1] & 19136899) == 0) { var17 = 1; while (true) { if (var17 >= var2 - 1) { - class186.bufferX[var20] = var5; // L: 197 - class186.bufferY[var20] = var6 - 1; // L: 198 - var20 = var20 + 1 & 4095; // L: 199 - class186.directions[var18][var19 - 1] = 1; // L: 200 - class186.distances[var18][var19 - 1] = var16; // L: 201 + class186.bufferX[var20] = var5; + class186.bufferY[var20] = var6 - 1; + var20 = var20 + 1 & 4095; + class186.directions[var18][var19 - 1] = 1; + class186.distances[var18][var19 - 1] = var16; break; } - if ((var13[var14 + var17][var15 - 1] & 19136911) != 0) { // L: 195 + if ((var13[var14 + var17][var15 - 1] & 19136911) != 0) { break; } - ++var17; // L: 194 + ++var17; } } - if (var19 < 128 - var2 && class186.directions[var18][var19 + 1] == 0 && (var13[var14][var15 + var2] & 19136824) == 0 && (var13[var14 + var2 - 1][var15 + var2] & 19136992) == 0) { // L: 203 204 205 206 + if (var19 < 128 - var2 && class186.directions[var18][var19 + 1] == 0 && (var13[var14][var15 + var2] & 19136824) == 0 && (var13[var14 + var2 - 1][var15 + var2] & 19136992) == 0) { var17 = 1; while (true) { if (var17 >= var2 - 1) { - class186.bufferX[var20] = var5; // L: 210 - class186.bufferY[var20] = var6 + 1; // L: 211 - var20 = var20 + 1 & 4095; // L: 212 - class186.directions[var18][var19 + 1] = 4; // L: 213 - class186.distances[var18][var19 + 1] = var16; // L: 214 + class186.bufferX[var20] = var5; + class186.bufferY[var20] = var6 + 1; + var20 = var20 + 1 & 4095; + class186.directions[var18][var19 + 1] = 4; + class186.distances[var18][var19 + 1] = var16; break; } - if ((var13[var14 + var17][var15 + var2] & 19137016) != 0) { // L: 208 + if ((var13[var14 + var17][var15 + var2] & 19137016) != 0) { break; } - ++var17; // L: 207 + ++var17; } } - if (var18 > 0 && var19 > 0 && class186.directions[var18 - 1][var19 - 1] == 0 && (var13[var14 - 1][var15 - 1] & 19136782) == 0) { // L: 216 217 218 + if (var18 > 0 && var19 > 0 && class186.directions[var18 - 1][var19 - 1] == 0 && (var13[var14 - 1][var15 - 1] & 19136782) == 0) { var17 = 1; while (true) { if (var17 >= var2) { - class186.bufferX[var20] = var5 - 1; // L: 223 - class186.bufferY[var20] = var6 - 1; // L: 224 - var20 = var20 + 1 & 4095; // L: 225 - class186.directions[var18 - 1][var19 - 1] = 3; // L: 226 - class186.distances[var18 - 1][var19 - 1] = var16; // L: 227 + class186.bufferX[var20] = var5 - 1; + class186.bufferY[var20] = var6 - 1; + var20 = var20 + 1 & 4095; + class186.directions[var18 - 1][var19 - 1] = 3; + class186.distances[var18 - 1][var19 - 1] = var16; break; } - if ((var13[var14 - 1][var17 + (var15 - 1)] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 - 1] & 19136911) != 0) { // L: 220 221 + if ((var13[var14 - 1][var17 + (var15 - 1)] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 - 1] & 19136911) != 0) { break; } - ++var17; // L: 219 + ++var17; } } - if (var18 < 128 - var2 && var19 > 0 && class186.directions[var18 + 1][var19 - 1] == 0 && (var13[var14 + var2][var15 - 1] & 19136899) == 0) { // L: 229 230 231 + if (var18 < 128 - var2 && var19 > 0 && class186.directions[var18 + 1][var19 - 1] == 0 && (var13[var14 + var2][var15 - 1] & 19136899) == 0) { var17 = 1; while (true) { if (var17 >= var2) { - class186.bufferX[var20] = var5 + 1; // L: 236 - class186.bufferY[var20] = var6 - 1; // L: 237 - var20 = var20 + 1 & 4095; // L: 238 - class186.directions[var18 + 1][var19 - 1] = 9; // L: 239 - class186.distances[var18 + 1][var19 - 1] = var16; // L: 240 + class186.bufferX[var20] = var5 + 1; + class186.bufferY[var20] = var6 - 1; + var20 = var20 + 1 & 4095; + class186.directions[var18 + 1][var19 - 1] = 9; + class186.distances[var18 + 1][var19 - 1] = var16; break; } - if ((var13[var14 + var2][var17 + (var15 - 1)] & 19136995) != 0 || (var13[var17 + var14][var15 - 1] & 19136911) != 0) { // L: 233 234 + if ((var13[var14 + var2][var17 + (var15 - 1)] & 19136995) != 0 || (var13[var17 + var14][var15 - 1] & 19136911) != 0) { break; } - ++var17; // L: 232 + ++var17; } } - if (var18 > 0 && var19 < 128 - var2 && class186.directions[var18 - 1][var19 + 1] == 0 && (var13[var14 - 1][var15 + var2] & 19136824) == 0) { // L: 242 243 244 - for (var17 = 1; var17 < var2; ++var17) { // L: 245 - if ((var13[var14 - 1][var15 + var17] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 + var2] & 19137016) != 0) { // L: 246 247 + if (var18 > 0 && var19 < 128 - var2 && class186.directions[var18 - 1][var19 + 1] == 0 && (var13[var14 - 1][var15 + var2] & 19136824) == 0) { + for (var17 = 1; var17 < var2; ++var17) { + if ((var13[var14 - 1][var15 + var17] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 + var2] & 19137016) != 0) { continue label282; } } - class186.bufferX[var20] = var5 - 1; // L: 249 - class186.bufferY[var20] = var6 + 1; // L: 250 - var20 = var20 + 1 & 4095; // L: 251 - class186.directions[var18 - 1][var19 + 1] = 6; // L: 252 - class186.distances[var18 - 1][var19 + 1] = var16; // L: 253 + class186.bufferX[var20] = var5 - 1; + class186.bufferY[var20] = var6 + 1; + var20 = var20 + 1 & 4095; + class186.directions[var18 - 1][var19 + 1] = 6; + class186.distances[var18 - 1][var19 + 1] = var16; } - } while(var18 >= 128 - var2); // L: 255 + } while(var18 >= 128 - var2); } while(var19 >= 128 - var2); - } while(class186.directions[var18 + 1][var19 + 1] != 0); // L: 256 - } while((var13[var14 + var2][var15 + var2] & 19136992) != 0); // L: 257 + } while(class186.directions[var18 + 1][var19 + 1] != 0); + } while((var13[var14 + var2][var15 + var2] & 19136992) != 0); - for (var17 = 1; var17 < var2; ++var17) { // L: 258 - if ((var13[var17 + var14][var15 + var2] & 19137016) != 0 || (var13[var14 + var2][var17 + var15] & 19136995) != 0) { // L: 259 260 + for (var17 = 1; var17 < var2; ++var17) { + if ((var13[var17 + var14][var15 + var2] & 19137016) != 0 || (var13[var14 + var2][var17 + var15] & 19136995) != 0) { continue label305; } } - class186.bufferX[var20] = var5 + 1; // L: 262 - class186.bufferY[var20] = var6 + 1; // L: 263 - var20 = var20 + 1 & 4095; // L: 264 - class186.directions[var18 + 1][var19 + 1] = 12; // L: 265 - class186.distances[var18 + 1][var19 + 1] = var16; // L: 266 + class186.bufferX[var20] = var5 + 1; + class186.bufferY[var20] = var6 + 1; + var20 = var20 + 1 & 4095; + class186.directions[var18 + 1][var19 + 1] = 12; + class186.distances[var18 + 1][var19 + 1] = var16; } } } diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java index 140c81ca28..e3b39cc450 100644 --- a/runescape-client/src/main/java/UserComparator3.java +++ b/runescape-client/src/main/java/UserComparator3.java @@ -43,8 +43,8 @@ public class UserComparator3 extends AbstractUserComparator { final boolean reversed; public UserComparator3(boolean var1) { - this.reversed = var1; // L: 10 - } // L: 11 + this.reversed = var1; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -53,15 +53,15 @@ public class UserComparator3 extends AbstractUserComparator { ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (var2.world != var1.world) { // L: 14 - return this.reversed ? var1.world - var2.world : var2.world - var1.world; // L: 15 + if (var2.world != var1.world) { + return this.reversed ? var1.world - var2.world : var2.world - var1.world; } else { - return this.compareUser(var1, var2); // L: 17 + return this.compareUser(var1, var2); } } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 + return this.compareBuddy((Buddy)var1, (Buddy)var2); } @ObfuscatedName("c") @@ -71,55 +71,55 @@ public class UserComparator3 extends AbstractUserComparator { ) @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 + ReflectionCheck var1 = (ReflectionCheck)class33.reflectionChecks.last(); + if (var1 != null) { + int var2 = var0.offset; + var0.writeInt(var1.id); - for (int var3 = 0; var3 < var1.size; ++var3) { // L: 29 - if (var1.creationErrors[var3] != 0) { // L: 30 - var0.writeByte(var1.creationErrors[var3]); // L: 31 + for (int var3 = 0; var3 < var1.size; ++var3) { + if (var1.creationErrors[var3] != 0) { + var0.writeByte(var1.creationErrors[var3]); } else { try { - int var4 = var1.operations[var3]; // L: 35 + int var4 = var1.operations[var3]; 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 (var4 == 0) { + var5 = var1.fields[var3]; + var6 = Reflection.getInt(var5, (Object)null); + var0.writeByte(0); + var0.writeInt(var6); + } else if (var4 == 1) { + var5 = var1.fields[var3]; + Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); + var0.writeByte(0); + } else if (var4 == 2) { + var5 = var1.fields[var3]; + var6 = var5.getModifiers(); + var0.writeByte(0); + var0.writeInt(var6); } Method var25; - if (var4 != 3) { // L: 53 - if (var4 == 4) { // L: 73 - var25 = var1.methods[var3]; // L: 74 + if (var4 != 3) { + if (var4 == 4) { + var25 = var1.methods[var3]; var6 = var25.getModifiers(); var0.writeByte(0); var0.writeInt(var6); } } else { - var25 = var1.methods[var3]; // L: 54 - byte[][] var10 = var1.arguments[var3]; // L: 55 - Object[] var7 = new Object[var10.length]; // L: 56 + var25 = var1.methods[var3]; + byte[][] var10 = var1.arguments[var3]; + Object[] var7 = new Object[var10.length]; - 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 + for (int var8 = 0; var8 < var10.length; ++var8) { + ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); + var7[var8] = var9.readObject(); } - Object var11 = Reflection.invoke(var25, (Object)null, var7); // L: 61 - if (var11 == null) { // L: 62 + Object var11 = Reflection.invoke(var25, (Object)null, var7); + if (var11 == null) { var0.writeByte(0); } else if (var11 instanceof Number) { var0.writeByte(1); @@ -131,38 +131,38 @@ public class UserComparator3 extends AbstractUserComparator { var0.writeByte(4); } } - } 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 + } catch (ClassNotFoundException var13) { + var0.writeByte(-10); + } catch (InvalidClassException var14) { + var0.writeByte(-11); + } catch (StreamCorruptedException var15) { + var0.writeByte(-12); + } catch (OptionalDataException var16) { + var0.writeByte(-13); + } catch (IllegalAccessException var17) { + var0.writeByte(-14); + } catch (IllegalArgumentException var18) { + var0.writeByte(-15); + } catch (InvocationTargetException var19) { + var0.writeByte(-16); + } catch (SecurityException var20) { + var0.writeByte(-17); + } catch (IOException var21) { + var0.writeByte(-18); + } catch (NullPointerException var22) { + var0.writeByte(-19); + } catch (Exception var23) { + var0.writeByte(-20); + } catch (Throwable var24) { + var0.writeByte(-21); } } } - var0.writeCrc(var2); // L: 117 - var1.remove(); // L: 118 + var0.writeCrc(var2); + var1.remove(); } - } // L: 119 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -171,24 +171,24 @@ public class UserComparator3 extends AbstractUserComparator { ) @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 + int[] var2 = new int[4]; + int[] var3 = new int[4]; + var2[0] = var0; + var3[0] = var1; + int var4 = 1; - for (int var5 = 0; var5 < 4; ++var5) { // 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 + for (int var5 = 0; var5 < 4; ++var5) { + if (World.World_sortOption1[var5] != var0) { + var2[var4] = World.World_sortOption1[var5]; + var3[var4] = World.World_sortOption2[var5]; + ++var4; } } - World.World_sortOption1 = var2; // L: 75 - World.World_sortOption2 = var3; // L: 76 - UserComparator4.sortWorlds(class334.World_worlds, 0, class334.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 77 - } // L: 78 + World.World_sortOption1 = var2; + World.World_sortOption2 = var3; + UserComparator4.sortWorlds(class334.World_worlds, 0, class334.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); + } @ObfuscatedName("n") @ObfuscatedSignature( @@ -196,13 +196,13 @@ public class UserComparator3 extends AbstractUserComparator { garbageValue = "101" ) public static void method2529() { - class141.SpriteBuffer_xOffsets = null; // L: 146 - RouteStrategy.SpriteBuffer_yOffsets = null; // L: 147 - class432.SpriteBuffer_spriteWidths = null; // L: 148 - class330.SpriteBuffer_spriteHeights = null; // L: 149 - class432.SpriteBuffer_spritePalette = null; // L: 150 - class369.SpriteBuffer_pixels = null; // L: 151 - } // L: 152 + class141.SpriteBuffer_xOffsets = null; + RouteStrategy.SpriteBuffer_yOffsets = null; + class432.SpriteBuffer_spriteWidths = null; + class330.SpriteBuffer_spriteHeights = null; + class432.SpriteBuffer_spritePalette = null; + class369.SpriteBuffer_pixels = null; + } @ObfuscatedName("r") @ObfuscatedSignature( @@ -211,11 +211,11 @@ public class UserComparator3 extends AbstractUserComparator { ) @Export("Widget_setKeyRate") static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { - if (var0.field3302 == null) { // L: 996 - throw new RuntimeException(); // L: 997 + if (var0.field3302 == null) { + throw new RuntimeException(); } else { - var0.field3302[var1] = var2; // L: 999 - var0.field3303[var1] = var3; // L: 1000 + var0.field3302[var1] = var2; + var0.field3303[var1] = var3; } - } // L: 1001 + } } diff --git a/runescape-client/src/main/java/UserComparator4.java b/runescape-client/src/main/java/UserComparator4.java index 59dfb24b5d..bd93c0d7d1 100644 --- a/runescape-client/src/main/java/UserComparator4.java +++ b/runescape-client/src/main/java/UserComparator4.java @@ -12,8 +12,8 @@ public class UserComparator4 implements Comparator { final boolean reversed; public UserComparator4(boolean var1) { - this.reversed = var1; // L: 10 - } // L: 11 + this.reversed = var1; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -22,15 +22,15 @@ public class UserComparator4 implements Comparator { ) @Export("compare_bridged") int compare_bridged(Buddy var1, Buddy var2) { - return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; // L: 14 + return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; } public int compare(Object var1, Object var2) { - return this.compare_bridged((Buddy)var1, (Buddy)var2); // L: 18 + return this.compare_bridged((Buddy)var1, (Buddy)var2); } public boolean equals(Object var1) { - return super.equals(var1); // L: 22 + return super.equals(var1); } @ObfuscatedName("c") @@ -39,14 +39,14 @@ public class UserComparator4 implements Comparator { garbageValue = "801134739" ) static final int method2508(LoginType var0) { - if (var0 == null) { // L: 16 - return 12; // L: 17 + if (var0 == null) { + return 12; } else { - switch(var0.field4406) { // L: 19 + switch(var0.field4406) { case 5: - return 20; // L: 21 + return 20; default: - return 12; // L: 23 + return 12; } } } @@ -58,110 +58,110 @@ public class UserComparator4 implements Comparator { ) @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 + if (var1 < var2) { + int var5 = var1 - 1; + int var6 = var2 + 1; + int var7 = (var2 + var1) / 2; + World var8 = var0[var7]; + var0[var7] = var0[var1]; + var0[var1] = var8; - while (var5 < var6) { // L: 88 - boolean var9 = true; // L: 89 + while (var5 < var6) { + boolean var9 = true; int var10; int var11; int var12; do { - --var6; // L: 91 + --var6; - 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 + for (var10 = 0; var10 < 4; ++var10) { + if (var3[var10] == 2) { + var11 = var0[var6].index; + var12 = var8.index; + } else if (var3[var10] == 1) { + var11 = var0[var6].population; + var12 = var8.population; + if (var11 == -1 && var4[var10] == 1) { var11 = 2001; } - if (var12 == -1 && var4[var10] == 1) { // L: 103 + if (var12 == -1 && var4[var10] == 1) { 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 if (var3[var10] == 3) { + var11 = var0[var6].isMembersOnly() ? 1 : 0; + var12 = var8.isMembersOnly() ? 1 : 0; } else { - var11 = var0[var6].id; // L: 110 - var12 = var8.id; // L: 111 + var11 = var0[var6].id; + var12 = var8.id; } - if (var12 != var11) { // L: 113 - if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { // L: 116 117 - var9 = false; // L: 119 + if (var12 != var11) { + if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { + var9 = false; } break; } - if (var10 == 3) { // L: 114 + if (var10 == 3) { var9 = false; } } } while(var9); - var9 = true; // L: 124 + var9 = true; do { - ++var5; // L: 126 + ++var5; - 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 + for (var10 = 0; var10 < 4; ++var10) { + if (var3[var10] == 2) { + var11 = var0[var5].index; + var12 = var8.index; + } else if (var3[var10] == 1) { + var11 = var0[var5].population; + var12 = var8.population; + if (var11 == -1 && var4[var10] == 1) { var11 = 2001; } - if (var12 == -1 && var4[var10] == 1) { // L: 138 + if (var12 == -1 && var4[var10] == 1) { 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 if (var3[var10] == 3) { + var11 = var0[var5].isMembersOnly() ? 1 : 0; + var12 = var8.isMembersOnly() ? 1 : 0; } else { - var11 = var0[var5].id; // L: 145 - var12 = var8.id; // L: 146 + var11 = var0[var5].id; + var12 = var8.id; } - if (var12 != var11) { // L: 148 - if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { // L: 151 152 - var9 = false; // L: 154 + if (var12 != var11) { + if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { + var9 = false; } break; } - if (var10 == 3) { // L: 149 + if (var10 == 3) { var9 = false; } } } while(var9); - if (var5 < var6) { // L: 159 - World var13 = var0[var5]; // L: 160 - var0[var5] = var0[var6]; // L: 161 - var0[var6] = var13; // L: 162 + if (var5 < var6) { + World var13 = var0[var5]; + var0[var5] = var0[var6]; + var0[var6] = var13; } } - sortWorlds(var0, var1, var6, var3, var4); // L: 165 - sortWorlds(var0, var6 + 1, var2, var3, var4); // L: 166 + sortWorlds(var0, var1, var6, var3, var4); + sortWorlds(var0, var6 + 1, var2, var3, var4); } - } // L: 168 + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -169,31 +169,31 @@ public class UserComparator4 implements Comparator { garbageValue = "5664" ) static void method2504(class115 var0, float[] var1, float[] var2) { - if (var0 != null) { // L: 288 - var0.field1406 = var1[0]; // L: 291 - float var3 = var1[3] - var1[0]; // L: 292 - float var4 = var2[3] - var2[0]; // L: 293 - float var5 = var1[1] - var1[0]; // L: 294 - float var6 = 0.0F; // L: 295 - float var7 = 0.0F; // L: 296 - if ((double)var5 != 0.0D) { // L: 297 - var6 = (var2[1] - var2[0]) / var5; // L: 298 + if (var0 != null) { + var0.field1406 = var1[0]; + float var3 = var1[3] - var1[0]; + float var4 = var2[3] - var2[0]; + float var5 = var1[1] - var1[0]; + float var6 = 0.0F; + float var7 = 0.0F; + if ((double)var5 != 0.0D) { + var6 = (var2[1] - var2[0]) / var5; } - var5 = var1[3] - var1[2]; // L: 300 - if (0.0D != (double)var5) { // L: 301 - var7 = (var2[3] - var2[2]) / var5; // L: 302 + var5 = var1[3] - var1[2]; + if (0.0D != (double)var5) { + var7 = (var2[3] - var2[2]) / var5; } - float var8 = 1.0F / (var3 * var3); // L: 304 - float var9 = var6 * var3; // L: 305 - float var10 = var7 * var3; // L: 306 - var0.field1401[0] = var8 * (var9 + var10 - var4 - var4) / var3; // L: 307 - var0.field1401[1] = (var4 + var4 + var4 - var9 - var9 - var10) * var8; // L: 308 - var0.field1401[2] = var6; // L: 309 - var0.field1401[3] = var2[0]; // L: 310 + float var8 = 1.0F / (var3 * var3); + float var9 = var6 * var3; + float var10 = var7 * var3; + var0.field1401[0] = var8 * (var9 + var10 - var4 - var4) / var3; + var0.field1401[1] = (var4 + var4 + var4 - var9 - var9 - var10) * var8; + var0.field1401[2] = var6; + var0.field1401[3] = var2[0]; } - } // L: 289 311 + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -201,14 +201,14 @@ public class UserComparator4 implements Comparator { garbageValue = "-82" ) static int method2506(World var0, World var1, int var2, boolean var3, int var4, boolean var5) { - int var6 = ReflectionCheck.compareWorlds(var0, var1, var2, var3); // L: 199 - if (var6 != 0) { // L: 200 - return var3 ? -var6 : var6; // L: 201 - } else if (var4 == -1) { // L: 204 + int var6 = ReflectionCheck.compareWorlds(var0, var1, var2, var3); + if (var6 != 0) { + return var3 ? -var6 : var6; + } else if (var4 == -1) { return 0; } else { - int var7 = ReflectionCheck.compareWorlds(var0, var1, var4, var5); // L: 205 - return var5 ? -var7 : var7; // L: 206 + int var7 = ReflectionCheck.compareWorlds(var0, var1, var4, var5); + return var5 ? -var7 : var7; } } @@ -218,21 +218,21 @@ public class UserComparator4 implements Comparator { garbageValue = "-452202636" ) static void method2499(String var0) { - class1.field3 = var0; // L: 12602 + class1.field3 = var0; try { - String var1 = class295.client.getParameter(Integer.toString(18)); // L: 12604 - String var2 = class295.client.getParameter(Integer.toString(13)); // L: 12605 - String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; // L: 12606 - if (var0.length() == 0) { // L: 12607 + String var1 = class295.client.getParameter(Integer.toString(18)); + String var2 = class295.client.getParameter(Integer.toString(13)); + String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; + if (var0.length() == 0) { var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; } else { - var3 = var3 + "; Expires=" + class13.method195(Ignored.method6459() + 94608000000L) + "; Max-Age=" + 94608000L; // L: 12608 + var3 = var3 + "; Expires=" + class13.method195(Ignored.method6459() + 94608000000L) + "; Max-Age=" + 94608000L; } - class27.method432(class295.client, "document.cookie=\"" + var3 + "\""); // L: 12609 - } catch (Throwable var4) { // L: 12611 + class27.method432(class295.client, "document.cookie=\"" + var3 + "\""); + } catch (Throwable var4) { } - } // L: 12612 + } } diff --git a/runescape-client/src/main/java/UserComparator5.java b/runescape-client/src/main/java/UserComparator5.java index a5c03603f7..95ca26c656 100644 --- a/runescape-client/src/main/java/UserComparator5.java +++ b/runescape-client/src/main/java/UserComparator5.java @@ -26,8 +26,8 @@ public class UserComparator5 extends AbstractUserComparator { final boolean reversed; public UserComparator5(boolean var1) { - this.reversed = var1; // L: 10 - } // L: 11 + this.reversed = var1; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -36,19 +36,19 @@ public class UserComparator5 extends AbstractUserComparator { ) @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) { // L: 18 + } else if (var2.world != 0) { 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("c") @@ -58,19 +58,19 @@ public class UserComparator5 extends AbstractUserComparator { ) @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 + SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); + if (var1 != null) { return var1; } else { - byte[] var2 = Canvas.SequenceDefinition_archive.takeFile(12, var0); // L: 48 - var1 = new SequenceDefinition(); // L: 49 - if (var2 != null) { // L: 50 + byte[] var2 = Canvas.SequenceDefinition_archive.takeFile(12, var0); + var1 = new SequenceDefinition(); + if (var2 != null) { var1.decode(new Buffer(var2)); } - var1.postDecode(); // L: 51 - SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); // L: 52 - return var1; // L: 53 + var1.postDecode(); + SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); + return var1; } } @@ -81,7 +81,7 @@ public class UserComparator5 extends AbstractUserComparator { ) @Export("colorStartTag") static String colorStartTag(int var0) { - return ""; // L: 22 + return ""; } @ObfuscatedName("g") @@ -90,9 +90,9 @@ public class UserComparator5 extends AbstractUserComparator { garbageValue = "-1519607580" ) public static void method2524() { - ObjectComposition.ObjectDefinition_cached.clear(); // L: 415 - ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 416 - ObjectComposition.ObjectDefinition_cachedEntities.clear(); // L: 417 - ObjectComposition.ObjectDefinition_cachedModels.clear(); // L: 418 - } // L: 419 + ObjectComposition.ObjectDefinition_cached.clear(); + ObjectComposition.ObjectDefinition_cachedModelData.clear(); + ObjectComposition.ObjectDefinition_cachedEntities.clear(); + ObjectComposition.ObjectDefinition_cachedModels.clear(); + } } diff --git a/runescape-client/src/main/java/UserComparator6.java b/runescape-client/src/main/java/UserComparator6.java index 057fe18832..406cd23479 100644 --- a/runescape-client/src/main/java/UserComparator6.java +++ b/runescape-client/src/main/java/UserComparator6.java @@ -17,8 +17,8 @@ public class UserComparator6 extends AbstractUserComparator { final boolean reversed; public UserComparator6(boolean var1) { - this.reversed = var1; // L: 10 - } // L: 11 + this.reversed = var1; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -27,15 +27,15 @@ public class UserComparator6 extends AbstractUserComparator { ) @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 + return this.compareUser(var1, var2); } } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 + return this.compareBuddy((Buddy)var1, (Buddy)var2); } @ObfuscatedName("c") @@ -45,67 +45,67 @@ public class UserComparator6 extends AbstractUserComparator { ) @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 + ItemComposition var1 = (ItemComposition)ItemComposition.ItemDefinition_cached.get((long)var0); + if (var1 != null) { 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 + byte[] var2 = ItemComposition.ItemDefinition_archive.takeFile(10, var0); + var1 = new ItemComposition(); + var1.id = var0; + if (var2 != null) { var1.decode(new Buffer(var2)); } - var1.post(); // L: 90 - if (var1.noteTemplate != -1) { // L: 91 + var1.post(); + if (var1.noteTemplate != -1) { var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note)); } - if (var1.notedId != -1) { // L: 92 + if (var1.notedId != -1) { var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId)); } - if (var1.placeholderTemplate != -1) { // L: 93 + if (var1.placeholderTemplate != -1) { var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder)); } - if (!ItemComposition.ItemDefinition_inMembersWorld && var1.isMembersOnly) { // L: 94 - var1.name = "Members object"; // L: 95 - var1.isTradable = false; // L: 96 + if (!ItemComposition.ItemDefinition_inMembersWorld && var1.isMembersOnly) { + var1.name = "Members object"; + var1.isTradable = false; int var3; - for (var3 = 0; var3 < var1.groundActions.length; ++var3) { // L: 97 - var1.groundActions[var3] = null; // L: 98 + for (var3 = 0; var3 < var1.groundActions.length; ++var3) { + var1.groundActions[var3] = null; } - for (var3 = 0; var3 < var1.inventoryActions.length; ++var3) { // L: 100 - if (var3 != 4) { // L: 101 - var1.inventoryActions[var3] = null; // L: 102 + for (var3 = 0; var3 < var1.inventoryActions.length; ++var3) { + if (var3 != 4) { + var1.inventoryActions[var3] = null; } } - var1.shiftClickIndex = -2; // L: 105 - var1.team = 0; // L: 106 - if (var1.params != null) { // L: 107 - boolean var6 = false; // L: 108 + var1.shiftClickIndex = -2; + var1.team = 0; + if (var1.params != null) { + boolean var6 = false; - for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { // L: 109 - ParamComposition var5 = VerticalAlignment.getParamDefinition((int)var4.key); // L: 110 - if (var5.autoDisable) { // L: 111 + for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { + ParamComposition var5 = VerticalAlignment.getParamDefinition((int)var4.key); + if (var5.autoDisable) { var4.remove(); } else { - var6 = true; // L: 112 + var6 = true; } } if (!var6) { - var1.params = null; // L: 114 + var1.params = null; } } } - ItemComposition.ItemDefinition_cached.put(var1, (long)var0); // L: 117 - return var1; // L: 118 + ItemComposition.ItemDefinition_cached.put(var1, (long)var0); + return var1; } } @@ -115,18 +115,18 @@ public class UserComparator6 extends AbstractUserComparator { garbageValue = "81" ) public static HitSplatDefinition method2554(int var0) { - HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cachedSprites.get((long)var0); // L: 52 - if (var1 != null) { // L: 53 + HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cachedSprites.get((long)var0); + if (var1 != null) { return var1; } else { - byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); // L: 54 - var1 = new HitSplatDefinition(); // L: 55 - if (var2 != null) { // L: 56 + byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); + var1 = new HitSplatDefinition(); + if (var2 != null) { var1.decode(new Buffer(var2)); } - HitSplatDefinition.HitSplatDefinition_cachedSprites.put(var1, (long)var0); // L: 57 - return var1; // L: 58 + HitSplatDefinition.HitSplatDefinition_cachedSprites.put(var1, (long)var0); + return var1; } } @@ -136,14 +136,14 @@ public class UserComparator6 extends AbstractUserComparator { garbageValue = "-77" ) public static void method2552(boolean var0) { - if (var0 != ItemComposition.ItemDefinition_inMembersWorld) { // L: 552 - ItemComposition.ItemDefinition_cached.clear(); // L: 554 - ItemComposition.ItemDefinition_cachedModels.clear(); // L: 555 - ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 556 - ItemComposition.ItemDefinition_inMembersWorld = var0; // L: 558 + if (var0 != ItemComposition.ItemDefinition_inMembersWorld) { + ItemComposition.ItemDefinition_cached.clear(); + ItemComposition.ItemDefinition_cachedModels.clear(); + ItemComposition.ItemDefinition_cachedSprites.clear(); + ItemComposition.ItemDefinition_inMembersWorld = var0; } - } // L: 560 + } @ObfuscatedName("kp") @ObfuscatedSignature( @@ -151,31 +151,31 @@ public class UserComparator6 extends AbstractUserComparator { garbageValue = "88961888" ) static void method2551() { - for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { // L: 12038 - int var1 = var0.group; // L: 12039 - if (class242.loadInterface(var1)) { // L: 12040 - boolean var2 = true; // L: 12041 - Widget[] var3 = MouseRecorder.Widget_interfaceComponents[var1]; // L: 12042 + for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { + int var1 = var0.group; + if (class242.loadInterface(var1)) { + boolean var2 = true; + Widget[] var3 = MouseRecorder.Widget_interfaceComponents[var1]; int var4; - for (var4 = 0; var4 < var3.length; ++var4) { // L: 12043 - if (var3[var4] != null) { // L: 12044 - var2 = var3[var4].isIf3; // L: 12045 + for (var4 = 0; var4 < var3.length; ++var4) { + if (var3[var4] != null) { + var2 = var3[var4].isIf3; break; } } - if (!var2) { // L: 12049 - var4 = (int)var0.key; // L: 12050 - Widget var5 = ChatChannel.getWidget(var4); // L: 12051 - if (var5 != null) { // L: 12052 + if (!var2) { + var4 = (int)var0.key; + Widget var5 = ChatChannel.getWidget(var4); + if (var5 != null) { SecureRandomCallable.invalidateWidget(var5); } } } } - } // L: 12056 + } @ObfuscatedName("ms") @ObfuscatedSignature( @@ -183,7 +183,7 @@ public class UserComparator6 extends AbstractUserComparator { garbageValue = "1260552521" ) static void method2549() { - SecureRandomFuture.clientPreferences.field1197 = Client.field473; // L: 12728 - class127.savePreferences(); // L: 12729 - } // L: 12730 + SecureRandomFuture.clientPreferences.field1197 = Client.field473; + class127.savePreferences(); + } } diff --git a/runescape-client/src/main/java/UserComparator7.java b/runescape-client/src/main/java/UserComparator7.java index a91103783a..692a317762 100644 --- a/runescape-client/src/main/java/UserComparator7.java +++ b/runescape-client/src/main/java/UserComparator7.java @@ -35,8 +35,8 @@ public class UserComparator7 extends AbstractUserComparator { final boolean reversed; public UserComparator7(boolean var1) { - this.reversed = var1; // L: 10 - } // L: 11 + this.reversed = var1; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -45,15 +45,15 @@ public class UserComparator7 extends AbstractUserComparator { ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (var1.world != 0 && var2.world != 0) { // L: 14 - return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; // L: 15 + if (var1.world != 0 && var2.world != 0) { + return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; } else { - return this.compareUser(var1, var2); // L: 17 + return this.compareUser(var1, var2); } } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 + return this.compareBuddy((Buddy)var1, (Buddy)var2); } @ObfuscatedName("hj") @@ -62,11 +62,11 @@ public class UserComparator7 extends AbstractUserComparator { garbageValue = "-1366394197" ) static final int method2518() { - if (SecureRandomFuture.clientPreferences.roofsHidden) { // L: 5571 + if (SecureRandomFuture.clientPreferences.roofsHidden) { return class20.Client_plane; } else { - int var0 = FaceNormal.getTileHeight(cameraX, UserComparator10.cameraZ, class20.Client_plane); // L: 5572 - return var0 - AbstractByteArrayCopier.cameraY < 800 && (Tiles.Tiles_renderFlags[class20.Client_plane][cameraX >> 7][UserComparator10.cameraZ >> 7] & 4) != 0 ? class20.Client_plane : 3; // L: 5573 5574 + int var0 = FaceNormal.getTileHeight(cameraX, UserComparator10.cameraZ, class20.Client_plane); + return var0 - AbstractByteArrayCopier.cameraY < 800 && (Tiles.Tiles_renderFlags[class20.Client_plane][cameraX >> 7][UserComparator10.cameraZ >> 7] & 4) != 0 ? class20.Client_plane : 3; } } } diff --git a/runescape-client/src/main/java/UserComparator8.java b/runescape-client/src/main/java/UserComparator8.java index f8a39d9970..c1a90fef68 100644 --- a/runescape-client/src/main/java/UserComparator8.java +++ b/runescape-client/src/main/java/UserComparator8.java @@ -11,8 +11,8 @@ public class UserComparator8 extends AbstractUserComparator { final boolean reversed; public UserComparator8(boolean var1) { - this.reversed = var1; // L: 11 - } // L: 12 + this.reversed = var1; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -21,18 +21,18 @@ public class UserComparator8 extends AbstractUserComparator { ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (Client.worldId == var1.world) { // L: 15 + if (Client.worldId == var1.world) { if (var2.world != Client.worldId) { - return this.reversed ? -1 : 1; // L: 16 + return this.reversed ? -1 : 1; } } else if (var2.world == Client.worldId) { - return this.reversed ? 1 : -1; // L: 19 + return this.reversed ? 1 : -1; } - return this.compareUser(var1, var2); // L: 21 + return this.compareUser(var1, var2); } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 25 + return this.compareBuddy((Buddy)var1, (Buddy)var2); } } diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java index 4e5c9a22d8..3d775e71a5 100644 --- a/runescape-client/src/main/java/UserComparator9.java +++ b/runescape-client/src/main/java/UserComparator9.java @@ -22,8 +22,8 @@ public class UserComparator9 extends AbstractUserComparator { final boolean reversed; public UserComparator9(boolean var1) { - this.reversed = var1; // L: 11 - } // L: 12 + this.reversed = var1; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -32,14 +32,14 @@ public class UserComparator9 extends AbstractUserComparator { ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (Client.worldId == var1.world && var2.world == Client.worldId) { // L: 15 - return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); // L: 16 + if (Client.worldId == var1.world && var2.world == Client.worldId) { + return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); } else { - return this.compareUser(var1, var2); // L: 18 + return this.compareUser(var1, var2); } } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 22 + return this.compareBuddy((Buddy)var1, (Buddy)var2); } } diff --git a/runescape-client/src/main/java/UserList.java b/runescape-client/src/main/java/UserList.java index 770535e5de..73829b1d2c 100644 --- a/runescape-client/src/main/java/UserList.java +++ b/runescape-client/src/main/java/UserList.java @@ -39,13 +39,13 @@ public abstract class UserList { Comparator comparator; UserList(int var1) { - this.size = 0; // L: 10 - this.comparator = null; // L: 14 - this.capacity = var1; // L: 17 - this.array = this.newTypedArray(var1); // L: 18 - this.usernamesMap = new HashMap(var1 / 8); // L: 19 - this.previousUsernamesMap = new HashMap(var1 / 8); // L: 20 - } // L: 21 + this.size = 0; + this.comparator = null; + this.capacity = var1; + this.array = this.newTypedArray(var1); + this.usernamesMap = new HashMap(var1 / 8); + this.previousUsernamesMap = new HashMap(var1 / 8); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -70,11 +70,11 @@ public abstract class UserList { ) @Export("clear") public void clear() { - this.size = 0; // L: 24 - Arrays.fill(this.array, (Object)null); // L: 25 - this.usernamesMap.clear(); // L: 26 - this.previousUsernamesMap.clear(); // L: 27 - } // L: 28 + this.size = 0; + Arrays.fill(this.array, (Object)null); + this.usernamesMap.clear(); + this.previousUsernamesMap.clear(); + } @ObfuscatedName("am") @ObfuscatedSignature( @@ -83,7 +83,7 @@ public abstract class UserList { ) @Export("getSize") public int getSize() { - return this.size; // L: 31 + return this.size; } @ObfuscatedName("az") @@ -93,7 +93,7 @@ public abstract class UserList { ) @Export("isFull") public boolean isFull() { - return this.size == this.capacity; // L: 35 + return this.size == this.capacity; } @ObfuscatedName("au") @@ -103,10 +103,10 @@ public abstract class UserList { ) @Export("contains") public boolean contains(Username var1) { - if (!var1.hasCleanName()) { // L: 39 + if (!var1.hasCleanName()) { return false; } else { - return this.usernamesMap.containsKey(var1) ? true : this.previousUsernamesMap.containsKey(var1); // L: 40 41 + return this.usernamesMap.containsKey(var1) ? true : this.previousUsernamesMap.containsKey(var1); } } @@ -117,8 +117,8 @@ public abstract class UserList { ) @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("ap") @@ -128,7 +128,7 @@ public abstract class UserList { ) @Export("getByCurrentUsername") User getByCurrentUsername(Username var1) { - return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); // L: 51 52 + return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); } @ObfuscatedName("ac") @@ -138,7 +138,7 @@ public abstract class UserList { ) @Export("getByPreviousUsername") User getByPreviousUsername(Username var1) { - return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1); // L: 56 57 + return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1); } @ObfuscatedName("aj") @@ -148,12 +148,12 @@ public abstract class UserList { ) @Export("removeByUsername") public final boolean removeByUsername(Username var1) { - User var2 = this.getByCurrentUsername(var1); // L: 61 - if (var2 == null) { // L: 62 + User var2 = this.getByCurrentUsername(var1); + if (var2 == null) { return false; } else { - this.remove(var2); // L: 63 - return true; // L: 64 + this.remove(var2); + return true; } } @@ -164,12 +164,12 @@ public abstract class UserList { ) @Export("remove") final void remove(User var1) { - int var2 = this.indexOf(var1); // L: 68 - if (var2 != -1) { // L: 69 - this.arrayRemove(var2); // L: 70 - this.mapRemove(var1); // L: 71 + int var2 = this.indexOf(var1); + if (var2 != -1) { + this.arrayRemove(var2); + this.mapRemove(var1); } - } // L: 72 + } @ObfuscatedName("ar") @ObfuscatedSignature( @@ -178,7 +178,7 @@ public abstract class UserList { ) @Export("addLastNoPreviousUsername") User addLastNoPreviousUsername(Username var1) { - return this.addLast(var1, (Username)null); // L: 75 + return this.addLast(var1, (Username)null); } @ObfuscatedName("ag") @@ -188,11 +188,11 @@ public abstract class UserList { ) @Export("addLast") User addLast(Username var1, Username var2) { - User var3 = this.newInstance(); // L: 80 - var3.set(var1, var2); // L: 81 - this.arrayAddLast(var3); // L: 82 - this.mapPut(var3); // L: 83 - return var3; // L: 84 + User var3 = this.newInstance(); + var3.set(var1, var2); + this.arrayAddLast(var3); + this.mapPut(var3); + return var3; } @ObfuscatedName("al") @@ -202,8 +202,8 @@ public abstract class UserList { ) @Export("get") public final User get(int var1) { - if (var1 >= 0 && var1 < this.size) { // L: 88 - return this.array[var1]; // L: 89 + if (var1 >= 0 && var1 < this.size) { + return this.array[var1]; } else { throw new ArrayIndexOutOfBoundsException(var1); } @@ -216,13 +216,13 @@ public abstract class UserList { ) @Export("sort") public final void sort() { - if (this.comparator == null) { // L: 93 - Arrays.sort(this.array, 0, this.size); // L: 94 + if (this.comparator == null) { + Arrays.sort(this.array, 0, this.size); } else { - Arrays.sort(this.array, 0, this.size, this.comparator); // L: 97 + Arrays.sort(this.array, 0, this.size, this.comparator); } - } // L: 99 + } @ObfuscatedName("as") @ObfuscatedSignature( @@ -231,10 +231,10 @@ public abstract class UserList { ) @Export("changeName") final void changeName(User var1, Username var2, Username var3) { - this.mapRemove(var1); // L: 102 - var1.set(var2, var3); // L: 103 - this.mapPut(var1); // L: 104 - } // L: 105 + this.mapRemove(var1); + var1.set(var2, var3); + this.mapPut(var1); + } @ObfuscatedName("at") @ObfuscatedSignature( @@ -243,13 +243,13 @@ public abstract class UserList { ) @Export("indexOf") final int indexOf(User var1) { - for (int var2 = 0; var2 < this.size; ++var2) { // L: 108 - if (this.array[var2] == var1) { // L: 109 + for (int var2 = 0; var2 < this.size; ++var2) { + if (this.array[var2] == var1) { return var2; } } - return -1; // L: 111 + return -1; } @ObfuscatedName("ai") @@ -260,10 +260,10 @@ public abstract class UserList { @Export("mapRemove") final void mapRemove(User var1) { if (var1.previousUsername != null) { - this.previousUsernamesMap.remove(var1.previousUsername); // L: 116 + this.previousUsernamesMap.remove(var1.previousUsername); } - } // L: 117 + } @ObfuscatedName("aq") @ObfuscatedSignature( @@ -272,8 +272,8 @@ public abstract class UserList { ) @Export("arrayAddLast") final void arrayAddLast(User var1) { - this.array[++this.size - 1] = var1; // L: 120 - } // L: 121 + this.array[++this.size - 1] = var1; + } @ObfuscatedName("aw") @ObfuscatedSignature( @@ -282,15 +282,15 @@ public abstract class UserList { ) @Export("mapPut") final void mapPut(User var1) { - this.usernamesMap.put(var1.username, var1); // L: 124 - if (var1.previousUsername != null) { // L: 125 - User var2 = (User)this.previousUsernamesMap.put(var1.previousUsername, var1); // L: 126 - if (var2 != null && var2 != var1) { // L: 127 - var2.previousUsername = null; // L: 128 + this.usernamesMap.put(var1.username, var1); + if (var1.previousUsername != null) { + User var2 = (User)this.previousUsernamesMap.put(var1.previousUsername, var1); + if (var2 != null && var2 != var1) { + var2.previousUsername = null; } } - } // L: 131 + } @ObfuscatedName("ay") @ObfuscatedSignature( @@ -299,12 +299,12 @@ public abstract class UserList { ) @Export("arrayRemove") final void arrayRemove(int var1) { - --this.size; // L: 134 - if (var1 < this.size) { // L: 135 - System.arraycopy(this.array, var1 + 1, this.array, var1, this.size - var1); // L: 136 + --this.size; + if (var1 < this.size) { + System.arraycopy(this.array, var1 + 1, this.array, var1, this.size - var1); } - } // L: 138 + } @ObfuscatedName("ae") @ObfuscatedSignature( @@ -313,8 +313,8 @@ public abstract class UserList { ) @Export("removeComparator") public final void removeComparator() { - this.comparator = null; // L: 144 - } // L: 145 + this.comparator = null; + } @ObfuscatedName("ak") @ObfuscatedSignature( @@ -323,11 +323,11 @@ public abstract class UserList { ) @Export("addComparator") public final void addComparator(Comparator var1) { - if (this.comparator == null) { // L: 148 - this.comparator = var1; // L: 149 - } else if (this.comparator instanceof AbstractUserComparator) { // L: 151 - ((AbstractUserComparator)this.comparator).addComparator(var1); // L: 152 + if (this.comparator == null) { + this.comparator = var1; + } else if (this.comparator instanceof AbstractUserComparator) { + ((AbstractUserComparator)this.comparator).addComparator(var1); } - } // L: 154 + } } diff --git a/runescape-client/src/main/java/Username.java b/runescape-client/src/main/java/Username.java index 48aa4972ec..bb370dbad3 100644 --- a/runescape-client/src/main/java/Username.java +++ b/runescape-client/src/main/java/Username.java @@ -17,14 +17,14 @@ public class Username implements Comparable { descriptor = "(Ljava/lang/String;Low;)V" ) public Username(String var1, LoginType var2) { - this.name = var1; // L: 16 - this.cleanName = VarbitComposition.method3395(var1, var2); // L: 17 - } // L: 18 + this.name = var1; + this.cleanName = VarbitComposition.method3395(var1, var2); + } public Username(String var1) { - this.name = var1; // L: 11 - this.cleanName = VarbitComposition.method3395(var1, LoginType.oldscape); // L: 12 - } // L: 13 + this.name = var1; + this.cleanName = VarbitComposition.method3395(var1, LoginType.oldscape); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -33,7 +33,7 @@ public class Username implements Comparable { ) @Export("getName") public String getName() { - return this.name; // L: 21 + return this.name; } @ObfuscatedName("b") @@ -42,7 +42,7 @@ public class Username implements Comparable { garbageValue = "0" ) public String method7914() { - return this.cleanName; // L: 25 + return this.cleanName; } @ObfuscatedName("p") @@ -52,7 +52,7 @@ public class Username implements Comparable { ) @Export("hasCleanName") public boolean hasCleanName() { - return this.cleanName != null; // L: 29 + return this.cleanName != null; } @ObfuscatedName("m") @@ -62,37 +62,37 @@ public class Username implements Comparable { ) @Export("compareToTyped") public int compareToTyped(Username var1) { - if (this.cleanName == null) { // L: 56 - return var1.cleanName == null ? 0 : 1; // L: 57 58 + if (this.cleanName == null) { + return var1.cleanName == null ? 0 : 1; } else { - return var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName); // L: 60 61 + return var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName); } } public boolean equals(Object var1) { - if (var1 instanceof Username) { // L: 34 - Username var2 = (Username)var1; // L: 35 + if (var1 instanceof Username) { + Username var2 = (Username)var1; if (this.cleanName == null) { - return var2.cleanName == null; // L: 36 - } else if (var2.cleanName == null) { // L: 37 + return var2.cleanName == null; + } else if (var2.cleanName == null) { return false; } else { - return this.hashCode() != var2.hashCode() ? false : this.cleanName.equals(var2.cleanName); // L: 38 39 + return this.hashCode() != var2.hashCode() ? false : this.cleanName.equals(var2.cleanName); } } else { - return false; // L: 41 + return false; } } public int hashCode() { - return this.cleanName == null ? 0 : this.cleanName.hashCode(); // L: 46 47 + return this.cleanName == null ? 0 : this.cleanName.hashCode(); } public int compareTo(Object var1) { - return this.compareToTyped((Username)var1); // L: 65 + return this.compareToTyped((Username)var1); } public String toString() { - return this.getName(); // L: 52 + return this.getName(); } } diff --git a/runescape-client/src/main/java/VarbitComposition.java b/runescape-client/src/main/java/VarbitComposition.java index 8413987714..1ace75e82b 100644 --- a/runescape-client/src/main/java/VarbitComposition.java +++ b/runescape-client/src/main/java/VarbitComposition.java @@ -41,16 +41,16 @@ public class VarbitComposition extends DualNode { public int endBit; static { - VarbitDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11 - field1905 = new int[32]; // L: 15 - int var0 = 2; // L: 18 + VarbitDefinition_cached = new EvictingDualNodeHashTable(64); + field1905 = new int[32]; + int var0 = 2; - for (int var1 = 0; var1 < 32; ++var1) { // L: 19 - field1905[var1] = var0 - 1; // L: 20 - var0 += var0; // L: 21 + for (int var1 = 0; var1 < 32; ++var1) { + field1905[var1] = var0 - 1; + var0 += var0; } - } // L: 23 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -60,12 +60,12 @@ public class VarbitComposition extends DualNode { @Export("decode") public void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 27 - if (var2 == 0) { // L: 28 - return; // L: 31 + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; } - this.decodeNext(var1, var2); // L: 29 + this.decodeNext(var1, var2); } } @@ -90,30 +90,30 @@ public class VarbitComposition extends DualNode { garbageValue = "402019438" ) public static String method3395(CharSequence var0, LoginType var1) { - if (var0 == null) { // L: 32 + if (var0 == null) { return null; } else { - int var2 = 0; // L: 33 + int var2 = 0; int var3; - for (var3 = var0.length(); var2 < var3 && NetSocket.method3119(var0.charAt(var2)); ++var2) { // L: 34 35 + for (var3 = var0.length(); var2 < var3 && NetSocket.method3119(var0.charAt(var2)); ++var2) { } - while (var3 > var2 && NetSocket.method3119(var0.charAt(var3 - 1))) { // L: 36 + while (var3 > var2 && NetSocket.method3119(var0.charAt(var3 - 1))) { --var3; } - int var4 = var3 - var2; // L: 37 - if (var4 >= 1 && var4 <= UserComparator4.method2508(var1)) { // L: 38 - StringBuilder var5 = new StringBuilder(var4); // L: 39 + int var4 = var3 - var2; + if (var4 >= 1 && var4 <= UserComparator4.method2508(var1)) { + StringBuilder var5 = new StringBuilder(var4); - for (int var6 = var2; var6 < var3; ++var6) { // L: 40 - char var7 = var0.charAt(var6); // L: 41 + for (int var6 = var2; var6 < var3; ++var6) { + char var7 = var0.charAt(var6); boolean var8; - if (Character.isISOControl(var7)) { // L: 44 - var8 = false; // L: 45 - } else if (WorldMapIcon_0.isAlphaNumeric(var7)) { // L: 48 - var8 = true; // L: 49 + if (Character.isISOControl(var7)) { + var8 = false; + } else if (WorldMapIcon_0.isAlphaNumeric(var7)) { + var8 = true; } else { char[] var9 = class400.field4411; int var10 = 0; @@ -126,40 +126,40 @@ public class VarbitComposition extends DualNode { for (var10 = 0; var10 < var9.length; ++var10) { var11 = var9[var10]; - if (var7 == var11) { // L: 66 - var8 = true; // L: 67 + if (var7 == var11) { + var8 = true; break label91; } } - var8 = false; // L: 72 + var8 = false; break; } - var11 = var9[var10]; // L: 55 + var11 = var9[var10]; if (var11 == var7) { var8 = true; break; } - ++var10; // L: 54 + ++var10; } } - if (var8) { // L: 74 + if (var8) { char var12; - switch(var7) { // L: 77 + switch(var7) { case ' ': case '-': case '_': case ' ': - var12 = '_'; // L: 157 + var12 = '_'; break; case '#': case '[': case ']': - var12 = var7; // L: 85 - break; // L: 86 + var12 = var7; + break; case 'À': case 'Á': case 'Â': @@ -170,12 +170,12 @@ public class VarbitComposition extends DualNode { case 'â': case 'ã': case 'ä': - var12 = 'a'; // L: 101 - break; // L: 102 + var12 = 'a'; + break; case 'Ç': case 'ç': - var12 = 'c'; // L: 89 - break; // L: 90 + var12 = 'c'; + break; case 'È': case 'É': case 'Ê': @@ -184,19 +184,19 @@ public class VarbitComposition extends DualNode { case 'é': case 'ê': case 'ë': - var12 = 'e'; // L: 140 - break; // L: 141 + var12 = 'e'; + break; case 'Í': case 'Î': case 'Ï': case 'í': case 'î': case 'ï': - var12 = 'i'; // L: 151 + var12 = 'i'; break; case 'Ñ': case 'ñ': - var12 = 'n'; // L: 80 + var12 = 'n'; break; case 'Ò': case 'Ó': @@ -208,8 +208,8 @@ public class VarbitComposition extends DualNode { case 'ô': case 'õ': case 'ö': - var12 = 'o'; // L: 120 - break; // L: 121 + var12 = 'o'; + break; case 'Ù': case 'Ú': case 'Û': @@ -218,29 +218,29 @@ public class VarbitComposition extends DualNode { case 'ú': case 'û': case 'ü': - var12 = 'u'; // L: 130 - break; // L: 131 + var12 = 'u'; + break; case 'ß': - var12 = 'b'; // L: 108 - break; // L: 109 + var12 = 'b'; + break; case 'ÿ': case 'Ÿ': - var12 = 'y'; // L: 105 - break; // L: 106 + var12 = 'y'; + break; default: - var12 = Character.toLowerCase(var7); // L: 143 + var12 = Character.toLowerCase(var7); } - if (var12 != 0) { // L: 162 - var5.append(var12); // L: 163 + if (var12 != 0) { + var5.append(var12); } } } - if (var5.length() == 0) { // L: 165 + if (var5.length() == 0) { return null; } else { - return var5.toString(); // L: 166 + return var5.toString(); } } else { return null; @@ -254,20 +254,20 @@ public class VarbitComposition extends DualNode { garbageValue = "120991325" ) public static IndexedSprite method3396(AbstractArchive var0, int var1) { - if (!class174.method3382(var0, var1)) { // L: 53 + if (!class174.method3382(var0, var1)) { return null; } else { - IndexedSprite var3 = new IndexedSprite(); // L: 56 - var3.width = class432.SpriteBuffer_spriteWidth; // L: 57 - var3.height = class432.SpriteBuffer_spriteHeight; // L: 58 - var3.xOffset = class141.SpriteBuffer_xOffsets[0]; // L: 59 - var3.yOffset = RouteStrategy.SpriteBuffer_yOffsets[0]; // L: 60 - var3.subWidth = class432.SpriteBuffer_spriteWidths[0]; // L: 61 - var3.subHeight = class330.SpriteBuffer_spriteHeights[0]; // L: 62 - var3.palette = class432.SpriteBuffer_spritePalette; // L: 63 - var3.pixels = class369.SpriteBuffer_pixels[0]; // L: 64 - UserComparator3.method2529(); // L: 65 - return var3; // L: 68 + IndexedSprite var3 = new IndexedSprite(); + var3.width = class432.SpriteBuffer_spriteWidth; + var3.height = class432.SpriteBuffer_spriteHeight; + var3.xOffset = class141.SpriteBuffer_xOffsets[0]; + var3.yOffset = RouteStrategy.SpriteBuffer_yOffsets[0]; + var3.subWidth = class432.SpriteBuffer_spriteWidths[0]; + var3.subHeight = class330.SpriteBuffer_spriteHeights[0]; + var3.palette = class432.SpriteBuffer_spritePalette; + var3.pixels = class369.SpriteBuffer_pixels[0]; + UserComparator3.method2529(); + return var3; } } @@ -278,31 +278,31 @@ public class VarbitComposition extends DualNode { ) @Export("addWidgetItemMenuItem") static final void addWidgetItemMenuItem(Widget var0, ItemComposition var1, int var2, int var3, boolean var4) { - String[] var5 = var1.inventoryActions; // L: 11144 - byte var6 = -1; // L: 11145 - String var7 = null; // L: 11146 - if (var5 != null && var5[var3] != null) { // L: 11147 - if (var3 == 0) { // L: 11148 + String[] var5 = var1.inventoryActions; + byte var6 = -1; + String var7 = null; + if (var5 != null && var5[var3] != null) { + if (var3 == 0) { var6 = 33; - } else if (var3 == 1) { // L: 11149 + } else if (var3 == 1) { var6 = 34; } else if (var3 == 2) { - var6 = 35; // L: 11150 - } else if (var3 == 3) { // L: 11151 + var6 = 35; + } else if (var3 == 3) { var6 = 36; } else { - var6 = 37; // L: 11152 + var6 = 37; } - var7 = var5[var3]; // L: 11153 - } else if (var3 == 4) { // L: 11156 - var6 = 37; // L: 11157 - var7 = "Drop"; // L: 11158 + var7 = var5[var3]; + } else if (var3 == 4) { + var6 = 37; + var7 = "Drop"; } - if (var6 != -1 && var7 != null) { // L: 11161 - class21.insertMenuItem(var7, UserComparator5.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); // L: 11162 + if (var6 != -1 && var7 != null) { + class21.insertMenuItem(var7, UserComparator5.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); } - } // L: 11164 + } } diff --git a/runescape-client/src/main/java/VarcInt.java b/runescape-client/src/main/java/VarcInt.java index 02fe1927bd..5b987f5d1a 100644 --- a/runescape-client/src/main/java/VarcInt.java +++ b/runescape-client/src/main/java/VarcInt.java @@ -30,11 +30,11 @@ public class VarcInt extends DualNode { public boolean persist; static { - VarcInt_cached = new EvictingDualNodeHashTable(64); // L: 11 + VarcInt_cached = new EvictingDualNodeHashTable(64); } public VarcInt() { - this.persist = false; // L: 12 + this.persist = false; } @ObfuscatedName("c") @@ -44,12 +44,12 @@ public class VarcInt extends DualNode { ) public void method3198(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 16 - if (var2 == 0) { // L: 17 - return; // L: 20 + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; } - this.method3197(var1, var2); // L: 18 + this.method3197(var1, var2); } } @@ -59,11 +59,11 @@ public class VarcInt extends DualNode { garbageValue = "-1864154623" ) void method3197(Buffer var1, int var2) { - if (var2 == 2) { // L: 23 - this.persist = true; // L: 24 + if (var2 == 2) { + this.persist = true; } - } // L: 27 + } @ObfuscatedName("fj") @ObfuscatedSignature( @@ -72,11 +72,11 @@ public class VarcInt extends DualNode { ) @Export("newArchive") static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) { - ArchiveDisk var4 = null; // L: 2826 - if (JagexCache.JagexCache_dat2File != null) { // L: 2827 + ArchiveDisk var4 = null; + if (JagexCache.JagexCache_dat2File != null) { var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idxFiles[var0], 1000000); } - return new Archive(var4, ParamComposition.masterDisk, var0, var1, var2, var3); // L: 2828 + return new Archive(var4, ParamComposition.masterDisk, var0, var1, var2, var3); } } diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index 7b9e2a45a2..e49315c38f 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -39,39 +39,39 @@ public class Varcs { long field1267; Varcs() { - this.unwrittenChanges = false; // L: 25 - int var1 = class131.archive2.getGroupFileCount(19); // L: 29 - this.map = new HashMap(); // L: 30 - this.intsPersistence = new boolean[var1]; // L: 31 + this.unwrittenChanges = false; + int var1 = class131.archive2.getGroupFileCount(19); + this.map = new HashMap(); + this.intsPersistence = new boolean[var1]; int var2; - for (var2 = 0; var2 < var1; ++var2) { // L: 32 - VarcInt var4 = (VarcInt)VarcInt.VarcInt_cached.get((long)var2); // L: 35 + for (var2 = 0; var2 < var1; ++var2) { + VarcInt var4 = (VarcInt)VarcInt.VarcInt_cached.get((long)var2); VarcInt var3; - if (var4 != null) { // L: 36 - var3 = var4; // L: 37 + if (var4 != null) { + var3 = var4; } else { - byte[] var5 = VarcInt.VarcInt_archive.takeFile(19, var2); // L: 40 - var4 = new VarcInt(); // L: 41 + byte[] var5 = VarcInt.VarcInt_archive.takeFile(19, var2); + var4 = new VarcInt(); if (var5 != null) { - var4.method3198(new Buffer(var5)); // L: 42 + var4.method3198(new Buffer(var5)); } - VarcInt.VarcInt_cached.put(var4, (long)var2); // L: 43 - var3 = var4; // L: 44 + VarcInt.VarcInt_cached.put(var4, (long)var2); + var3 = var4; } - this.intsPersistence[var2] = var3.persist; // L: 47 + this.intsPersistence[var2] = var3.persist; } - var2 = 0; // L: 49 - if (class131.archive2.method5584(15)) { // L: 50 - var2 = class131.archive2.getGroupFileCount(15); // L: 51 + var2 = 0; + if (class131.archive2.method5584(15)) { + var2 = class131.archive2.getGroupFileCount(15); } - this.strings = new String[var2]; // L: 53 - this.read(); // L: 54 - } // L: 55 + this.strings = new String[var2]; + this.read(); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -80,12 +80,12 @@ public class Varcs { ) @Export("setInt") void setInt(int var1, int var2) { - this.map.put(var1, var2); // L: 58 + this.map.put(var1, var2); if (this.intsPersistence[var1]) { - this.unwrittenChanges = true; // L: 59 + this.unwrittenChanges = true; } - } // L: 60 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -94,8 +94,8 @@ public class Varcs { ) @Export("getInt") int getInt(int var1) { - Object var2 = this.map.get(var1); // L: 63 - return var2 instanceof Integer ? (Integer)var2 : -1; // L: 64 65 67 + Object var2 = this.map.get(var1); + return var2 instanceof Integer ? (Integer)var2 : -1; } @ObfuscatedName("p") @@ -105,8 +105,8 @@ public class Varcs { ) @Export("setString") void setString(int var1, String var2) { - this.map.put(var1, var2); // L: 71 - } // L: 72 + this.map.put(var1, var2); + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -115,8 +115,8 @@ public class Varcs { ) @Export("getString") String getString(int var1) { - Object var2 = this.map.get(var1); // L: 75 - return var2 instanceof String ? (String)var2 : ""; // L: 76 77 79 + Object var2 = this.map.get(var1); + return var2 instanceof String ? (String)var2 : ""; } /** @deprecated */ @@ -128,8 +128,8 @@ public class Varcs { ) @Export("setStringOld") void setStringOld(int var1, String var2) { - this.strings[var1] = var2; // L: 84 - } // L: 85 + this.strings[var1] = var2; + } /** @deprecated */ @Deprecated @@ -140,7 +140,7 @@ public class Varcs { ) @Export("getStringOld") String getStringOld(int var1) { - return this.strings[var1]; // L: 89 + return this.strings[var1]; } @ObfuscatedName("j") @@ -151,17 +151,17 @@ public class Varcs { @Export("clearTransient") void clearTransient() { int var1; - 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.intsPersistence.length; ++var1) { + if (!this.intsPersistence[var1]) { + this.map.remove(var1); } } - for (var1 = 0; var1 < this.strings.length; ++var1) { // L: 98 - this.strings[var1] = null; // L: 99 + for (var1 = 0; var1 < this.strings.length; ++var1) { + this.strings[var1] = null; } - } // L: 101 + } @ObfuscatedName("w") @ObfuscatedSignature( @@ -170,7 +170,7 @@ public class Varcs { ) @Export("getPreferencesFile") AccessFile getPreferencesFile(boolean var1) { - return class231.getPreferencesFile("2", class338.field4054.name, var1); // L: 104 + return class231.getPreferencesFile("2", class338.field4054.name, var1); } @ObfuscatedName("n") @@ -180,59 +180,59 @@ public class Varcs { ) @Export("write") void write() { - AccessFile var1 = this.getPreferencesFile(true); // L: 108 + AccessFile var1 = this.getPreferencesFile(true); try { - int var2 = 3; // L: 110 - int var3 = 0; // L: 111 - Iterator var4 = this.map.entrySet().iterator(); // L: 112 + int var2 = 3; + int var3 = 0; + Iterator var4 = this.map.entrySet().iterator(); while (var4.hasNext()) { - 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 + Entry var5 = (Entry)var4.next(); + int var6 = (Integer)var5.getKey(); + if (this.intsPersistence[var6]) { + Object var7 = var5.getValue(); + var2 += 3; + if (var7 instanceof Integer) { var2 += 4; } else if (var7 instanceof String) { - var2 += class116.stringCp1252NullTerminatedByteSize((String)var7); // L: 120 + var2 += class116.stringCp1252NullTerminatedByteSize((String)var7); } - ++var3; // L: 121 + ++var3; } } - Buffer var23 = new Buffer(var2); // L: 125 - var23.writeByte(2); // L: 126 - var23.writeShort(var3); // L: 127 - Iterator var24 = this.map.entrySet().iterator(); // L: 128 + Buffer var23 = new Buffer(var2); + var23.writeByte(2); + var23.writeShort(var3); + Iterator var24 = this.map.entrySet().iterator(); while (var24.hasNext()) { - Entry var12 = (Entry)var24.next(); // L: 129 - int var13 = (Integer)var12.getKey(); // L: 131 - if (this.intsPersistence[var13]) { // L: 132 - var23.writeShort(var13); // L: 133 - Object var8 = var12.getValue(); // L: 134 - class409 var9 = class409.method7247(var8.getClass()); // L: 135 - var23.writeByte(var9.field4452); // L: 136 - class409.method7255(var8, var23); // L: 137 + Entry var12 = (Entry)var24.next(); + int var13 = (Integer)var12.getKey(); + if (this.intsPersistence[var13]) { + var23.writeShort(var13); + Object var8 = var12.getValue(); + class409 var9 = class409.method7247(var8.getClass()); + var23.writeByte(var9.field4452); + class409.method7255(var8, var23); } } - var1.write(var23.array, 0, var23.offset); // L: 141 - } catch (Exception var21) { // L: 143 + var1.write(var23.array, 0, var23.offset); + } catch (Exception var21) { } finally { try { - var1.close(); // L: 146 - } catch (Exception var20) { // L: 148 + var1.close(); + } catch (Exception var20) { } } - this.unwrittenChanges = false; // L: 150 - this.field1267 = Ignored.method6459(); // L: 151 - } // L: 152 + this.unwrittenChanges = false; + this.field1267 = Ignored.method6459(); + } @ObfuscatedName("r") @ObfuscatedSignature( @@ -241,91 +241,91 @@ public class Varcs { ) @Export("read") void read() { - AccessFile var1 = this.getPreferencesFile(false); // L: 155 + AccessFile var1 = this.getPreferencesFile(false); - label226: { + label210: { try { - byte[] var2 = new byte[(int)var1.length()]; // L: 157 + byte[] var2 = new byte[(int)var1.length()]; int var4; - for (int var3 = 0; var3 < var2.length; var3 += var4) { // L: 158 159 162 - var4 = var1.read(var2, var3, var2.length - var3); // L: 160 - if (var4 == -1) { // L: 161 + for (int var3 = 0; var3 < var2.length; var3 += var4) { + var4 = var1.read(var2, var3, var2.length - var3); + if (var4 == -1) { throw new EOFException(); } } - Buffer var15 = new Buffer(var2); // L: 164 - if (var15.array.length - var15.offset >= 1) { - int var16 = var15.readUnsignedByte(); // L: 166 - if (var16 >= 0 && var16 <= 2) { - int var7; - int var8; - int var9; - int var17; - if (var16 >= 2) { // L: 168 - var17 = var15.readUnsignedShort(); // L: 169 - var7 = 0; + Buffer var15 = new Buffer(var2); + if (var15.array.length - var15.offset < 1) { + return; + } - while (true) { - if (var7 >= var17) { - break label226; - } + int var16 = var15.readUnsignedByte(); + if (var16 >= 0 && var16 <= 2) { + int var7; + int var8; + int var9; + int var17; + if (var16 >= 2) { + var17 = var15.readUnsignedShort(); + var7 = 0; - var8 = var15.readUnsignedShort(); // L: 171 - var9 = var15.readUnsignedByte(); // L: 172 - class409[] var10 = new class409[]{class409.field4442, class409.field4449, class409.field4445}; // L: 175 - class409 var11 = (class409)class130.findEnumerated(var10, var9); // L: 177 - Object var12 = var11.method7250(var15); // L: 178 - if (this.intsPersistence[var8]) { // L: 179 - this.map.put(var8, var12); // L: 180 - } - - ++var7; // L: 170 - } - } else { - var17 = var15.readUnsignedShort(); // L: 185 - - for (var7 = 0; var7 < var17; ++var7) { // L: 186 - var8 = var15.readUnsignedShort(); // L: 187 - var9 = var15.readInt(); // L: 188 - if (this.intsPersistence[var8]) { // L: 189 - this.map.put(var8, var9); // L: 190 - } + while (true) { + if (var7 >= var17) { + break label210; } - var7 = var15.readUnsignedShort(); // L: 193 - var8 = 0; + var8 = var15.readUnsignedShort(); + var9 = var15.readUnsignedByte(); + class409[] var10 = new class409[]{class409.field4442, class409.field4449, class409.field4445}; + class409 var11 = (class409)class130.findEnumerated(var10, var9); + Object var12 = var11.method7250(var15); + if (this.intsPersistence[var8]) { + this.map.put(var8, var12); + } - while (true) { - if (var8 >= var7) { - break label226; - } + ++var7; + } + } else { + var17 = var15.readUnsignedShort(); - var15.readUnsignedShort(); // L: 195 - var15.readStringCp1252NullTerminated(); // L: 196 - ++var8; // L: 194 + for (var7 = 0; var7 < var17; ++var7) { + var8 = var15.readUnsignedShort(); + var9 = var15.readInt(); + if (this.intsPersistence[var8]) { + this.map.put(var8, var9); } } - } - return; // L: 167 + var7 = var15.readUnsignedShort(); + var8 = 0; + + while (true) { + if (var8 >= var7) { + break label210; + } + + var15.readUnsignedShort(); + var15.readStringCp1252NullTerminated(); + ++var8; + } + } } - } catch (Exception var26) { // L: 200 - break label226; + } catch (Exception var26) { + break label210; } finally { try { - var1.close(); // L: 203 - } catch (Exception var25) { // L: 205 + var1.close(); + } catch (Exception var25) { } } - return; // L: 165 + return; } - this.unwrittenChanges = false; // L: 207 - } // L: 208 + this.unwrittenChanges = false; + } @ObfuscatedName("o") @ObfuscatedSignature( @@ -334,11 +334,11 @@ public class Varcs { ) @Export("tryWrite") void tryWrite() { - if (this.unwrittenChanges && this.field1267 < Ignored.method6459() - 60000L) { // L: 211 - this.write(); // L: 212 + if (this.unwrittenChanges && this.field1267 < Ignored.method6459() - 60000L) { + this.write(); } - } // L: 214 + } @ObfuscatedName("v") @ObfuscatedSignature( @@ -347,7 +347,7 @@ public class Varcs { ) @Export("hasUnwrittenChanges") boolean hasUnwrittenChanges() { - return this.unwrittenChanges; // L: 217 + return this.unwrittenChanges; } @ObfuscatedName("fi") @@ -356,15 +356,15 @@ public class Varcs { garbageValue = "-397371798" ) static final void method2411() { - if (Client.logoutTimer > 0) { // L: 3647 - LoginScreenAnimation.logOut(); // L: 3648 + if (Client.logoutTimer > 0) { + LoginScreenAnimation.logOut(); } else { - Client.timer.method6231(); // L: 3651 - VertexNormal.updateGameState(40); // L: 3652 - Coord.field3186 = Client.packetWriter.getSocket(); // L: 3653 - Client.packetWriter.removeSocket(); // L: 3654 + Client.timer.method6231(); + VertexNormal.updateGameState(40); + Coord.field3186 = Client.packetWriter.getSocket(); + Client.packetWriter.removeSocket(); } - } // L: 3649 3655 + } @ObfuscatedName("fa") @ObfuscatedSignature( @@ -372,12 +372,12 @@ public class Varcs { garbageValue = "23" ) static void method2427(SequenceDefinition var0, int var1, int var2, int var3) { - if (Client.soundEffectCount < 50 && SecureRandomFuture.clientPreferences.areaSoundEffectsVolume != 0) { // L: 4309 - if (var0.field2075 != null && var0.field2075.containsKey(var1)) { // L: 4310 - class315.method5816((Integer)var0.field2075.get(var1), var2, var3); // L: 4311 + if (Client.soundEffectCount < 50 && SecureRandomFuture.clientPreferences.areaSoundEffectsVolume != 0) { + if (var0.field2075 != null && var0.field2075.containsKey(var1)) { + class315.method5816((Integer)var0.field2075.get(var1), var2, var3); } } - } // L: 4312 + } @ObfuscatedName("hv") @ObfuscatedSignature( @@ -386,31 +386,31 @@ public class Varcs { ) @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: 7932 + PendingSpawn var9 = null; - for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7933 7934 7939 - if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { // L: 7935 - var9 = var10; // L: 7936 + for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { + if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { + var9 = var10; break; } } - if (var9 == null) { // L: 7941 - var9 = new PendingSpawn(); // L: 7942 - var9.plane = var0; // L: 7943 - var9.type = var3; // L: 7944 - var9.x = var1; // L: 7945 - var9.y = var2; // L: 7946 - class4.method26(var9); // L: 7947 - Client.pendingSpawns.addFirst(var9); // L: 7948 + if (var9 == null) { + var9 = new PendingSpawn(); + var9.plane = var0; + var9.type = var3; + var9.x = var1; + var9.y = var2; + class4.method26(var9); + Client.pendingSpawns.addFirst(var9); } - var9.id = var4; // L: 7950 - var9.field1075 = var5; // L: 7951 - var9.orientation = var6; // L: 7952 - var9.delay = var7; // L: 7953 - var9.hitpoints = var8; // L: 7954 - } // L: 7955 + var9.id = var4; + var9.field1075 = var5; + var9.orientation = var6; + var9.delay = var7; + var9.hitpoints = var8; + } @ObfuscatedName("km") @ObfuscatedSignature( @@ -418,23 +418,23 @@ public class Varcs { garbageValue = "-1218655419" ) static final void method2426(int var0) { - var0 = Math.min(Math.max(var0, 0), 255); // L: 12129 - if (var0 != SecureRandomFuture.clientPreferences.musicVolume) { // L: 12130 - if (SecureRandomFuture.clientPreferences.musicVolume == 0 && Client.currentTrackGroupId != -1) { // L: 12131 - NetSocket.method3118(WorldMapScaleHandler.archive6, Client.currentTrackGroupId, 0, var0, false); // L: 12132 - Client.field743 = false; // L: 12133 - } else if (var0 == 0) { // L: 12135 - StructComposition.method3444(); // L: 12136 - Client.field743 = false; // L: 12137 - } else if (class260.musicPlayerStatus != 0) { // L: 12140 + var0 = Math.min(Math.max(var0, 0), 255); + if (var0 != SecureRandomFuture.clientPreferences.musicVolume) { + if (SecureRandomFuture.clientPreferences.musicVolume == 0 && Client.currentTrackGroupId != -1) { + NetSocket.method3118(WorldMapScaleHandler.archive6, Client.currentTrackGroupId, 0, var0, false); + Client.field743 = false; + } else if (var0 == 0) { + StructComposition.method3444(); + Client.field743 = false; + } else if (class260.musicPlayerStatus != 0) { ChatChannel.musicTrackVolume = var0; } else { - class260.midiPcmStream.setPcmStreamVolume(var0); // L: 12141 + class260.midiPcmStream.setPcmStreamVolume(var0); } - SecureRandomFuture.clientPreferences.musicVolume = var0; // L: 12143 - class127.savePreferences(); // L: 12144 + SecureRandomFuture.clientPreferences.musicVolume = var0; + class127.savePreferences(); } - } // L: 12146 + } } diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java index 9467807093..09fb1d695c 100644 --- a/runescape-client/src/main/java/VarpDefinition.java +++ b/runescape-client/src/main/java/VarpDefinition.java @@ -35,12 +35,12 @@ public class VarpDefinition extends DualNode { public int type; static { - VarpDefinition_cached = new EvictingDualNodeHashTable(64); // L: 12 + VarpDefinition_cached = new EvictingDualNodeHashTable(64); } VarpDefinition() { - this.type = 0; // L: 13 - } // L: 15 + this.type = 0; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -50,12 +50,12 @@ public class VarpDefinition extends DualNode { @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 29 - if (var2 == 0) { // L: 30 - return; // L: 33 + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; } - this.decodeNext(var1, var2); // L: 31 + this.decodeNext(var1, var2); } } @@ -66,11 +66,11 @@ public class VarpDefinition extends DualNode { ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 5) { // L: 36 + if (var2 == 5) { this.type = var1.readUnsignedShort(); } - } // L: 38 + } @ObfuscatedName("ho") @ObfuscatedSignature( @@ -78,8 +78,8 @@ public class VarpDefinition extends DualNode { garbageValue = "827099258" ) static final void method3167(Actor var0, int var1) { - ModeWhere.worldToScreen(var0.x, var0.y, var1); // L: 6045 - } // L: 6046 + ModeWhere.worldToScreen(var0.x, var0.y, var1); + } @ObfuscatedName("le") @ObfuscatedSignature( @@ -87,6 +87,6 @@ public class VarpDefinition extends DualNode { garbageValue = "13655" ) static void method3168(int var0) { - Client.oculusOrbState = var0; // L: 12684 - } // L: 12685 + Client.oculusOrbState = var0; + } } diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java index acc4d70f30..d13736bd13 100644 --- a/runescape-client/src/main/java/Varps.java +++ b/runescape-client/src/main/java/Varps.java @@ -16,15 +16,15 @@ public class Varps { public static int[] Varps_main; static { - Varps_masks = new int[32]; // L: 6 - int var0 = 2; // L: 9 + Varps_masks = new int[32]; + int var0 = 2; - for (int var1 = 0; var1 < 32; ++var1) { // L: 10 - Varps_masks[var1] = var0 - 1; // L: 11 - var0 += var0; // L: 12 + for (int var1 = 0; var1 < 32; ++var1) { + Varps_masks[var1] = var0 - 1; + var0 += var0; } - Varps_temp = new int[4000]; // L: 16 - Varps_main = new int[4000]; // L: 17 + Varps_temp = new int[4000]; + Varps_main = new int[4000]; } } diff --git a/runescape-client/src/main/java/VertexNormal.java b/runescape-client/src/main/java/VertexNormal.java index 78f2fa25ff..e98a0daeac 100644 --- a/runescape-client/src/main/java/VertexNormal.java +++ b/runescape-client/src/main/java/VertexNormal.java @@ -39,17 +39,17 @@ public class VertexNormal { int magnitude; VertexNormal() { - } // L: 9 + } @ObfuscatedSignature( descriptor = "(Lga;)V" ) VertexNormal(VertexNormal var1) { - this.x = var1.x; // L: 12 - this.y = var1.y; // L: 13 - this.z = var1.z; // L: 14 - this.magnitude = var1.magnitude; // L: 15 - } // L: 16 + this.x = var1.x; + this.y = var1.y; + this.z = var1.z; + this.magnitude = var1.magnitude; + } @ObfuscatedName("n") @ObfuscatedSignature( @@ -58,11 +58,11 @@ public class VertexNormal { ) @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 + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); + if (var1 == null) { return -1; } else { - return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; // L: 75 76 + return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; } } @@ -73,50 +73,50 @@ public class VertexNormal { ) @Export("updateGameState") static void updateGameState(int var0) { - if (var0 != Client.gameState) { // L: 1959 - if (Client.gameState == 0) { // L: 1960 + if (var0 != Client.gameState) { + if (Client.gameState == 0) { class295.client.method498(); } - if (var0 == 20 || var0 == 40 || var0 == 45) { // L: 1961 - PacketBufferNode.method5016(0); // L: 1962 - Client.field545 = 0; // L: 1963 - Client.field541 = 0; // L: 1964 - Client.timer.method6232(var0); // L: 1965 - if (var0 != 20) { // L: 1966 + if (var0 == 20 || var0 == 40 || var0 == 45) { + PacketBufferNode.method5016(0); + Client.field545 = 0; + Client.field541 = 0; + Client.timer.method6232(var0); + if (var0 != 20) { FriendSystem.method1791(false); } } - if (var0 != 20 && var0 != 40 && Coord.field3186 != null) { // L: 1968 1969 - Coord.field3186.close(); // L: 1970 - Coord.field3186 = null; // L: 1971 + if (var0 != 20 && var0 != 40 && Coord.field3186 != null) { + Coord.field3186.close(); + Coord.field3186 = null; } - if (Client.gameState == 25) { // L: 1974 - Client.field602 = 0; // L: 1975 - Client.field529 = 0; // L: 1976 - Client.field530 = 1; // L: 1977 - Client.field617 = 0; // L: 1978 - Client.field532 = 1; // L: 1979 + if (Client.gameState == 25) { + Client.field602 = 0; + Client.field529 = 0; + Client.field530 = 1; + Client.field617 = 0; + Client.field532 = 1; } int var1; - if (var0 != 5 && var0 != 10) { // L: 1981 - if (var0 == 20) { // L: 1985 - var1 = Client.gameState == 11 ? 4 : 0; // L: 1986 - DefaultsGroup.method6568(class257.archive10, UserComparator6.archive8, true, var1); // L: 1987 - } else if (var0 == 11) { // L: 1989 - DefaultsGroup.method6568(class257.archive10, UserComparator6.archive8, false, 4); // L: 1990 + if (var0 != 5 && var0 != 10) { + if (var0 == 20) { + var1 = Client.gameState == 11 ? 4 : 0; + DefaultsGroup.method6568(class257.archive10, UserComparator6.archive8, true, var1); + } else if (var0 == 11) { + DefaultsGroup.method6568(class257.archive10, UserComparator6.archive8, false, 4); } else { - SoundCache.method823(); // L: 1992 + SoundCache.method823(); } } else { - var1 = AttackOption.method2356() ? 0 : 12; // L: 1982 - DefaultsGroup.method6568(class257.archive10, UserComparator6.archive8, true, var1); // L: 1983 + var1 = AttackOption.method2356() ? 0 : 12; + DefaultsGroup.method6568(class257.archive10, UserComparator6.archive8, true, var1); } - Client.gameState = var0; // L: 1993 + Client.gameState = var0; } - } // L: 1994 + } } diff --git a/runescape-client/src/main/java/VerticalAlignment.java b/runescape-client/src/main/java/VerticalAlignment.java index bd430c5184..1aabf30428 100644 --- a/runescape-client/src/main/java/VerticalAlignment.java +++ b/runescape-client/src/main/java/VerticalAlignment.java @@ -40,9 +40,9 @@ public enum VerticalAlignment implements MouseWheel { final int id; VerticalAlignment(int var3, int var4) { - this.value = var3; // L: 18 - this.id = var4; // L: 19 - } // L: 20 + this.value = var3; + this.id = var4; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -51,7 +51,7 @@ public enum VerticalAlignment implements MouseWheel { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 24 + return this.id; } @ObfuscatedName("b") @@ -61,19 +61,19 @@ public enum VerticalAlignment implements MouseWheel { ) @Export("getParamDefinition") public static ParamComposition getParamDefinition(int var0) { - ParamComposition var1 = (ParamComposition)ParamComposition.ParamDefinition_cached.get((long)var0); // L: 25 - if (var1 != null) { // L: 26 + ParamComposition var1 = (ParamComposition)ParamComposition.ParamDefinition_cached.get((long)var0); + if (var1 != null) { return var1; } else { - byte[] var2 = ParamComposition.ParamDefinition_archive.takeFile(11, var0); // L: 27 - var1 = new ParamComposition(); // L: 28 - if (var2 != null) { // L: 29 + byte[] var2 = ParamComposition.ParamDefinition_archive.takeFile(11, var0); + var1 = new ParamComposition(); + if (var2 != null) { var1.decode(new Buffer(var2)); } - var1.postDecode(); // L: 30 - ParamComposition.ParamDefinition_cached.put(var1, (long)var0); // L: 31 - return var1; // L: 32 + var1.postDecode(); + ParamComposition.ParamDefinition_cached.put(var1, (long)var0); + return var1; } } @@ -83,6 +83,6 @@ public enum VerticalAlignment implements MouseWheel { garbageValue = "21" ) public static void method3338() { - ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 548 - } // L: 549 + ItemComposition.ItemDefinition_cachedSprites.clear(); + } } diff --git a/runescape-client/src/main/java/ViewportMouse.java b/runescape-client/src/main/java/ViewportMouse.java index 2b40de7e1f..e7f2c577f4 100644 --- a/runescape-client/src/main/java/ViewportMouse.java +++ b/runescape-client/src/main/java/ViewportMouse.java @@ -41,12 +41,12 @@ public class ViewportMouse { public static long[] ViewportMouse_entityTags; static { - ViewportMouse_isInViewport = false; // L: 4 - ViewportMouse_x = 0; // L: 5 - ViewportMouse_y = 0; // L: 6 - ViewportMouse_false0 = false; // L: 7 - ViewportMouse_entityCount = 0; // L: 17 - ViewportMouse_entityTags = new long[1000]; // L: 18 + ViewportMouse_isInViewport = false; + ViewportMouse_x = 0; + ViewportMouse_y = 0; + ViewportMouse_false0 = false; + ViewportMouse_entityCount = 0; + ViewportMouse_entityTags = new long[1000]; } @ObfuscatedName("bo") @@ -56,28 +56,28 @@ public class ViewportMouse { ) @Export("decompressBytes") static final byte[] decompressBytes(byte[] var0) { - Buffer var1 = new Buffer(var0); // L: 424 - int var2 = var1.readUnsignedByte(); // L: 425 - int var3 = var1.readInt(); // L: 426 - if (var3 < 0 || AbstractArchive.field3843 != 0 && var3 > AbstractArchive.field3843) { // L: 427 - throw new RuntimeException(); // L: 428 - } else if (var2 == 0) { // L: 430 - byte[] var6 = new byte[var3]; // L: 431 - var1.readBytes(var6, 0, var3); // L: 432 - return var6; // L: 433 + Buffer var1 = new Buffer(var0); + int var2 = var1.readUnsignedByte(); + int var3 = var1.readInt(); + if (var3 < 0 || AbstractArchive.field3843 != 0 && var3 > AbstractArchive.field3843) { + throw new RuntimeException(); + } else if (var2 == 0) { + byte[] var6 = new byte[var3]; + var1.readBytes(var6, 0, var3); + return var6; } else { - int var4 = var1.readInt(); // L: 436 - if (var4 >= 0 && (AbstractArchive.field3843 == 0 || var4 <= AbstractArchive.field3843)) { // L: 437 - byte[] var5 = new byte[var4]; // L: 440 - if (var2 == 1) { // L: 441 + int var4 = var1.readInt(); + if (var4 >= 0 && (AbstractArchive.field3843 == 0 || var4 <= AbstractArchive.field3843)) { + byte[] var5 = new byte[var4]; + if (var2 == 1) { BZip2Decompressor.BZip2Decompressor_decompress(var5, var4, var0, var3, 9); } else { - AbstractArchive.gzipDecompressor.decompress(var1, var5); // L: 442 + AbstractArchive.gzipDecompressor.decompress(var1, var5); } - return var5; // L: 443 + return var5; } else { - throw new RuntimeException(); // L: 438 + throw new RuntimeException(); } } } diff --git a/runescape-client/src/main/java/VorbisCodebook.java b/runescape-client/src/main/java/VorbisCodebook.java index d6b3fd5b30..b7d622cbb7 100644 --- a/runescape-client/src/main/java/VorbisCodebook.java +++ b/runescape-client/src/main/java/VorbisCodebook.java @@ -23,101 +23,101 @@ public class VorbisCodebook { 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); + this.dimensions = VorbisSample.readBits(16); + this.entries = VorbisSample.readBits(24); + this.lengthMap = new int[this.entries]; + boolean var1 = VorbisSample.readBit() != 0; int var2; int var3; int var5; - if (var1) { // L: 46 - var2 = 0; // L: 47 + if (var1) { + var2 = 0; - for (var3 = VorbisSample.readBits(5) + 1; var2 < this.entries; ++var3) { // L: 48 49 52 - int var4 = VorbisSample.readBits(DynamicObject.iLog(this.entries - var2)); // L: 50 + for (var3 = VorbisSample.readBits(5) + 1; var2 < this.entries; ++var3) { + int var4 = VorbisSample.readBits(DynamicObject.iLog(this.entries - var2)); - for (var5 = 0; var5 < var4; ++var5) { // L: 51 + for (var5 = 0; var5 < var4; ++var5) { this.lengthMap[var2++] = var3; } } } else { - boolean var14 = VorbisSample.readBit() != 0; // L: 56 + boolean var14 = VorbisSample.readBit() != 0; - for (var3 = 0; var3 < this.entries; ++var3) { // L: 57 - if (var14 && VorbisSample.readBit() == 0) { // L: 58 + for (var3 = 0; var3 < this.entries; ++var3) { + if (var14 && VorbisSample.readBit() == 0) { this.lengthMap[var3] = 0; } else { - this.lengthMap[var3] = VorbisSample.readBits(5) + 1; // L: 59 + this.lengthMap[var3] = VorbisSample.readBits(5) + 1; } } } - this.method1012(); // 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.method1012(); + var2 = VorbisSample.readBits(4); + if (var2 > 0) { + float var15 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); + float var16 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); + var5 = VorbisSample.readBits(4) + 1; + boolean var6 = VorbisSample.readBit() != 0; int var7; - if (var2 == 1) { // L: 70 + if (var2 == 1) { var7 = mapType1QuantValues(this.entries, this.dimensions); } else { - var7 = this.entries * this.dimensions; // L: 71 + var7 = this.entries * this.dimensions; } - this.field355 = new int[var7]; // L: 72 + this.field355 = new int[var7]; int var8; - for (var8 = 0; var8 < var7; ++var8) { // L: 73 + for (var8 = 0; var8 < var7; ++var8) { this.field355[var8] = VorbisSample.readBits(var5); } - this.field356 = new float[this.entries][this.dimensions]; // L: 74 + this.field356 = new float[this.entries][this.dimensions]; 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) { + for (var8 = 0; var8 < this.entries; ++var8) { + var9 = 0.0F; + var10 = 1; - for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 79 - int var12 = var8 / var10 % var7; // L: 80 - float var13 = (float)this.field355[var12] * var16 + var15 + var9; // L: 81 - this.field356[var8][var11] = var13; // L: 82 - if (var6) { // L: 83 + for (var11 = 0; var11 < this.dimensions; ++var11) { + int var12 = var8 / var10 % var7; + float var13 = (float)this.field355[var12] * var16 + var15 + var9; + this.field356[var8][var11] = var13; + if (var6) { var9 = var13; } - var10 *= var7; // L: 84 + var10 *= var7; } } } 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) { + var9 = 0.0F; + var10 = var8 * this.dimensions; - for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 92 - float var17 = (float)this.field355[var10] * var16 + var15 + var9; // L: 93 - this.field356[var8][var11] = var17; // L: 94 - if (var6) { // L: 95 + for (var11 = 0; var11 < this.dimensions; ++var11) { + float var17 = (float)this.field355[var10] * var16 + var15 + var9; + this.field356[var8][var11] = var17; + if (var6) { var9 = var17; } - ++var10; // L: 96 + ++var10; } } } } - } // L: 101 + } @ObfuscatedName("b") void method1012() { - int[] var1 = new int[this.entries]; // L: 104 - int[] var2 = new int[33]; // L: 106 + int[] var1 = new int[this.entries]; + int[] var2 = new int[33]; int var3; int var4; @@ -126,132 +126,132 @@ 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) { + var4 = this.lengthMap[var3]; + if (var4 != 0) { + var5 = 1 << 32 - var4; + var6 = var2[var4]; + var1[var3] = var6; int var12; - if ((var6 & var5) != 0) { // L: 114 - var7 = var2[var4 - 1]; // L: 115 + if ((var6 & var5) != 0) { + var7 = var2[var4 - 1]; } else { - var7 = var6 | var5; // L: 118 + var7 = var6 | var5; - 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) { + var12 = var2[var8]; + if (var12 != var6) { 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; + if ((var12 & var10) != 0) { + var2[var8] = var2[var8 - 1]; + break; } - var2[var8] = var12 | var10; // L: 128 + var2[var8] = var12 | var10; } } - var2[var4] = var7; // L: 134 + var2[var4] = var7; - 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) { + var12 = var2[var8]; + if (var12 == var6) { var2[var8] = var7; } } } } - this.keys = new int[8]; // L: 141 - int var11 = 0; // L: 142 + this.keys = new int[8]; + int var11 = 0; - 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) { + var4 = this.lengthMap[var3]; + if (var4 != 0) { + var5 = var1[var3]; + var6 = 0; - 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) { + var8 = Integer.MIN_VALUE >>> var7; + if ((var5 & var8) != 0) { + if (this.keys[var6] == 0) { this.keys[var6] = var11; } - var6 = this.keys[var6]; // L: 152 + var6 = this.keys[var6]; } else { - ++var6; // L: 155 + ++var6; } - if (var6 >= this.keys.length) { // L: 157 - int[] var9 = new int[this.keys.length * 2]; // L: 158 + if (var6 >= this.keys.length) { + int[] var9 = new int[this.keys.length * 2]; - for (var10 = 0; var10 < this.keys.length; ++var10) { // L: 159 + for (var10 = 0; var10 < this.keys.length; ++var10) { var9[var10] = this.keys[var10]; } - this.keys = var9; // L: 160 + this.keys = var9; } - var8 >>>= 1; // L: 162 + var8 >>>= 1; } - this.keys[var6] = ~var3; // L: 164 - if (var6 >= var11) { // L: 165 + this.keys[var6] = ~var3; + if (var6 >= var11) { var11 = var6 + 1; } } } - } // L: 167 + } @ObfuscatedName("p") int method1013() { 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) { } - return ~this.keys[var1]; // L: 172 + return ~this.keys[var1]; } @ObfuscatedName("m") float[] method1014() { - return this.field356[this.method1013()]; // L: 176 + return this.field356[this.method1013()]; } @ObfuscatedName("c") @Export("mapType1QuantValues") static int mapType1QuantValues(int var0, int var1) { - int var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; // L: 16 + int var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; while (true) { - int var4 = var2; // L: 19 - int var5 = var1; // L: 20 + int var4 = var2; + int var5 = var1; int var6; - for (var6 = 1; var5 > 1; var5 >>= 1) { // L: 22 23 26 - if ((var5 & 1) != 0) { // L: 24 + for (var6 = 1; var5 > 1; var5 >>= 1) { + if ((var5 & 1) != 0) { var6 *= var4; } - var4 *= var4; // L: 25 + var4 *= var4; } int var3; - if (var5 == 1) { // L: 28 - var3 = var4 * var6; // L: 29 + if (var5 == 1) { + var3 = var4 * var6; } else { - var3 = var6; // L: 32 + var3 = var6; } - if (var3 <= var0) { // L: 34 - return var2; // L: 37 + if (var3 <= var0) { + return var2; } - --var2; // L: 35 + --var2; } } } diff --git a/runescape-client/src/main/java/VorbisFloor.java b/runescape-client/src/main/java/VorbisFloor.java index 42221415db..64849c4314 100644 --- a/runescape-client/src/main/java/VorbisFloor.java +++ b/runescape-client/src/main/java/VorbisFloor.java @@ -38,285 +38,285 @@ public class VorbisFloor { int[][] subclassBooks; static { - field274 = 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 + field274 = new int[]{256, 128, 86, 64}; + VorbisFloor_decibelStatics = new float[]{1.0649863E-7F, 1.1341951E-7F, 1.2079015E-7F, 1.2863978E-7F, 1.369995E-7F, 1.459025E-7F, 1.5538409E-7F, 1.6548181E-7F, 1.7623574E-7F, 1.8768856E-7F, 1.998856E-7F, 2.128753E-7F, 2.2670913E-7F, 2.4144197E-7F, 2.5713223E-7F, 2.7384212E-7F, 2.9163792E-7F, 3.1059022E-7F, 3.307741E-7F, 3.5226967E-7F, 3.7516213E-7F, 3.995423E-7F, 4.255068E-7F, 4.5315863E-7F, 4.8260745E-7F, 5.1397E-7F, 5.4737063E-7F, 5.829419E-7F, 6.208247E-7F, 6.611694E-7F, 7.041359E-7F, 7.4989464E-7F, 7.98627E-7F, 8.505263E-7F, 9.057983E-7F, 9.646621E-7F, 1.0273513E-6F, 1.0941144E-6F, 1.1652161E-6F, 1.2409384E-6F, 1.3215816E-6F, 1.4074654E-6F, 1.4989305E-6F, 1.5963394E-6F, 1.7000785E-6F, 1.8105592E-6F, 1.9282195E-6F, 2.053526E-6F, 2.1869757E-6F, 2.3290977E-6F, 2.4804558E-6F, 2.6416496E-6F, 2.813319E-6F, 2.9961443E-6F, 3.1908505E-6F, 3.39821E-6F, 3.619045E-6F, 3.8542307E-6F, 4.1047006E-6F, 4.371447E-6F, 4.6555283E-6F, 4.958071E-6F, 5.280274E-6F, 5.623416E-6F, 5.988857E-6F, 6.3780467E-6F, 6.7925284E-6F, 7.2339453E-6F, 7.704048E-6F, 8.2047E-6F, 8.737888E-6F, 9.305725E-6F, 9.910464E-6F, 1.0554501E-5F, 1.1240392E-5F, 1.1970856E-5F, 1.2748789E-5F, 1.3577278E-5F, 1.4459606E-5F, 1.5399271E-5F, 1.6400005E-5F, 1.7465769E-5F, 1.8600793E-5F, 1.9809577E-5F, 2.1096914E-5F, 2.2467912E-5F, 2.3928002E-5F, 2.5482977E-5F, 2.7139005E-5F, 2.890265E-5F, 3.078091E-5F, 3.2781227E-5F, 3.4911533E-5F, 3.718028E-5F, 3.9596467E-5F, 4.2169668E-5F, 4.491009E-5F, 4.7828602E-5F, 5.0936775E-5F, 5.424693E-5F, 5.7772202E-5F, 6.152657E-5F, 6.552491E-5F, 6.9783084E-5F, 7.4317984E-5F, 7.914758E-5F, 8.429104E-5F, 8.976875E-5F, 9.560242E-5F, 1.0181521E-4F, 1.0843174E-4F, 1.1547824E-4F, 1.2298267E-4F, 1.3097477E-4F, 1.3948625E-4F, 1.4855085E-4F, 1.5820454E-4F, 1.6848555E-4F, 1.7943469E-4F, 1.9109536E-4F, 2.0351382E-4F, 2.167393E-4F, 2.3082423E-4F, 2.4582449E-4F, 2.6179955E-4F, 2.7881275E-4F, 2.9693157E-4F, 3.1622787E-4F, 3.3677815E-4F, 3.5866388E-4F, 3.8197188E-4F, 4.0679457E-4F, 4.3323037E-4F, 4.613841E-4F, 4.913675E-4F, 5.2329927E-4F, 5.573062E-4F, 5.935231E-4F, 6.320936E-4F, 6.731706E-4F, 7.16917E-4F, 7.635063E-4F, 8.1312325E-4F, 8.6596457E-4F, 9.2223985E-4F, 9.821722E-4F, 0.0010459992F, 0.0011139743F, 0.0011863665F, 0.0012634633F, 0.0013455702F, 0.0014330129F, 0.0015261382F, 0.0016253153F, 0.0017309374F, 0.0018434235F, 0.0019632196F, 0.0020908006F, 0.0022266726F, 0.0023713743F, 0.0025254795F, 0.0026895993F, 0.0028643848F, 0.0030505287F, 0.003248769F, 0.0034598925F, 0.0036847359F, 0.0039241905F, 0.0041792067F, 0.004450795F, 0.004740033F, 0.005048067F, 0.0053761187F, 0.005725489F, 0.0060975635F, 0.0064938175F, 0.0069158226F, 0.0073652514F, 0.007843887F, 0.008353627F, 0.008896492F, 0.009474637F, 0.010090352F, 0.01074608F, 0.011444421F, 0.012188144F, 0.012980198F, 0.013823725F, 0.014722068F, 0.015678791F, 0.016697686F, 0.017782796F, 0.018938422F, 0.020169148F, 0.021479854F, 0.022875736F, 0.02436233F, 0.025945531F, 0.027631618F, 0.029427277F, 0.031339627F, 0.03337625F, 0.035545226F, 0.037855156F, 0.0403152F, 0.042935107F, 0.045725275F, 0.048696756F, 0.05186135F, 0.05523159F, 0.05882085F, 0.062643364F, 0.06671428F, 0.07104975F, 0.075666964F, 0.08058423F, 0.08582105F, 0.09139818F, 0.097337745F, 0.1036633F, 0.11039993F, 0.11757434F, 0.12521498F, 0.13335215F, 0.14201812F, 0.15124726F, 0.16107617F, 0.1715438F, 0.18269168F, 0.19456401F, 0.20720787F, 0.22067343F, 0.23501402F, 0.25028655F, 0.26655158F, 0.28387362F, 0.3023213F, 0.32196787F, 0.34289113F, 0.36517414F, 0.3889052F, 0.41417846F, 0.44109413F, 0.4697589F, 0.50028646F, 0.53279793F, 0.5674221F, 0.6042964F, 0.64356697F, 0.6853896F, 0.72993004F, 0.777365F, 0.8278826F, 0.88168305F, 0.9389798F, 1.0F}; } VorbisFloor() { - int var1 = VorbisSample.readBits(16); // L: 108 - if (var1 != 1) { // L: 109 - throw new RuntimeException(); // L: 110 + int var1 = VorbisSample.readBits(16); + if (var1 != 1) { + throw new RuntimeException(); } else { - int var2 = VorbisSample.readBits(5); // L: 112 - int var3 = 0; // L: 113 - this.partitionClassList = new int[var2]; // L: 114 + int var2 = VorbisSample.readBits(5); + int var3 = 0; + this.partitionClassList = new int[var2]; int var4; int var5; - for (var4 = 0; var4 < var2; ++var4) { // L: 115 - var5 = VorbisSample.readBits(4); // L: 116 - this.partitionClassList[var4] = var5; // L: 117 - if (var5 >= var3) { // L: 118 + for (var4 = 0; var4 < var2; ++var4) { + var5 = VorbisSample.readBits(4); + this.partitionClassList[var4] = var5; + if (var5 >= var3) { var3 = var5 + 1; } } - this.classDimensions = new int[var3]; // L: 120 - this.classSubClasses = new int[var3]; // L: 121 - this.classMasterbooks = new int[var3]; // L: 122 - this.subclassBooks = new int[var3][]; // L: 123 + this.classDimensions = new int[var3]; + this.classSubClasses = new int[var3]; + this.classMasterbooks = new int[var3]; + this.subclassBooks = new int[var3][]; int var7; - for (var4 = 0; var4 < var3; ++var4) { // L: 124 - this.classDimensions[var4] = VorbisSample.readBits(3) + 1; // L: 125 - var5 = this.classSubClasses[var4] = VorbisSample.readBits(2); // L: 126 - if (var5 != 0) { // L: 127 + for (var4 = 0; var4 < var3; ++var4) { + this.classDimensions[var4] = VorbisSample.readBits(3) + 1; + var5 = this.classSubClasses[var4] = VorbisSample.readBits(2); + if (var5 != 0) { this.classMasterbooks[var4] = VorbisSample.readBits(8); } - var5 = 1 << var5; // L: 128 - int[] var9 = new int[var5]; // L: 129 - this.subclassBooks[var4] = var9; // L: 130 + var5 = 1 << var5; + int[] var9 = new int[var5]; + this.subclassBooks[var4] = var9; - for (var7 = 0; var7 < var5; ++var7) { // L: 131 + for (var7 = 0; var7 < var5; ++var7) { var9[var7] = VorbisSample.readBits(8) - 1; } } - this.multiplier = VorbisSample.readBits(2) + 1; // L: 133 - var4 = VorbisSample.readBits(4); // L: 134 - var5 = 2; // L: 135 + this.multiplier = VorbisSample.readBits(2) + 1; + var4 = VorbisSample.readBits(4); + var5 = 2; int var6; - for (var6 = 0; var6 < var2; ++var6) { // L: 136 + for (var6 = 0; var6 < var2; ++var6) { var5 += this.classDimensions[this.partitionClassList[var6]]; } - this.field268 = new int[var5]; // L: 137 - this.field268[0] = 0; // L: 138 - this.field268[1] = 1 << var4; // L: 139 - var5 = 2; // L: 140 + this.field268 = new int[var5]; + this.field268[0] = 0; + this.field268[1] = 1 << var4; + var5 = 2; - for (var6 = 0; var6 < var2; ++var6) { // L: 141 - var7 = this.partitionClassList[var6]; // L: 142 + for (var6 = 0; var6 < var2; ++var6) { + var7 = this.partitionClassList[var6]; - for (int var8 = 0; var8 < this.classDimensions[var7]; ++var8) { // L: 143 + for (int var8 = 0; var8 < this.classDimensions[var7]; ++var8) { this.field268[var5++] = VorbisSample.readBits(var4); } } - if (field279 == null || field279.length < var5) { // L: 145 - field279 = new int[var5]; // L: 146 - field278 = new int[var5]; // L: 147 - field277 = new boolean[var5]; // L: 148 + if (field279 == null || field279.length < var5) { + field279 = new int[var5]; + field278 = new int[var5]; + field277 = new boolean[var5]; } } - } // L: 150 + } @ObfuscatedName("p") int method726(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 - int var9 = (var5 - var1) * var8; // L: 53 - int var10 = var9 / var7; // L: 54 - return var6 < 0 ? var2 - var10 : var10 + var2; // L: 55 + int var6 = var4 - var2; + int var7 = var3 - var1; + int var8 = var6 < 0 ? -var6 : var6; + int var9 = (var5 - var1) * var8; + int var10 = var9 / var7; + return var6 < 0 ? var2 - var10 : var10 + var2; } @ObfuscatedName("m") void method723(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 - int var10 = var7 / var8; // L: 62 - int var11 = var2; // L: 63 - int var12 = 0; // L: 64 - int var13 = var7 < 0 ? var10 - 1 : var10 + 1; // L: 65 - var9 -= (var10 < 0 ? -var10 : var10) * var8; // L: 66 - var5[var1] *= VorbisFloor_decibelStatics[var2]; // L: 67 - if (var3 > var6) { // L: 68 + int var7 = var4 - var2; + int var8 = var3 - var1; + int var9 = var7 < 0 ? -var7 : var7; + int var10 = var7 / var8; + int var11 = var2; + int var12 = 0; + int var13 = var7 < 0 ? var10 - 1 : var10 + 1; + var9 -= (var10 < 0 ? -var10 : var10) * var8; + var5[var1] *= VorbisFloor_decibelStatics[var2]; + if (var3 > var6) { var3 = var6; } - for (int var14 = var1 + 1; var14 < var3; ++var14) { // L: 69 - var12 += var9; // L: 70 - if (var12 >= var8) { // L: 71 - var12 -= var8; // L: 72 - var11 += var13; // L: 73 + for (int var14 = var1 + 1; var14 < var3; ++var14) { + var12 += var9; + if (var12 >= var8) { + var12 -= var8; + var11 += var13; } else { - var11 += var10; // L: 76 + var11 += var10; } - var5[var14] *= VorbisFloor_decibelStatics[var11]; // L: 78 + var5[var14] *= VorbisFloor_decibelStatics[var11]; } - } // L: 80 + } @ObfuscatedName("t") @Export("VarbisFloor_sort") void VarbisFloor_sort(int var1, int var2) { - if (var1 < var2) { // L: 83 - int var3 = var1; // L: 84 - int var4 = field279[var1]; // L: 85 - int var5 = field278[var1]; // L: 86 - boolean var6 = field277[var1]; // L: 87 + if (var1 < var2) { + int var3 = var1; + int var4 = field279[var1]; + int var5 = field278[var1]; + boolean var6 = field277[var1]; - for (int var7 = var1 + 1; var7 <= var2; ++var7) { // L: 88 - int var8 = field279[var7]; // L: 89 - if (var8 < var4) { // L: 90 - field279[var3] = var8; // L: 91 - field278[var3] = field278[var7]; // L: 92 - field277[var3] = field277[var7]; // L: 93 - ++var3; // L: 94 - field279[var7] = field279[var3]; // L: 95 - field278[var7] = field278[var3]; // L: 96 - field277[var7] = field277[var3]; // L: 97 + for (int var7 = var1 + 1; var7 <= var2; ++var7) { + int var8 = field279[var7]; + if (var8 < var4) { + field279[var3] = var8; + field278[var3] = field278[var7]; + field277[var3] = field277[var7]; + ++var3; + field279[var7] = field279[var3]; + field278[var7] = field278[var3]; + field277[var7] = field277[var3]; } } - field279[var3] = var4; // L: 100 - field278[var3] = var5; // L: 101 - field277[var3] = var6; // L: 102 - this.VarbisFloor_sort(var1, var3 - 1); // L: 103 - this.VarbisFloor_sort(var3 + 1, var2); // L: 104 + field279[var3] = var4; + field278[var3] = var5; + field277[var3] = var6; + this.VarbisFloor_sort(var1, var3 - 1); + this.VarbisFloor_sort(var3 + 1, var2); } - } // L: 105 + } @ObfuscatedName("s") @Export("readSubmapFloor") boolean readSubmapFloor() { - boolean var1 = VorbisSample.readBit() != 0; // L: 153 - if (!var1) { // L: 154 + boolean var1 = VorbisSample.readBit() != 0; + if (!var1) { return false; } else { - int var2 = this.field268.length; // L: 155 + int var2 = this.field268.length; int var3; - for (var3 = 0; var3 < var2; ++var3) { // L: 156 + for (var3 = 0; var3 < var2; ++var3) { field279[var3] = this.field268[var3]; } - var3 = field274[this.multiplier - 1]; // L: 157 - int var4 = DynamicObject.iLog(var3 - 1); // L: 158 - field278[0] = VorbisSample.readBits(var4); // L: 159 - field278[1] = VorbisSample.readBits(var4); // L: 160 - int var5 = 2; // L: 161 + var3 = field274[this.multiplier - 1]; + int var4 = DynamicObject.iLog(var3 - 1); + field278[0] = VorbisSample.readBits(var4); + field278[1] = VorbisSample.readBits(var4); + int var5 = 2; - for (int var6 = 0; var6 < this.partitionClassList.length; ++var6) { // L: 162 - int var7 = this.partitionClassList[var6]; // L: 163 - int var8 = this.classDimensions[var7]; // L: 164 - int var9 = this.classSubClasses[var7]; // L: 165 - int var10 = (1 << var9) - 1; // L: 166 - int var11 = 0; // L: 167 - if (var9 > 0) { // L: 168 + for (int var6 = 0; var6 < this.partitionClassList.length; ++var6) { + int var7 = this.partitionClassList[var6]; + int var8 = this.classDimensions[var7]; + int var9 = this.classSubClasses[var7]; + int var10 = (1 << var9) - 1; + int var11 = 0; + if (var9 > 0) { var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method1013(); } - for (int var12 = 0; var12 < var8; ++var12) { // L: 169 - int var13 = this.subclassBooks[var7][var11 & var10]; // L: 170 - var11 >>>= var9; // L: 171 - field278[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method1013() : 0; // L: 172 + for (int var12 = 0; var12 < var8; ++var12) { + int var13 = this.subclassBooks[var7][var11 & var10]; + var11 >>>= var9; + field278[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method1013() : 0; } } - return true; // L: 175 + return true; } } @ObfuscatedName("j") void method728(float[] var1, int var2) { - int var3 = this.field268.length; // L: 179 - int var4 = field274[this.multiplier - 1]; // L: 180 - boolean[] var5 = field277; // L: 181 - field277[1] = true; // L: 182 - var5[0] = true; // L: 183 + int var3 = this.field268.length; + int var4 = field274[this.multiplier - 1]; + boolean[] var5 = field277; + field277[1] = true; + var5[0] = true; int var6; int var7; int var8; int var9; int var10; - for (var6 = 2; var6 < var3; ++var6) { // L: 184 - var7 = method722(field279, var6); // L: 185 - var8 = method721(field279, var6); // L: 186 - var9 = this.method726(field279[var7], field278[var7], field279[var8], field278[var8], field279[var6]); // L: 187 - var10 = field278[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 = field277; // L: 193 - field277[var8] = true; // L: 195 - var14[var7] = true; // L: 196 - field277[var6] = true; // L: 197 - if (var10 >= var13) { // L: 198 - field278[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; // L: 199 + for (var6 = 2; var6 < var3; ++var6) { + var7 = method722(field279, var6); + var8 = method721(field279, var6); + var9 = this.method726(field279[var7], field278[var7], field279[var8], field278[var8], field279[var6]); + var10 = field278[var6]; + int var11 = var4 - var9; + int var13 = (var11 < var9 ? var11 : var9) << 1; + if (var10 != 0) { + boolean[] var14 = field277; + field277[var8] = true; + var14[var7] = true; + field277[var6] = true; + if (var10 >= var13) { + field278[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; } else { - field278[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; // L: 202 + field278[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; } } else { - field277[var6] = false; // L: 206 - field278[var6] = var9; // L: 207 + field277[var6] = false; + field278[var6] = var9; } } - this.VarbisFloor_sort(0, var3 - 1); // L: 210 - var6 = 0; // L: 211 - var7 = field278[0] * this.multiplier; // L: 212 + this.VarbisFloor_sort(0, var3 - 1); + var6 = 0; + var7 = field278[0] * this.multiplier; - for (var8 = 1; var8 < var3; ++var8) { // L: 213 - if (field277[var8]) { // L: 214 - var9 = field279[var8]; // L: 215 - var10 = field278[var8] * this.multiplier; // L: 216 - this.method723(var6, var7, var9, var10, var1, var2); // L: 217 - if (var9 >= var2) { // L: 218 + for (var8 = 1; var8 < var3; ++var8) { + if (field277[var8]) { + var9 = field279[var8]; + var10 = field278[var8] * this.multiplier; + this.method723(var6, var7, var9, var10, var1, var2); + if (var9 >= var2) { return; } - var6 = var9; // L: 219 - var7 = var10; // L: 220 + var6 = var9; + var7 = var10; } } - float var16 = VorbisFloor_decibelStatics[var7]; // L: 223 + float var16 = VorbisFloor_decibelStatics[var7]; - for (var9 = var6; var9 < var2; ++var9) { // L: 224 + for (var9 = var6; var9 < var2; ++var9) { var1[var9] *= var16; } - } // L: 225 + } @ObfuscatedName("c") static int method722(int[] var0, int var1) { - int var2 = var0[var1]; // L: 22 - int var3 = -1; // L: 23 - int var4 = Integer.MIN_VALUE; // L: 24 + int var2 = var0[var1]; + int var3 = -1; + int var4 = Integer.MIN_VALUE; - for (int var5 = 0; var5 < var1; ++var5) { // L: 25 - int var6 = var0[var5]; // L: 26 - if (var6 < var2 && var6 > var4) { // L: 27 - var3 = var5; // L: 28 - var4 = var6; // L: 29 + for (int var5 = 0; var5 < var1; ++var5) { + int var6 = var0[var5]; + if (var6 < var2 && var6 > var4) { + var3 = var5; + var4 = var6; } } - return var3; // L: 32 + return var3; } @ObfuscatedName("b") static int method721(int[] var0, int var1) { - int var2 = var0[var1]; // L: 36 - int var3 = -1; // L: 37 - int var4 = Integer.MAX_VALUE; // L: 38 + int var2 = var0[var1]; + int var3 = -1; + int var4 = Integer.MAX_VALUE; - for (int var5 = 0; var5 < var1; ++var5) { // L: 39 - int var6 = var0[var5]; // L: 40 - if (var6 > var2 && var6 < var4) { // L: 41 - var3 = var5; // L: 42 - var4 = var6; // L: 43 + for (int var5 = 0; var5 < var1; ++var5) { + int var6 = var0[var5]; + if (var6 > var2 && var6 < var4) { + var3 = var5; + var4 = var6; } } - return var3; // L: 46 + return var3; } } diff --git a/runescape-client/src/main/java/VorbisMapping.java b/runescape-client/src/main/java/VorbisMapping.java index ac7cdbf1c8..26e117c598 100644 --- a/runescape-client/src/main/java/VorbisMapping.java +++ b/runescape-client/src/main/java/VorbisMapping.java @@ -19,25 +19,25 @@ public class VorbisMapping { int[] submapResidue; VorbisMapping() { - VorbisSample.readBits(16); // L: 12 - this.submaps = VorbisSample.readBit() != 0 ? VorbisSample.readBits(4) + 1 : 1; // L: 13 - if (VorbisSample.readBit() != 0) { // L: 14 - VorbisSample.readBits(8); // L: 15 + VorbisSample.readBits(16); + this.submaps = VorbisSample.readBit() != 0 ? VorbisSample.readBits(4) + 1 : 1; + if (VorbisSample.readBit() != 0) { + VorbisSample.readBits(8); } - VorbisSample.readBits(2); // L: 18 - if (this.submaps > 1) { // L: 19 - this.mappingMux = VorbisSample.readBits(4); // L: 20 + VorbisSample.readBits(2); + if (this.submaps > 1) { + this.mappingMux = VorbisSample.readBits(4); } - this.submapFloor = new int[this.submaps]; // L: 22 - this.submapResidue = new int[this.submaps]; // L: 23 + this.submapFloor = new int[this.submaps]; + this.submapResidue = new int[this.submaps]; - for (int var1 = 0; var1 < this.submaps; ++var1) { // L: 24 - VorbisSample.readBits(8); // L: 25 - this.submapFloor[var1] = VorbisSample.readBits(8); // L: 26 - this.submapResidue[var1] = VorbisSample.readBits(8); // L: 27 + for (int var1 = 0; var1 < this.submaps; ++var1) { + VorbisSample.readBits(8); + this.submapFloor[var1] = VorbisSample.readBits(8); + this.submapResidue[var1] = VorbisSample.readBits(8); } - } // L: 29 + } } diff --git a/runescape-client/src/main/java/VorbisResidue.java b/runescape-client/src/main/java/VorbisResidue.java index 2265938a05..4cf1cdefe9 100644 --- a/runescape-client/src/main/java/VorbisResidue.java +++ b/runescape-client/src/main/java/VorbisResidue.java @@ -28,98 +28,98 @@ public class VorbisResidue { int[] cascade; VorbisResidue() { - this.residueType = VorbisSample.readBits(16); // L: 15 - this.begin = VorbisSample.readBits(24); // L: 16 - this.end = VorbisSample.readBits(24); // L: 17 - this.partitionSize = VorbisSample.readBits(24) + 1; // L: 18 - this.classifications = VorbisSample.readBits(6) + 1; // L: 19 - this.classbook = VorbisSample.readBits(8); // L: 20 - int[] var1 = new int[this.classifications]; // L: 21 + this.residueType = VorbisSample.readBits(16); + this.begin = VorbisSample.readBits(24); + this.end = VorbisSample.readBits(24); + this.partitionSize = VorbisSample.readBits(24) + 1; + this.classifications = VorbisSample.readBits(6) + 1; + this.classbook = VorbisSample.readBits(8); + int[] var1 = new int[this.classifications]; int var2; - for (var2 = 0; var2 < this.classifications; ++var2) { // L: 22 - int var3 = 0; // L: 23 - int var4 = VorbisSample.readBits(3); // L: 24 - boolean var5 = VorbisSample.readBit() != 0; // L: 25 - if (var5) { // L: 26 + for (var2 = 0; var2 < this.classifications; ++var2) { + int var3 = 0; + int var4 = VorbisSample.readBits(3); + boolean var5 = VorbisSample.readBit() != 0; + if (var5) { var3 = VorbisSample.readBits(5); } - var1[var2] = var3 << 3 | var4; // L: 27 + var1[var2] = var3 << 3 | var4; } - this.cascade = new int[this.classifications * 8]; // L: 29 + this.cascade = new int[this.classifications * 8]; - for (var2 = 0; var2 < this.classifications * 8; ++var2) { // L: 30 + for (var2 = 0; var2 < this.classifications * 8; ++var2) { this.cascade[var2] = (var1[var2 >> 3] & 1 << (var2 & 7)) != 0 ? VorbisSample.readBits(8) : -1; } - } // L: 31 + } @ObfuscatedName("c") void method834(float[] var1, int var2, boolean var3) { int var4; - for (var4 = 0; var4 < var2; ++var4) { // L: 34 + for (var4 = 0; var4 < var2; ++var4) { var1[var4] = 0.0F; } - if (!var3) { // L: 35 - var4 = VorbisSample.VorbisSample_codebooks[this.classbook].dimensions; // L: 36 - int var5 = this.end - this.begin; // L: 37 - int var6 = var5 / this.partitionSize; // L: 38 - int[] var7 = new int[var6]; // L: 39 + if (!var3) { + var4 = VorbisSample.VorbisSample_codebooks[this.classbook].dimensions; + int var5 = this.end - this.begin; + int var6 = var5 / this.partitionSize; + int[] var7 = new int[var6]; - for (int var8 = 0; var8 < 8; ++var8) { // L: 40 - int var9 = 0; // L: 41 + for (int var8 = 0; var8 < 8; ++var8) { + int var9 = 0; - while (var9 < var6) { // L: 42 + while (var9 < var6) { int var10; int var11; - if (var8 == 0) { // L: 43 - var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method1013(); // L: 45 + if (var8 == 0) { + var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method1013(); - for (var11 = var4 - 1; var11 >= 0; --var11) { // L: 46 - if (var9 + var11 < var6) { // L: 47 + for (var11 = var4 - 1; var11 >= 0; --var11) { + if (var9 + var11 < var6) { var7[var9 + var11] = var10 % this.classifications; } - var10 /= this.classifications; // L: 48 + var10 /= this.classifications; } } - for (var10 = 0; var10 < var4; ++var10) { // L: 52 - var11 = var7[var9]; // L: 54 - int var12 = this.cascade[var8 + var11 * 8]; // L: 55 - if (var12 >= 0) { // L: 56 - int var13 = var9 * this.partitionSize + this.begin; // L: 57 - VorbisCodebook var14 = VorbisSample.VorbisSample_codebooks[var12]; // L: 58 + for (var10 = 0; var10 < var4; ++var10) { + var11 = var7[var9]; + int var12 = this.cascade[var8 + var11 * 8]; + if (var12 >= 0) { + int var13 = var9 * this.partitionSize + this.begin; + VorbisCodebook var14 = VorbisSample.VorbisSample_codebooks[var12]; int var15; - if (this.residueType == 0) { // L: 59 - var15 = this.partitionSize / var14.dimensions; // L: 60 + if (this.residueType == 0) { + var15 = this.partitionSize / var14.dimensions; - for (int var19 = 0; var19 < var15; ++var19) { // L: 61 - float[] var20 = var14.method1014(); // L: 62 + for (int var19 = 0; var19 < var15; ++var19) { + float[] var20 = var14.method1014(); - for (int var18 = 0; var18 < var14.dimensions; ++var18) { // L: 63 + for (int var18 = 0; var18 < var14.dimensions; ++var18) { var1[var13 + var19 + var18 * var15] += var20[var18]; } } } else { - var15 = 0; // L: 67 + var15 = 0; - while (var15 < this.partitionSize) { // L: 68 - float[] var16 = var14.method1014(); // L: 69 + while (var15 < this.partitionSize) { + float[] var16 = var14.method1014(); - for (int var17 = 0; var17 < var14.dimensions; ++var17) { // L: 70 - var1[var13 + var15] += var16[var17]; // L: 71 - ++var15; // L: 72 + for (int var17 = 0; var17 < var14.dimensions; ++var17) { + var1[var13 + var15] += var16[var17]; + ++var15; } } } } - ++var9; // L: 78 - if (var9 >= var6) { // L: 79 + ++var9; + if (var9 >= var6) { break; } } @@ -127,5 +127,5 @@ public class VorbisResidue { } } - } // L: 83 + } } diff --git a/runescape-client/src/main/java/VorbisSample.java b/runescape-client/src/main/java/VorbisSample.java index 17ad9c6be6..a128f81819 100644 --- a/runescape-client/src/main/java/VorbisSample.java +++ b/runescape-client/src/main/java/VorbisSample.java @@ -104,297 +104,297 @@ public class VorbisSample extends Node { int field391; static { - field388 = false; // L: 28 + field388 = false; } VorbisSample(byte[] var1) { - this.read(var1); // L: 401 - } // L: 402 + this.read(var1); + } @ObfuscatedName("t") @Export("read") void read(byte[] var1) { - Buffer var2 = new Buffer(var1); // L: 89 - this.sampleRate = var2.readInt(); // L: 90 - this.sampleCount = var2.readInt(); // L: 91 - this.start = var2.readInt(); // L: 92 - this.end = var2.readInt(); // L: 93 - if (this.end < 0) { // L: 94 - this.end = ~this.end; // L: 95 - this.field368 = true; // L: 96 + Buffer var2 = new Buffer(var1); + this.sampleRate = var2.readInt(); + this.sampleCount = var2.readInt(); + this.start = var2.readInt(); + this.end = var2.readInt(); + if (this.end < 0) { + this.end = ~this.end; + this.field368 = true; } - int var3 = var2.readInt(); // L: 98 - this.field375 = new byte[var3][]; // L: 99 + int var3 = var2.readInt(); + this.field375 = new byte[var3][]; - for (int var4 = 0; var4 < var3; ++var4) { // L: 100 - int var5 = 0; // L: 101 + for (int var4 = 0; var4 < var3; ++var4) { + int var5 = 0; int var6; do { - var6 = var2.readUnsignedByte(); // L: 103 - var5 += var6; // L: 104 - } while(var6 >= 255); // L: 105 + var6 = var2.readUnsignedByte(); + var5 += var6; + } while(var6 >= 255); - byte[] var7 = new byte[var5]; // L: 107 - var2.readBytes(var7, 0, var5); // L: 108 - this.field375[var4] = var7; // L: 109 + byte[] var7 = new byte[var5]; + var2.readBytes(var7, 0, var5); + this.field375[var4] = var7; } - } // L: 111 + } @ObfuscatedName("j") float[] method1032(int var1) { - VorbisSample_setData(this.field375[var1], 0); // L: 182 - readBit(); // L: 183 - int var2 = readBits(DynamicObject.iLog(VorbisSample_mapping.length - 1)); // L: 184 - boolean var3 = VorbisSample_blockFlags[var2]; // L: 185 - int var4 = var3 ? VorbisSample_blockSize1 : VorbisSample_blockSize0; // L: 186 - boolean var5 = false; // L: 187 - boolean var6 = false; // L: 188 - if (var3) { // L: 189 - var5 = readBit() != 0; // L: 190 - var6 = readBit() != 0; // L: 191 + VorbisSample_setData(this.field375[var1], 0); + readBit(); + int var2 = readBits(DynamicObject.iLog(VorbisSample_mapping.length - 1)); + boolean var3 = VorbisSample_blockFlags[var2]; + int var4 = var3 ? VorbisSample_blockSize1 : VorbisSample_blockSize0; + boolean var5 = false; + boolean var6 = false; + if (var3) { + var5 = readBit() != 0; + var6 = readBit() != 0; } - int var7 = var4 >> 1; // L: 193 + int var7 = var4 >> 1; int var8; int var9; int var10; - if (var3 && !var5) { // L: 197 - var8 = (var4 >> 2) - (VorbisSample_blockSize0 >> 2); // L: 198 - var9 = (VorbisSample_blockSize0 >> 2) + (var4 >> 2); // L: 199 - var10 = VorbisSample_blockSize0 >> 1; // L: 200 + if (var3 && !var5) { + var8 = (var4 >> 2) - (VorbisSample_blockSize0 >> 2); + var9 = (VorbisSample_blockSize0 >> 2) + (var4 >> 2); + var10 = VorbisSample_blockSize0 >> 1; } else { - var8 = 0; // L: 203 - var9 = var7; // L: 204 - var10 = var4 >> 1; // L: 205 + var8 = 0; + var9 = var7; + var10 = var4 >> 1; } int var11; int var12; int var13; - if (var3 && !var6) { // L: 210 - var11 = var4 - (var4 >> 2) - (VorbisSample_blockSize0 >> 2); // L: 211 - var12 = (VorbisSample_blockSize0 >> 2) + (var4 - (var4 >> 2)); // L: 212 - var13 = VorbisSample_blockSize0 >> 1; // L: 213 + if (var3 && !var6) { + var11 = var4 - (var4 >> 2) - (VorbisSample_blockSize0 >> 2); + var12 = (VorbisSample_blockSize0 >> 2) + (var4 - (var4 >> 2)); + var13 = VorbisSample_blockSize0 >> 1; } else { - var11 = var7; // L: 216 - var12 = var4; // L: 217 - var13 = var4 >> 1; // L: 218 + var11 = var7; + var12 = var4; + var13 = var4 >> 1; } - VorbisMapping var14 = VorbisSample_mappings[VorbisSample_mapping[var2]]; // L: 220 - int var16 = var14.mappingMux; // L: 223 - int var17 = var14.submapFloor[var16]; // L: 224 - boolean var15 = !VorbisSample_floors[var17].readSubmapFloor(); // L: 225 - boolean var45 = var15; // L: 227 + VorbisMapping var14 = VorbisSample_mappings[VorbisSample_mapping[var2]]; + int var16 = var14.mappingMux; + int var17 = var14.submapFloor[var16]; + boolean var15 = !VorbisSample_floors[var17].readSubmapFloor(); + boolean var45 = var15; - for (var17 = 0; var17 < var14.submaps; ++var17) { // L: 228 - VorbisResidue var42 = VorbisSample_residues[var14.submapResidue[var17]]; // L: 229 - float[] var44 = field380; // L: 230 - var42.method834(var44, var4 >> 1, var45); // L: 231 + for (var17 = 0; var17 < var14.submaps; ++var17) { + VorbisResidue var42 = VorbisSample_residues[var14.submapResidue[var17]]; + float[] var44 = field380; + var42.method834(var44, var4 >> 1, var45); } int var18; - if (!var15) { // L: 234 - var17 = var14.mappingMux; // L: 235 - var18 = var14.submapFloor[var17]; // L: 236 - VorbisSample_floors[var18].method728(field380, var4 >> 1); // L: 237 + if (!var15) { + var17 = var14.mappingMux; + var18 = var14.submapFloor[var17]; + VorbisSample_floors[var18].method728(field380, var4 >> 1); } int var19; - if (var15) { // L: 240 - for (var17 = var4 >> 1; var17 < var4; ++var17) { // L: 241 + if (var15) { + for (var17 = var4 >> 1; var17 < var4; ++var17) { field380[var17] = 0.0F; } } else { - var17 = var4 >> 1; // L: 244 - var18 = var4 >> 2; // L: 245 - var19 = var4 >> 3; // L: 246 - float[] var20 = field380; // L: 247 + var17 = var4 >> 1; + var18 = var4 >> 2; + var19 = var4 >> 3; + float[] var20 = field380; int var21; - for (var21 = 0; var21 < var17; ++var21) { // L: 248 + for (var21 = 0; var21 < var17; ++var21) { var20[var21] *= 0.5F; } - for (var21 = var17; var21 < var4; ++var21) { // L: 249 + for (var21 = var17; var21 < var4; ++var21) { var20[var21] = -var20[var4 - var21 - 1]; } - float[] var40 = var3 ? field363 : field381; // L: 250 - float[] var22 = var3 ? field378 : field382; // L: 251 - float[] var23 = var3 ? field367 : field383; // L: 252 - int[] var24 = var3 ? field384 : field358; // L: 253 + float[] var40 = var3 ? field363 : field381; + float[] var22 = var3 ? field378 : field382; + float[] var23 = var3 ? field367 : field383; + int[] var24 = var3 ? field384 : field358; int var25; float var26; float var27; float var28; float var29; - for (var25 = 0; var25 < var18; ++var25) { // L: 254 - var26 = var20[var25 * 4] - var20[var4 - var25 * 4 - 1]; // L: 255 - var27 = var20[var25 * 4 + 2] - var20[var4 - var25 * 4 - 3]; // L: 256 - var28 = var40[var25 * 2]; // L: 257 - var29 = var40[var25 * 2 + 1]; // L: 258 - var20[var4 - var25 * 4 - 1] = var26 * var28 - var27 * var29; // L: 259 - var20[var4 - var25 * 4 - 3] = var26 * var29 + var27 * var28; // L: 260 + for (var25 = 0; var25 < var18; ++var25) { + var26 = var20[var25 * 4] - var20[var4 - var25 * 4 - 1]; + var27 = var20[var25 * 4 + 2] - var20[var4 - var25 * 4 - 3]; + var28 = var40[var25 * 2]; + var29 = var40[var25 * 2 + 1]; + var20[var4 - var25 * 4 - 1] = var26 * var28 - var27 * var29; + var20[var4 - var25 * 4 - 3] = var26 * var29 + var27 * var28; } float var30; float var31; - for (var25 = 0; var25 < var19; ++var25) { // L: 262 - var26 = var20[var17 + var25 * 4 + 3]; // L: 263 - var27 = var20[var17 + var25 * 4 + 1]; // L: 264 - var28 = var20[var25 * 4 + 3]; // L: 265 - var29 = var20[var25 * 4 + 1]; // L: 266 - var20[var17 + var25 * 4 + 3] = var26 + var28; // L: 267 - var20[var17 + var25 * 4 + 1] = var27 + var29; // L: 268 - var30 = var40[var17 - 4 - var25 * 4]; // L: 269 - var31 = var40[var17 - 3 - var25 * 4]; // L: 270 - var20[var25 * 4 + 3] = (var26 - var28) * var30 - (var27 - var29) * var31; // L: 271 - var20[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31; // L: 272 + for (var25 = 0; var25 < var19; ++var25) { + var26 = var20[var17 + var25 * 4 + 3]; + var27 = var20[var17 + var25 * 4 + 1]; + var28 = var20[var25 * 4 + 3]; + var29 = var20[var25 * 4 + 1]; + var20[var17 + var25 * 4 + 3] = var26 + var28; + var20[var17 + var25 * 4 + 1] = var27 + var29; + var30 = var40[var17 - 4 - var25 * 4]; + var31 = var40[var17 - 3 - var25 * 4]; + var20[var25 * 4 + 3] = (var26 - var28) * var30 - (var27 - var29) * var31; + var20[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31; } - var25 = DynamicObject.iLog(var4 - 1); // L: 274 + var25 = DynamicObject.iLog(var4 - 1); int var46; int var47; int var48; int var49; - for (var46 = 0; var46 < var25 - 3; ++var46) { // L: 275 - var47 = var4 >> var46 + 2; // L: 276 - var48 = 8 << var46; // L: 277 + for (var46 = 0; var46 < var25 - 3; ++var46) { + var47 = var4 >> var46 + 2; + var48 = 8 << var46; - for (var49 = 0; var49 < 2 << var46; ++var49) { // L: 278 - int var50 = var4 - var47 * var49 * 2; // L: 279 - int var51 = var4 - var47 * (var49 * 2 + 1); // L: 280 + for (var49 = 0; var49 < 2 << var46; ++var49) { + int var50 = var4 - var47 * var49 * 2; + int var51 = var4 - var47 * (var49 * 2 + 1); - for (int var32 = 0; var32 < var4 >> var46 + 4; ++var32) { // L: 281 - int var33 = var32 * 4; // L: 282 - float var34 = var20[var50 - 1 - var33]; // L: 283 - float var35 = var20[var50 - 3 - var33]; // L: 284 - float var36 = var20[var51 - 1 - var33]; // L: 285 - float var37 = var20[var51 - 3 - var33]; // L: 286 - var20[var50 - 1 - var33] = var34 + var36; // L: 287 - var20[var50 - 3 - var33] = var35 + var37; // L: 288 - float var38 = var40[var32 * var48]; // L: 289 - float var39 = var40[var32 * var48 + 1]; // L: 290 - var20[var51 - 1 - var33] = (var34 - var36) * var38 - (var35 - var37) * var39; // L: 291 - var20[var51 - 3 - var33] = (var35 - var37) * var38 + (var34 - var36) * var39; // L: 292 + for (int var32 = 0; var32 < var4 >> var46 + 4; ++var32) { + int var33 = var32 * 4; + float var34 = var20[var50 - 1 - var33]; + float var35 = var20[var50 - 3 - var33]; + float var36 = var20[var51 - 1 - var33]; + float var37 = var20[var51 - 3 - var33]; + var20[var50 - 1 - var33] = var34 + var36; + var20[var50 - 3 - var33] = var35 + var37; + float var38 = var40[var32 * var48]; + float var39 = var40[var32 * var48 + 1]; + var20[var51 - 1 - var33] = (var34 - var36) * var38 - (var35 - var37) * var39; + var20[var51 - 3 - var33] = (var35 - var37) * var38 + (var34 - var36) * var39; } } } - for (var46 = 1; var46 < var19 - 1; ++var46) { // L: 296 - var47 = var24[var46]; // L: 297 - if (var46 < var47) { // L: 298 - var48 = var46 * 8; // L: 299 - var49 = var47 * 8; // L: 300 - var30 = var20[var48 + 1]; // L: 302 - var20[var48 + 1] = var20[var49 + 1]; // L: 303 - var20[var49 + 1] = var30; // L: 304 - var30 = var20[var48 + 3]; // L: 305 - var20[var48 + 3] = var20[var49 + 3]; // L: 306 - var20[var49 + 3] = var30; // L: 307 - var30 = var20[var48 + 5]; // L: 308 - var20[var48 + 5] = var20[var49 + 5]; // L: 309 - var20[var49 + 5] = var30; // L: 310 - var30 = var20[var48 + 7]; // L: 311 - var20[var48 + 7] = var20[var49 + 7]; // L: 312 - var20[var49 + 7] = var30; // L: 313 + for (var46 = 1; var46 < var19 - 1; ++var46) { + var47 = var24[var46]; + if (var46 < var47) { + var48 = var46 * 8; + var49 = var47 * 8; + var30 = var20[var48 + 1]; + var20[var48 + 1] = var20[var49 + 1]; + var20[var49 + 1] = var30; + var30 = var20[var48 + 3]; + var20[var48 + 3] = var20[var49 + 3]; + var20[var49 + 3] = var30; + var30 = var20[var48 + 5]; + var20[var48 + 5] = var20[var49 + 5]; + var20[var49 + 5] = var30; + var30 = var20[var48 + 7]; + var20[var48 + 7] = var20[var49 + 7]; + var20[var49 + 7] = var30; } } - for (var46 = 0; var46 < var17; ++var46) { // L: 316 + for (var46 = 0; var46 < var17; ++var46) { var20[var46] = var20[var46 * 2 + 1]; } - for (var46 = 0; var46 < var19; ++var46) { // L: 317 - var20[var4 - 1 - var46 * 2] = var20[var46 * 4]; // L: 318 - var20[var4 - 2 - var46 * 2] = var20[var46 * 4 + 1]; // L: 319 - var20[var4 - var18 - 1 - var46 * 2] = var20[var46 * 4 + 2]; // L: 320 - var20[var4 - var18 - 2 - var46 * 2] = var20[var46 * 4 + 3]; // L: 321 + for (var46 = 0; var46 < var19; ++var46) { + var20[var4 - 1 - var46 * 2] = var20[var46 * 4]; + var20[var4 - 2 - var46 * 2] = var20[var46 * 4 + 1]; + var20[var4 - var18 - 1 - var46 * 2] = var20[var46 * 4 + 2]; + var20[var4 - var18 - 2 - var46 * 2] = var20[var46 * 4 + 3]; } - for (var46 = 0; var46 < var19; ++var46) { // L: 323 - var27 = var23[var46 * 2]; // L: 324 - var28 = var23[var46 * 2 + 1]; // L: 325 - var29 = var20[var17 + var46 * 2]; // L: 326 - var30 = var20[var17 + var46 * 2 + 1]; // L: 327 - var31 = var20[var4 - 2 - var46 * 2]; // L: 328 - float var52 = var20[var4 - 1 - var46 * 2]; // L: 329 - float var53 = var28 * (var29 - var31) + var27 * (var30 + var52); // L: 330 - var20[var17 + var46 * 2] = (var29 + var31 + var53) * 0.5F; // L: 331 - var20[var4 - 2 - var46 * 2] = (var29 + var31 - var53) * 0.5F; // L: 332 - var53 = var28 * (var30 + var52) - var27 * (var29 - var31); // L: 333 - var20[var17 + var46 * 2 + 1] = (var30 - var52 + var53) * 0.5F; // L: 334 - var20[var4 - 1 - var46 * 2] = (-var30 + var52 + var53) * 0.5F; // L: 335 + for (var46 = 0; var46 < var19; ++var46) { + var27 = var23[var46 * 2]; + var28 = var23[var46 * 2 + 1]; + var29 = var20[var17 + var46 * 2]; + var30 = var20[var17 + var46 * 2 + 1]; + var31 = var20[var4 - 2 - var46 * 2]; + float var52 = var20[var4 - 1 - var46 * 2]; + float var53 = var28 * (var29 - var31) + var27 * (var30 + var52); + var20[var17 + var46 * 2] = (var29 + var31 + var53) * 0.5F; + var20[var4 - 2 - var46 * 2] = (var29 + var31 - var53) * 0.5F; + var53 = var28 * (var30 + var52) - var27 * (var29 - var31); + var20[var17 + var46 * 2 + 1] = (var30 - var52 + var53) * 0.5F; + var20[var4 - 1 - var46 * 2] = (-var30 + var52 + var53) * 0.5F; } - for (var46 = 0; var46 < var18; ++var46) { // L: 337 - var20[var46] = var20[var17 + var46 * 2] * var22[var46 * 2] + var20[var17 + var46 * 2 + 1] * var22[var46 * 2 + 1]; // L: 338 - var20[var17 - 1 - var46] = var20[var17 + var46 * 2] * var22[var46 * 2 + 1] - var20[var17 + var46 * 2 + 1] * var22[var46 * 2]; // L: 339 + for (var46 = 0; var46 < var18; ++var46) { + var20[var46] = var20[var17 + var46 * 2] * var22[var46 * 2] + var20[var17 + var46 * 2 + 1] * var22[var46 * 2 + 1]; + var20[var17 - 1 - var46] = var20[var17 + var46 * 2] * var22[var46 * 2 + 1] - var20[var17 + var46 * 2 + 1] * var22[var46 * 2]; } - for (var46 = 0; var46 < var18; ++var46) { // L: 341 + for (var46 = 0; var46 < var18; ++var46) { var20[var46 + (var4 - var18)] = -var20[var46]; } - for (var46 = 0; var46 < var18; ++var46) { // L: 342 + for (var46 = 0; var46 < var18; ++var46) { var20[var46] = var20[var18 + var46]; } - for (var46 = 0; var46 < var18; ++var46) { // L: 343 + for (var46 = 0; var46 < var18; ++var46) { var20[var18 + var46] = -var20[var18 - var46 - 1]; } - for (var46 = 0; var46 < var18; ++var46) { // L: 344 + for (var46 = 0; var46 < var18; ++var46) { var20[var17 + var46] = var20[var4 - var46 - 1]; } float[] var10000; - for (var46 = var8; var46 < var9; ++var46) { // L: 345 - var27 = (float)Math.sin(((double)(var46 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D); // L: 346 - var10000 = field380; // L: 347 + for (var46 = var8; var46 < var9; ++var46) { + var27 = (float)Math.sin(((double)(var46 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D); + var10000 = field380; var10000[var46] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); } - for (var46 = var11; var46 < var12; ++var46) { // L: 349 - var27 = (float)Math.sin(((double)(var46 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D); // L: 350 - var10000 = field380; // L: 351 + for (var46 = var11; var46 < var12; ++var46) { + var27 = (float)Math.sin(((double)(var46 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D); + var10000 = field380; var10000[var46] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); } } - float[] var41 = null; // L: 354 - if (this.field377 > 0) { // L: 355 - var18 = var4 + this.field377 >> 2; // L: 356 - var41 = new float[var18]; // L: 357 + float[] var41 = null; + if (this.field377 > 0) { + var18 = var4 + this.field377 >> 2; + var41 = new float[var18]; int var43; - if (!this.field379) { // L: 358 - for (var19 = 0; var19 < this.field376; ++var19) { // L: 359 - var43 = var19 + (this.field377 >> 1); // L: 360 - var41[var19] += this.field387[var43]; // L: 361 + if (!this.field379) { + for (var19 = 0; var19 < this.field376; ++var19) { + var43 = var19 + (this.field377 >> 1); + var41[var19] += this.field387[var43]; } } - if (!var15) { // L: 364 - for (var19 = var8; var19 < var4 >> 1; ++var19) { // L: 365 - var43 = var41.length - (var4 >> 1) + var19; // L: 366 - var41[var43] += field380[var19]; // L: 367 + if (!var15) { + for (var19 = var8; var19 < var4 >> 1; ++var19) { + var43 = var41.length - (var4 >> 1) + var19; + var41[var43] += field380[var19]; } } } - float[] var54 = this.field387; // L: 371 - this.field387 = field380; // L: 372 - field380 = var54; // L: 373 - this.field377 = var4; // L: 374 - this.field376 = var12 - (var4 >> 1); // L: 375 - this.field379 = var15; // L: 376 - return var41; // L: 377 + float[] var54 = this.field387; + this.field387 = field380; + field380 = var54; + this.field377 = var4; + this.field376 = var12 - (var4 >> 1); + this.field379 = var15; + return var41; } @ObfuscatedName("r") @@ -403,231 +403,231 @@ public class VorbisSample extends Node { ) @Export("toRawSound") RawSound toRawSound(int[] var1) { - if (var1 != null && var1[0] <= 0) { // L: 405 + if (var1 != null && var1[0] <= 0) { return null; } else { - if (this.samples == null) { // L: 406 - this.field377 = 0; // L: 407 - this.field387 = new float[VorbisSample_blockSize1]; // L: 408 - this.samples = new byte[this.sampleCount]; // L: 409 - this.field371 = 0; // L: 410 - this.field391 = 0; // L: 411 + if (this.samples == null) { + this.field377 = 0; + this.field387 = new float[VorbisSample_blockSize1]; + this.samples = new byte[this.sampleCount]; + this.field371 = 0; + this.field391 = 0; } - for (; this.field391 < this.field375.length; ++this.field391) { // L: 413 428 - if (var1 != null && var1[0] <= 0) { // L: 414 + for (; this.field391 < this.field375.length; ++this.field391) { + if (var1 != null && var1[0] <= 0) { return null; } - float[] var2 = this.method1032(this.field391); // L: 415 - if (var2 != null) { // L: 416 - int var3 = this.field371; // L: 417 - int var4 = var2.length; // L: 418 - if (var4 > this.sampleCount - var3) { // L: 419 + float[] var2 = this.method1032(this.field391); + if (var2 != null) { + int var3 = this.field371; + int var4 = var2.length; + if (var4 > this.sampleCount - var3) { var4 = this.sampleCount - var3; } - for (int var5 = 0; var5 < var4; ++var5) { // L: 420 - int var6 = (int)(128.0F + var2[var5] * 128.0F); // L: 421 - if ((var6 & -256) != 0) { // L: 422 + for (int var5 = 0; var5 < var4; ++var5) { + int var6 = (int)(128.0F + var2[var5] * 128.0F); + if ((var6 & -256) != 0) { var6 = ~var6 >> 31; } - this.samples[var3++] = (byte)(var6 - 128); // L: 423 + this.samples[var3++] = (byte)(var6 - 128); } - if (var1 != null) { // L: 425 + if (var1 != null) { var1[0] -= var3 - this.field371; } - this.field371 = var3; // L: 426 + this.field371 = var3; } } - this.field387 = null; // L: 430 - byte[] var7 = this.samples; // L: 431 - this.samples = null; // L: 432 - return new RawSound(this.sampleRate, var7, this.start, this.end, this.field368); // L: 433 + this.field387 = null; + byte[] var7 = this.samples; + this.samples = null; + return new RawSound(this.sampleRate, var7, this.start, this.end, this.field368); } } @ObfuscatedName("c") @Export("float32Unpack") static float float32Unpack(int var0) { - int var1 = var0 & 2097151; // L: 47 - int var2 = var0 & Integer.MIN_VALUE; // L: 48 - int var3 = (var0 & 2145386496) >> 21; // L: 49 - if (var2 != 0) { // L: 50 + int var1 = var0 & 2097151; + int var2 = var0 & Integer.MIN_VALUE; + int var3 = (var0 & 2145386496) >> 21; + if (var2 != 0) { var1 = -var1; } - return (float)((double)var1 * Math.pow(2.0D, (double)(var3 - 788))); // L: 51 + return (float)((double)var1 * Math.pow(2.0D, (double)(var3 - 788))); } @ObfuscatedName("b") @Export("VorbisSample_setData") static void VorbisSample_setData(byte[] var0, int var1) { - VorbisSample_bytes = var0; // L: 55 - VorbisSample_byteOffset = var1; // L: 56 - VorbisSample_bitOffset = 0; // L: 57 - } // L: 58 + VorbisSample_bytes = var0; + VorbisSample_byteOffset = var1; + VorbisSample_bitOffset = 0; + } @ObfuscatedName("p") @Export("readBit") static int readBit() { - int var0 = VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & 1; // L: 61 - ++VorbisSample_bitOffset; // L: 62 - VorbisSample_byteOffset += VorbisSample_bitOffset >> 3; // L: 63 - VorbisSample_bitOffset &= 7; // L: 64 - return var0; // L: 65 + int var0 = VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & 1; + ++VorbisSample_bitOffset; + VorbisSample_byteOffset += VorbisSample_bitOffset >> 3; + VorbisSample_bitOffset &= 7; + return var0; } @ObfuscatedName("m") @Export("readBits") static int readBits(int var0) { - int var1 = 0; // L: 69 + int var1 = 0; int var2; int var3; - for (var2 = 0; var0 >= 8 - VorbisSample_bitOffset; var0 -= var3) { // L: 70 71 78 - var3 = 8 - VorbisSample_bitOffset; // L: 72 - int var4 = (1 << var3) - 1; // L: 73 - var1 += (VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & var4) << var2; // L: 74 - VorbisSample_bitOffset = 0; // L: 75 - ++VorbisSample_byteOffset; // L: 76 - var2 += var3; // L: 77 + for (var2 = 0; var0 >= 8 - VorbisSample_bitOffset; var0 -= var3) { + var3 = 8 - VorbisSample_bitOffset; + int var4 = (1 << var3) - 1; + var1 += (VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & var4) << var2; + VorbisSample_bitOffset = 0; + ++VorbisSample_byteOffset; + var2 += var3; } - if (var0 > 0) { // L: 80 - var3 = (1 << var0) - 1; // L: 81 - var1 += (VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & var3) << var2; // L: 82 - VorbisSample_bitOffset += var0; // L: 83 + if (var0 > 0) { + var3 = (1 << var0) - 1; + var1 += (VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & var3) << var2; + VorbisSample_bitOffset += var0; } - return var1; // L: 85 + return var1; } @ObfuscatedName("s") static void method1031(byte[] var0) { - VorbisSample_setData(var0, 0); // L: 114 - VorbisSample_blockSize0 = 1 << readBits(4); // L: 115 - VorbisSample_blockSize1 = 1 << readBits(4); // L: 116 - field380 = new float[VorbisSample_blockSize1]; // L: 117 + VorbisSample_setData(var0, 0); + VorbisSample_blockSize0 = 1 << readBits(4); + VorbisSample_blockSize1 = 1 << readBits(4); + field380 = new float[VorbisSample_blockSize1]; int var1; int var2; int var3; int var4; int var5; - for (var1 = 0; var1 < 2; ++var1) { // L: 118 - var2 = var1 != 0 ? VorbisSample_blockSize1 : VorbisSample_blockSize0; // L: 119 - var3 = var2 >> 1; // L: 120 - var4 = var2 >> 2; // L: 121 - var5 = var2 >> 3; // L: 122 - float[] var12 = new float[var3]; // L: 123 + for (var1 = 0; var1 < 2; ++var1) { + var2 = var1 != 0 ? VorbisSample_blockSize1 : VorbisSample_blockSize0; + var3 = var2 >> 1; + var4 = var2 >> 2; + var5 = var2 >> 3; + float[] var12 = new float[var3]; - for (int var7 = 0; var7 < var4; ++var7) { // L: 124 - var12[var7 * 2] = (float)Math.cos((double)(var7 * 4) * 3.141592653589793D / (double)var2); // L: 125 - var12[var7 * 2 + 1] = -((float)Math.sin((double)(var7 * 4) * 3.141592653589793D / (double)var2)); // L: 126 + for (int var7 = 0; var7 < var4; ++var7) { + var12[var7 * 2] = (float)Math.cos((double)(var7 * 4) * 3.141592653589793D / (double)var2); + var12[var7 * 2 + 1] = -((float)Math.sin((double)(var7 * 4) * 3.141592653589793D / (double)var2)); } - float[] var13 = new float[var3]; // L: 128 + float[] var13 = new float[var3]; - for (int var8 = 0; var8 < var4; ++var8) { // L: 129 - var13[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); // L: 130 - var13[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); // L: 131 + for (int var8 = 0; var8 < var4; ++var8) { + var13[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); + var13[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); } - float[] var14 = new float[var4]; // L: 133 + float[] var14 = new float[var4]; - for (int var9 = 0; var9 < var5; ++var9) { // L: 134 - var14[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2); // L: 135 - var14[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2)); // L: 136 + for (int var9 = 0; var9 < var5; ++var9) { + var14[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2); + var14[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2)); } - int[] var15 = new int[var5]; // L: 138 - int var10 = DynamicObject.iLog(var5 - 1); // L: 139 + int[] var15 = new int[var5]; + int var10 = DynamicObject.iLog(var5 - 1); - for (int var11 = 0; var11 < var5; ++var11) { // L: 140 + for (int var11 = 0; var11 < var5; ++var11) { var15[var11] = FontName.method7074(var11, var10); } - if (var1 != 0) { // L: 141 - field363 = var12; // L: 142 - field378 = var13; // L: 143 - field367 = var14; // L: 144 - field384 = var15; // L: 145 + if (var1 != 0) { + field363 = var12; + field378 = var13; + field367 = var14; + field384 = var15; } else { - field381 = var12; // L: 148 - field382 = var13; // L: 149 - field383 = var14; // L: 150 - field358 = var15; // L: 151 + field381 = var12; + field382 = var13; + field383 = var14; + field358 = var15; } } - var1 = readBits(8) + 1; // L: 154 - VorbisSample_codebooks = new VorbisCodebook[var1]; // L: 155 + var1 = readBits(8) + 1; + VorbisSample_codebooks = new VorbisCodebook[var1]; - for (var2 = 0; var2 < var1; ++var2) { // L: 156 + for (var2 = 0; var2 < var1; ++var2) { VorbisSample_codebooks[var2] = new VorbisCodebook(); } - var2 = readBits(6) + 1; // L: 158 + var2 = readBits(6) + 1; - for (var3 = 0; var3 < var2; ++var3) { // L: 159 + for (var3 = 0; var3 < var2; ++var3) { readBits(16); } - var2 = readBits(6) + 1; // L: 161 - VorbisSample_floors = new VorbisFloor[var2]; // L: 162 + var2 = readBits(6) + 1; + VorbisSample_floors = new VorbisFloor[var2]; - for (var3 = 0; var3 < var2; ++var3) { // L: 163 + for (var3 = 0; var3 < var2; ++var3) { VorbisSample_floors[var3] = new VorbisFloor(); } - var3 = readBits(6) + 1; // L: 164 - VorbisSample_residues = new VorbisResidue[var3]; // L: 165 + var3 = readBits(6) + 1; + VorbisSample_residues = new VorbisResidue[var3]; - for (var4 = 0; var4 < var3; ++var4) { // L: 166 + for (var4 = 0; var4 < var3; ++var4) { VorbisSample_residues[var4] = new VorbisResidue(); } - var4 = readBits(6) + 1; // L: 167 - VorbisSample_mappings = new VorbisMapping[var4]; // L: 168 + var4 = readBits(6) + 1; + VorbisSample_mappings = new VorbisMapping[var4]; - for (var5 = 0; var5 < var4; ++var5) { // L: 169 + for (var5 = 0; var5 < var4; ++var5) { VorbisSample_mappings[var5] = new VorbisMapping(); } - var5 = readBits(6) + 1; // L: 170 - VorbisSample_blockFlags = new boolean[var5]; // L: 171 - VorbisSample_mapping = new int[var5]; // L: 172 + var5 = readBits(6) + 1; + VorbisSample_blockFlags = new boolean[var5]; + VorbisSample_mapping = new int[var5]; - for (int var6 = 0; var6 < var5; ++var6) { // L: 173 - VorbisSample_blockFlags[var6] = readBit() != 0; // L: 174 - readBits(16); // L: 175 - readBits(16); // L: 176 - VorbisSample_mapping[var6] = readBits(8); // L: 177 + for (int var6 = 0; var6 < var5; ++var6) { + VorbisSample_blockFlags[var6] = readBit() != 0; + readBits(16); + readBits(16); + VorbisSample_mapping[var6] = readBits(8); } - } // L: 179 + } @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(Lku;)Z" ) static boolean method1033(AbstractArchive var0) { - if (!field388) { // L: 381 - byte[] var1 = var0.takeFile(0, 0); // L: 382 - if (var1 == null) { // L: 383 + if (!field388) { + byte[] var1 = var0.takeFile(0, 0); + if (var1 == null) { return false; } - method1031(var1); // L: 384 - field388 = true; // L: 385 + method1031(var1); + field388 = true; } - return true; // L: 387 + return true; } @ObfuscatedName("n") @@ -636,12 +636,12 @@ public class VorbisSample extends Node { ) @Export("readMusicSample") static VorbisSample readMusicSample(AbstractArchive var0, int var1, int var2) { - if (!method1033(var0)) { // L: 391 - var0.tryLoadFile(var1, var2); // L: 392 - return null; // L: 393 + if (!method1033(var0)) { + var0.tryLoadFile(var1, var2); + return null; } else { - byte[] var3 = var0.takeFile(var1, var2); // L: 395 - return var3 == null ? null : new VorbisSample(var3); // L: 396 + byte[] var3 = var0.takeFile(var1, var2); + return var3 == null ? null : new VorbisSample(var3); } } } diff --git a/runescape-client/src/main/java/WallDecoration.java b/runescape-client/src/main/java/WallDecoration.java index 48fe9b4a24..e3c85d25fc 100644 --- a/runescape-client/src/main/java/WallDecoration.java +++ b/runescape-client/src/main/java/WallDecoration.java @@ -76,9 +76,9 @@ public final class WallDecoration { int flags; WallDecoration() { - this.tag = 0L; // L: 13 - this.flags = 0; // L: 14 - } // L: 16 + this.tag = 0L; + this.flags = 0; + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -86,8 +86,8 @@ public final class WallDecoration { garbageValue = "-121" ) static SecureRandom method4340() { - SecureRandom var0 = new SecureRandom(); // L: 39 - var0.nextInt(); // L: 40 - return var0; // L: 41 + SecureRandom var0 = new SecureRandom(); + var0.nextInt(); + return var0; } } diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index 010f0818c5..2352943e09 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -221,7 +221,7 @@ public class Widget extends Node { descriptor = "Lpg;" ) @Export("fillMode") - public FillMode fillMode; + public class429 fillMode; @ObfuscatedName("ae") @ObfuscatedGetter( intValue = 193150235 @@ -689,108 +689,108 @@ public class Widget extends Node { public boolean prioritizeMenuEntry; static { - Widget_cachedModels = new EvictingDualNodeHashTable(200); // L: 31 - Widget_cachedFonts = new EvictingDualNodeHashTable(50); // L: 32 - Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(20); // L: 33 - field3222 = new EvictingDualNodeHashTable(8); // L: 34 - field3223 = false; // L: 35 + Widget_cachedModels = new EvictingDualNodeHashTable(200); + Widget_cachedFonts = new EvictingDualNodeHashTable(50); + Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(20); + field3222 = new EvictingDualNodeHashTable(8); + field3223 = false; } public Widget() { - this.isIf3 = false; // L: 36 - this.id = -1; // L: 37 - this.childIndex = -1; // L: 38 - this.buttonType = 0; // L: 40 - this.contentType = 0; // L: 41 - this.xAlignment = 0; // L: 42 - this.yAlignment = 0; // L: 43 - this.widthAlignment = 0; // L: 44 - this.heightAlignment = 0; // L: 45 - this.rawX = 0; // L: 46 - this.rawY = 0; // L: 47 - this.rawWidth = 0; // L: 48 - this.rawHeight = 0; // L: 49 - this.x = 0; // L: 50 - this.y = 0; // L: 51 - this.width = 0; // L: 52 - this.height = 0; // L: 53 - this.field3242 = 1; // L: 54 - this.field3243 = 1; // L: 55 - this.parentId = -1; // L: 56 - this.isHidden = false; // L: 57 - this.scrollX = 0; // L: 58 - this.scrollY = 0; // L: 59 - this.scrollWidth = 0; // L: 60 - this.scrollHeight = 0; // L: 61 - this.color = 0; // L: 62 - this.color2 = 0; // L: 63 - this.mouseOverColor = 0; // L: 64 - this.mouseOverColor2 = 0; // L: 65 - this.fill = false; // L: 66 - this.fillMode = FillMode.SOLID; // L: 67 - this.transparencyTop = 0; // L: 68 - this.transparencyBot = 0; // L: 69 - this.lineWid = 1; // L: 70 - this.field3359 = false; // L: 71 - this.spriteId2 = -1; // L: 72 - this.spriteId = -1; // L: 73 - this.spriteAngle = 0; // L: 74 - this.spriteTiling = false; // L: 75 - this.outline = 0; // L: 76 - this.spriteShadow = 0; // L: 77 - this.modelType = 1; // L: 80 - this.modelId = -1; // L: 81 - this.modelType2 = 1; // L: 82 - this.modelId2 = -1; // L: 83 - this.sequenceId = -1; // L: 84 - this.sequenceId2 = -1; // L: 85 - this.modelOffsetX = 0; // L: 86 - this.modelOffsetY = 0; // L: 87 - this.modelAngleX = 0; // L: 88 - this.modelAngleY = 0; // L: 89 - this.modelAngleZ = 0; // L: 90 - this.modelZoom = 100; // L: 91 - this.field3280 = 0; // L: 92 - this.field3260 = 0; // L: 93 - this.modelOrthog = false; // L: 94 - this.modelTransparency = false; // L: 95 - this.itemQuantityMode = 2; // L: 96 - this.fontId = -1; // L: 97 - this.text = ""; // L: 98 - this.text2 = ""; // L: 99 - this.textLineHeight = 0; // L: 100 - this.textXAlignment = 0; // L: 101 - this.textYAlignment = 0; // L: 102 - this.textShadowed = false; // L: 103 - this.paddingX = 0; // L: 104 - this.paddingY = 0; // L: 105 - this.flags = 0; // L: 110 - this.field3299 = false; // L: 111 - this.dataText = ""; // L: 120 - this.parent = null; // L: 122 - this.dragZoneSize = 0; // L: 123 - this.dragThreshold = 0; // L: 124 - this.isScrollBar = false; // L: 125 - this.spellActionName = ""; // L: 126 - this.hasListener = false; // L: 127 - this.mouseOverRedirect = -1; // L: 166 - this.spellName = ""; // L: 167 - this.buttonText = "Ok"; // L: 168 - this.itemId = -1; // L: 171 - this.itemQuantity = 0; // L: 172 - this.modelFrame = 0; // L: 173 - this.modelFrameCycle = 0; // L: 174 - this.containsMouse = false; // L: 176 - this.isClicked = false; // L: 177 - this.field3341 = -1; // L: 178 - this.field3363 = 0; // L: 179 - this.field3364 = 0; // L: 180 - this.field3365 = 0; // L: 181 - this.rootIndex = -1; // L: 182 - this.cycle = -1; // L: 183 - this.noClickThrough = false; // L: 185 - this.noScrollThrough = false; // L: 186 - this.prioritizeMenuEntry = false; // L: 187 + this.isIf3 = false; + this.id = -1; + this.childIndex = -1; + this.buttonType = 0; + this.contentType = 0; + this.xAlignment = 0; + this.yAlignment = 0; + this.widthAlignment = 0; + this.heightAlignment = 0; + this.rawX = 0; + this.rawY = 0; + this.rawWidth = 0; + this.rawHeight = 0; + this.x = 0; + this.y = 0; + this.width = 0; + this.height = 0; + this.field3242 = 1; + this.field3243 = 1; + this.parentId = -1; + this.isHidden = false; + this.scrollX = 0; + this.scrollY = 0; + this.scrollWidth = 0; + this.scrollHeight = 0; + this.color = 0; + this.color2 = 0; + this.mouseOverColor = 0; + this.mouseOverColor2 = 0; + this.fill = false; + this.fillMode = class429.SOLID; + this.transparencyTop = 0; + this.transparencyBot = 0; + this.lineWid = 1; + this.field3359 = false; + this.spriteId2 = -1; + this.spriteId = -1; + this.spriteAngle = 0; + this.spriteTiling = false; + this.outline = 0; + this.spriteShadow = 0; + this.modelType = 1; + this.modelId = -1; + this.modelType2 = 1; + this.modelId2 = -1; + this.sequenceId = -1; + this.sequenceId2 = -1; + this.modelOffsetX = 0; + this.modelOffsetY = 0; + this.modelAngleX = 0; + this.modelAngleY = 0; + this.modelAngleZ = 0; + this.modelZoom = 100; + this.field3280 = 0; + this.field3260 = 0; + this.modelOrthog = false; + this.modelTransparency = false; + this.itemQuantityMode = 2; + this.fontId = -1; + this.text = ""; + this.text2 = ""; + this.textLineHeight = 0; + this.textXAlignment = 0; + this.textYAlignment = 0; + this.textShadowed = false; + this.paddingX = 0; + this.paddingY = 0; + this.flags = 0; + this.field3299 = false; + this.dataText = ""; + this.parent = null; + this.dragZoneSize = 0; + this.dragThreshold = 0; + this.isScrollBar = false; + this.spellActionName = ""; + this.hasListener = false; + this.mouseOverRedirect = -1; + this.spellName = ""; + this.buttonText = "Ok"; + this.itemId = -1; + this.itemQuantity = 0; + this.modelFrame = 0; + this.modelFrameCycle = 0; + this.containsMouse = false; + this.isClicked = false; + this.field3341 = -1; + this.field3363 = 0; + this.field3364 = 0; + this.field3365 = 0; + this.rootIndex = -1; + this.cycle = -1; + this.noClickThrough = false; + this.noScrollThrough = false; + this.prioritizeMenuEntry = false; } @ObfuscatedName("s") @@ -800,255 +800,255 @@ public class Widget extends Node { ) @Export("decodeLegacy") void decodeLegacy(Buffer var1) { - this.isIf3 = false; // L: 256 - this.type = var1.readUnsignedByte(); // L: 257 - this.buttonType = var1.readUnsignedByte(); // L: 258 - this.contentType = var1.readUnsignedShort(); // L: 259 - this.rawX = var1.readShort(); // L: 260 - this.rawY = var1.readShort(); // L: 261 - this.rawWidth = var1.readUnsignedShort(); // L: 262 - this.rawHeight = var1.readUnsignedShort(); // L: 263 - this.transparencyTop = var1.readUnsignedByte(); // L: 264 - this.parentId = var1.readUnsignedShort(); // L: 265 - if (this.parentId == 65535) { // L: 266 + this.isIf3 = false; + this.type = var1.readUnsignedByte(); + this.buttonType = var1.readUnsignedByte(); + this.contentType = var1.readUnsignedShort(); + 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.parentId = -1; } else { - this.parentId += this.id & -65536; // L: 267 + this.parentId += this.id & -65536; } - this.mouseOverRedirect = var1.readUnsignedShort(); // L: 268 - if (this.mouseOverRedirect == 65535) { // L: 269 + this.mouseOverRedirect = var1.readUnsignedShort(); + if (this.mouseOverRedirect == 65535) { this.mouseOverRedirect = -1; } - int var2 = var1.readUnsignedByte(); // L: 270 + int var2 = var1.readUnsignedByte(); int var3; - if (var2 > 0) { // L: 271 - this.cs1Comparisons = new int[var2]; // L: 272 - this.cs1ComparisonValues = new int[var2]; // L: 273 + if (var2 > 0) { + this.cs1Comparisons = new int[var2]; + this.cs1ComparisonValues = new int[var2]; - for (var3 = 0; var3 < var2; ++var3) { // L: 274 - this.cs1Comparisons[var3] = var1.readUnsignedByte(); // L: 275 - this.cs1ComparisonValues[var3] = var1.readUnsignedShort(); // L: 276 + for (var3 = 0; var3 < var2; ++var3) { + this.cs1Comparisons[var3] = var1.readUnsignedByte(); + this.cs1ComparisonValues[var3] = var1.readUnsignedShort(); } } - var3 = var1.readUnsignedByte(); // L: 279 + var3 = var1.readUnsignedByte(); int var4; int var5; int var6; - if (var3 > 0) { // L: 280 - this.cs1Instructions = new int[var3][]; // L: 281 + if (var3 > 0) { + this.cs1Instructions = new int[var3][]; - for (var4 = 0; var4 < var3; ++var4) { // L: 282 - var5 = var1.readUnsignedShort(); // L: 283 - this.cs1Instructions[var4] = new int[var5]; // L: 284 + for (var4 = 0; var4 < var3; ++var4) { + var5 = var1.readUnsignedShort(); + this.cs1Instructions[var4] = new int[var5]; - for (var6 = 0; var6 < var5; ++var6) { // L: 285 - this.cs1Instructions[var4][var6] = var1.readUnsignedShort(); // L: 286 - if (this.cs1Instructions[var4][var6] == 65535) { // L: 287 + for (var6 = 0; var6 < var5; ++var6) { + this.cs1Instructions[var4][var6] = var1.readUnsignedShort(); + if (this.cs1Instructions[var4][var6] == 65535) { this.cs1Instructions[var4][var6] = -1; } } } } - if (this.type == 0) { // L: 291 - this.scrollHeight = var1.readUnsignedShort(); // L: 292 - this.isHidden = var1.readUnsignedByte() == 1; // L: 293 + if (this.type == 0) { + this.scrollHeight = var1.readUnsignedShort(); + this.isHidden = var1.readUnsignedByte() == 1; } - if (this.type == 1) { // L: 295 - var1.readUnsignedShort(); // L: 296 - var1.readUnsignedByte(); // L: 297 + if (this.type == 1) { + var1.readUnsignedShort(); + var1.readUnsignedByte(); } - if (this.type == 2) { // L: 299 - this.itemIds = new int[this.rawWidth * this.rawHeight]; // L: 300 - this.itemQuantities = new int[this.rawHeight * this.rawWidth]; // L: 301 - var4 = var1.readUnsignedByte(); // L: 302 - if (var4 == 1) { // L: 303 + if (this.type == 2) { + this.itemIds = new int[this.rawWidth * this.rawHeight]; + this.itemQuantities = new int[this.rawHeight * this.rawWidth]; + var4 = var1.readUnsignedByte(); + if (var4 == 1) { this.flags |= 268435456; } - var5 = var1.readUnsignedByte(); // L: 304 - if (var5 == 1) { // L: 305 + var5 = var1.readUnsignedByte(); + if (var5 == 1) { this.flags |= 1073741824; } - var6 = var1.readUnsignedByte(); // L: 306 - if (var6 == 1) { // L: 307 + var6 = var1.readUnsignedByte(); + if (var6 == 1) { this.flags |= Integer.MIN_VALUE; } - int var7 = var1.readUnsignedByte(); // L: 308 - if (var7 == 1) { // L: 309 + int var7 = var1.readUnsignedByte(); + if (var7 == 1) { this.flags |= 536870912; } - this.paddingX = var1.readUnsignedByte(); // L: 310 - this.paddingY = var1.readUnsignedByte(); // L: 311 - this.inventoryXOffsets = new int[20]; // L: 312 - this.inventoryYOffsets = new int[20]; // L: 313 - this.inventorySprites = new int[20]; // L: 314 + this.paddingX = var1.readUnsignedByte(); + this.paddingY = var1.readUnsignedByte(); + this.inventoryXOffsets = new int[20]; + this.inventoryYOffsets = new int[20]; + this.inventorySprites = new int[20]; int var8; - for (var8 = 0; var8 < 20; ++var8) { // L: 315 - int var11 = var1.readUnsignedByte(); // L: 316 - if (var11 == 1) { // L: 317 - this.inventoryXOffsets[var8] = var1.readShort(); // L: 318 - this.inventoryYOffsets[var8] = var1.readShort(); // L: 319 - this.inventorySprites[var8] = var1.readInt(); // L: 320 + for (var8 = 0; var8 < 20; ++var8) { + int var11 = var1.readUnsignedByte(); + if (var11 == 1) { + this.inventoryXOffsets[var8] = var1.readShort(); + this.inventoryYOffsets[var8] = var1.readShort(); + this.inventorySprites[var8] = var1.readInt(); } else { - this.inventorySprites[var8] = -1; // L: 322 + this.inventorySprites[var8] = -1; } } - this.itemActions = new String[5]; // L: 324 + this.itemActions = new String[5]; - for (var8 = 0; var8 < 5; ++var8) { // L: 325 - String var9 = var1.readStringCp1252NullTerminated(); // L: 326 - if (var9.length() > 0) { // L: 327 - this.itemActions[var8] = var9; // L: 328 - this.flags |= 1 << var8 + 23; // L: 329 + for (var8 = 0; var8 < 5; ++var8) { + String var9 = var1.readStringCp1252NullTerminated(); + if (var9.length() > 0) { + this.itemActions[var8] = var9; + this.flags |= 1 << var8 + 23; } } } - if (this.type == 3) { // L: 333 - this.fill = var1.readUnsignedByte() == 1; // L: 334 + if (this.type == 3) { + this.fill = var1.readUnsignedByte() == 1; } - if (this.type == 4 || this.type == 1) { // L: 336 - this.textXAlignment = var1.readUnsignedByte(); // L: 337 - this.textYAlignment = var1.readUnsignedByte(); // L: 338 - this.textLineHeight = var1.readUnsignedByte(); // L: 339 - this.fontId = var1.readUnsignedShort(); // L: 340 - if (this.fontId == 65535) { // L: 341 + if (this.type == 4 || this.type == 1) { + this.textXAlignment = var1.readUnsignedByte(); + this.textYAlignment = var1.readUnsignedByte(); + this.textLineHeight = var1.readUnsignedByte(); + this.fontId = var1.readUnsignedShort(); + if (this.fontId == 65535) { this.fontId = -1; } - this.textShadowed = var1.readUnsignedByte() == 1; // L: 342 + this.textShadowed = var1.readUnsignedByte() == 1; } - if (this.type == 4) { // L: 344 - this.text = var1.readStringCp1252NullTerminated(); // L: 345 - this.text2 = var1.readStringCp1252NullTerminated(); // L: 346 + if (this.type == 4) { + this.text = var1.readStringCp1252NullTerminated(); + this.text2 = var1.readStringCp1252NullTerminated(); } - if (this.type == 1 || this.type == 3 || this.type == 4) { // L: 348 + if (this.type == 1 || this.type == 3 || this.type == 4) { this.color = var1.readInt(); } - if (this.type == 3 || this.type == 4) { // L: 349 - this.color2 = var1.readInt(); // L: 350 - this.mouseOverColor = var1.readInt(); // L: 351 - this.mouseOverColor2 = var1.readInt(); // L: 352 + if (this.type == 3 || this.type == 4) { + this.color2 = var1.readInt(); + this.mouseOverColor = var1.readInt(); + this.mouseOverColor2 = var1.readInt(); } - if (this.type == 5) { // L: 354 - this.spriteId2 = var1.readInt(); // L: 355 - this.spriteId = var1.readInt(); // L: 356 + if (this.type == 5) { + this.spriteId2 = var1.readInt(); + this.spriteId = var1.readInt(); } - if (this.type == 6) { // L: 358 - this.modelType = 1; // L: 359 - this.modelId = var1.readUnsignedShort(); // L: 360 - if (this.modelId == 65535) { // L: 361 + if (this.type == 6) { + this.modelType = 1; + this.modelId = var1.readUnsignedShort(); + if (this.modelId == 65535) { this.modelId = -1; } - this.modelType2 = 1; // L: 362 - this.modelId2 = var1.readUnsignedShort(); // L: 363 - if (this.modelId2 == 65535) { // L: 364 + this.modelType2 = 1; + this.modelId2 = var1.readUnsignedShort(); + if (this.modelId2 == 65535) { this.modelId2 = -1; } - this.sequenceId = var1.readUnsignedShort(); // L: 365 - if (this.sequenceId == 65535) { // L: 366 + this.sequenceId = var1.readUnsignedShort(); + if (this.sequenceId == 65535) { this.sequenceId = -1; } - this.sequenceId2 = var1.readUnsignedShort(); // L: 367 - if (this.sequenceId2 == 65535) { // L: 368 + this.sequenceId2 = var1.readUnsignedShort(); + if (this.sequenceId2 == 65535) { this.sequenceId2 = -1; } - this.modelZoom = var1.readUnsignedShort(); // L: 369 - this.modelAngleX = var1.readUnsignedShort(); // L: 370 - this.modelAngleY = var1.readUnsignedShort(); // L: 371 + this.modelZoom = var1.readUnsignedShort(); + this.modelAngleX = var1.readUnsignedShort(); + this.modelAngleY = var1.readUnsignedShort(); } - if (this.type == 7) { // L: 373 - this.itemIds = new int[this.rawWidth * this.rawHeight]; // L: 374 - this.itemQuantities = new int[this.rawHeight * this.rawWidth]; // L: 375 - this.textXAlignment = var1.readUnsignedByte(); // L: 376 - this.fontId = var1.readUnsignedShort(); // L: 377 - if (this.fontId == 65535) { // L: 378 + if (this.type == 7) { + this.itemIds = new int[this.rawWidth * this.rawHeight]; + this.itemQuantities = new int[this.rawHeight * this.rawWidth]; + this.textXAlignment = var1.readUnsignedByte(); + this.fontId = var1.readUnsignedShort(); + if (this.fontId == 65535) { this.fontId = -1; } - this.textShadowed = var1.readUnsignedByte() == 1; // L: 379 - this.color = var1.readInt(); // L: 380 - this.paddingX = var1.readShort(); // L: 381 - this.paddingY = var1.readShort(); // L: 382 - var4 = var1.readUnsignedByte(); // L: 383 + this.textShadowed = var1.readUnsignedByte() == 1; + this.color = var1.readInt(); + this.paddingX = var1.readShort(); + this.paddingY = var1.readShort(); + var4 = var1.readUnsignedByte(); if (var4 == 1) { - this.flags |= 1073741824; // L: 384 + this.flags |= 1073741824; } - this.itemActions = new String[5]; // L: 385 + this.itemActions = new String[5]; - for (var5 = 0; var5 < 5; ++var5) { // L: 386 - String var10 = var1.readStringCp1252NullTerminated(); // L: 387 - if (var10.length() > 0) { // L: 388 - this.itemActions[var5] = var10; // L: 389 - this.flags |= 1 << var5 + 23; // L: 390 + for (var5 = 0; var5 < 5; ++var5) { + String var10 = var1.readStringCp1252NullTerminated(); + if (var10.length() > 0) { + this.itemActions[var5] = var10; + this.flags |= 1 << var5 + 23; } } } - if (this.type == 8) { // L: 394 - this.text = var1.readStringCp1252NullTerminated(); // L: 395 + if (this.type == 8) { + this.text = var1.readStringCp1252NullTerminated(); } - if (this.buttonType == 2 || this.type == 2) { // L: 397 - this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 398 - this.spellName = var1.readStringCp1252NullTerminated(); // L: 399 - var4 = var1.readUnsignedShort() & 63; // L: 400 - this.flags |= var4 << 11; // L: 401 + if (this.buttonType == 2 || this.type == 2) { + this.spellActionName = var1.readStringCp1252NullTerminated(); + this.spellName = var1.readStringCp1252NullTerminated(); + var4 = var1.readUnsignedShort() & 63; + this.flags |= var4 << 11; } - if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5 || this.buttonType == 6) { // L: 403 - this.buttonText = var1.readStringCp1252NullTerminated(); // L: 404 - if (this.buttonText.length() == 0) { // L: 405 - if (this.buttonType == 1) { // L: 406 + if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5 || this.buttonType == 6) { + this.buttonText = var1.readStringCp1252NullTerminated(); + if (this.buttonText.length() == 0) { + if (this.buttonType == 1) { this.buttonText = "Ok"; } - if (this.buttonType == 4) { // L: 407 + if (this.buttonType == 4) { this.buttonText = "Select"; } - if (this.buttonType == 5) { // L: 408 + if (this.buttonType == 5) { this.buttonText = "Select"; } - if (this.buttonType == 6) { // L: 409 + if (this.buttonType == 6) { this.buttonText = "Continue"; } } } - if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) { // L: 412 - this.flags |= 4194304; // L: 413 + if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) { + this.flags |= 4194304; } - if (this.buttonType == 6) { // L: 415 - this.flags |= 1; // L: 416 + if (this.buttonType == 6) { + this.flags |= 1; } - } // L: 418 + } @ObfuscatedName("j") @ObfuscatedSignature( @@ -1057,140 +1057,140 @@ public class Widget extends Node { ) @Export("decode") void decode(Buffer var1) { - var1.readUnsignedByte(); // L: 421 - this.isIf3 = true; // L: 422 - this.type = var1.readUnsignedByte(); // L: 423 - this.contentType = var1.readUnsignedShort(); // L: 424 - this.rawX = var1.readShort(); // L: 425 - this.rawY = var1.readShort(); // L: 426 - this.rawWidth = var1.readUnsignedShort(); // L: 427 - if (this.type == 9) { // L: 428 + var1.readUnsignedByte(); + this.isIf3 = true; + this.type = var1.readUnsignedByte(); + this.contentType = var1.readUnsignedShort(); + this.rawX = var1.readShort(); + this.rawY = var1.readShort(); + this.rawWidth = var1.readUnsignedShort(); + if (this.type == 9) { this.rawHeight = var1.readShort(); } else { - this.rawHeight = var1.readUnsignedShort(); // L: 429 + this.rawHeight = var1.readUnsignedShort(); } - this.widthAlignment = var1.readByte(); // L: 430 - this.heightAlignment = var1.readByte(); // L: 431 - this.xAlignment = var1.readByte(); // L: 432 - this.yAlignment = var1.readByte(); // L: 433 - this.parentId = var1.readUnsignedShort(); // L: 434 - if (this.parentId == 65535) { // L: 435 + this.widthAlignment = var1.readByte(); + this.heightAlignment = var1.readByte(); + this.xAlignment = var1.readByte(); + this.yAlignment = var1.readByte(); + this.parentId = var1.readUnsignedShort(); + if (this.parentId == 65535) { this.parentId = -1; } else { - this.parentId += this.id & -65536; // L: 436 + this.parentId += this.id & -65536; } - this.isHidden = var1.readUnsignedByte() == 1; // L: 437 - if (this.type == 0) { // L: 438 - this.scrollWidth = var1.readUnsignedShort(); // L: 439 - this.scrollHeight = var1.readUnsignedShort(); // L: 440 - this.noClickThrough = var1.readUnsignedByte() == 1; // L: 441 + this.isHidden = var1.readUnsignedByte() == 1; + if (this.type == 0) { + this.scrollWidth = var1.readUnsignedShort(); + this.scrollHeight = var1.readUnsignedShort(); + this.noClickThrough = var1.readUnsignedByte() == 1; } - if (this.type == 5) { // L: 443 - this.spriteId2 = var1.readInt(); // L: 444 - this.spriteAngle = var1.readUnsignedShort(); // L: 445 - this.spriteTiling = var1.readUnsignedByte() == 1; // L: 446 - this.transparencyTop = var1.readUnsignedByte(); // L: 447 - this.outline = var1.readUnsignedByte(); // L: 448 - this.spriteShadow = var1.readInt(); // L: 449 - this.spriteFlipV = var1.readUnsignedByte() == 1; // L: 450 - this.spriteFlipH = var1.readUnsignedByte() == 1; // L: 451 + if (this.type == 5) { + this.spriteId2 = var1.readInt(); + this.spriteAngle = var1.readUnsignedShort(); + this.spriteTiling = var1.readUnsignedByte() == 1; + this.transparencyTop = var1.readUnsignedByte(); + this.outline = var1.readUnsignedByte(); + this.spriteShadow = var1.readInt(); + this.spriteFlipV = var1.readUnsignedByte() == 1; + this.spriteFlipH = var1.readUnsignedByte() == 1; } - if (this.type == 6) { // L: 453 - this.modelType = 1; // L: 454 - this.modelId = var1.readUnsignedShort(); // L: 455 - if (this.modelId == 65535) { // L: 456 + if (this.type == 6) { + this.modelType = 1; + this.modelId = var1.readUnsignedShort(); + if (this.modelId == 65535) { this.modelId = -1; } - this.modelOffsetX = var1.readShort(); // L: 457 - this.modelOffsetY = var1.readShort(); // L: 458 - this.modelAngleX = var1.readUnsignedShort(); // L: 459 - this.modelAngleY = var1.readUnsignedShort(); // L: 460 - this.modelAngleZ = var1.readUnsignedShort(); // L: 461 - this.modelZoom = var1.readUnsignedShort(); // L: 462 - this.sequenceId = var1.readUnsignedShort(); // L: 463 - if (this.sequenceId == 65535) { // L: 464 + this.modelOffsetX = var1.readShort(); + this.modelOffsetY = var1.readShort(); + this.modelAngleX = var1.readUnsignedShort(); + this.modelAngleY = var1.readUnsignedShort(); + this.modelAngleZ = var1.readUnsignedShort(); + this.modelZoom = var1.readUnsignedShort(); + this.sequenceId = var1.readUnsignedShort(); + if (this.sequenceId == 65535) { this.sequenceId = -1; } - this.modelOrthog = var1.readUnsignedByte() == 1; // L: 465 - var1.readUnsignedShort(); // L: 466 - if (this.widthAlignment != 0) { // L: 467 + this.modelOrthog = var1.readUnsignedByte() == 1; + var1.readUnsignedShort(); + if (this.widthAlignment != 0) { this.field3280 = var1.readUnsignedShort(); } - if (this.heightAlignment != 0) { // L: 468 - var1.readUnsignedShort(); // L: 469 + if (this.heightAlignment != 0) { + var1.readUnsignedShort(); } } - if (this.type == 4) { // L: 472 - this.fontId = var1.readUnsignedShort(); // L: 473 - if (this.fontId == 65535) { // L: 474 + if (this.type == 4) { + this.fontId = var1.readUnsignedShort(); + if (this.fontId == 65535) { this.fontId = -1; } - this.text = var1.readStringCp1252NullTerminated(); // L: 475 - this.textLineHeight = var1.readUnsignedByte(); // L: 476 - this.textXAlignment = var1.readUnsignedByte(); // L: 477 - this.textYAlignment = var1.readUnsignedByte(); // L: 478 - this.textShadowed = var1.readUnsignedByte() == 1; // L: 479 - this.color = var1.readInt(); // L: 480 + this.text = var1.readStringCp1252NullTerminated(); + this.textLineHeight = var1.readUnsignedByte(); + this.textXAlignment = var1.readUnsignedByte(); + this.textYAlignment = var1.readUnsignedByte(); + this.textShadowed = var1.readUnsignedByte() == 1; + this.color = var1.readInt(); } - if (this.type == 3) { // L: 482 - this.color = var1.readInt(); // L: 483 - this.fill = var1.readUnsignedByte() == 1; // L: 484 - this.transparencyTop = var1.readUnsignedByte(); // L: 485 + if (this.type == 3) { + this.color = var1.readInt(); + this.fill = var1.readUnsignedByte() == 1; + this.transparencyTop = var1.readUnsignedByte(); } - if (this.type == 9) { // L: 487 - this.lineWid = var1.readUnsignedByte(); // L: 488 - this.color = var1.readInt(); // L: 489 - this.field3359 = var1.readUnsignedByte() == 1; // L: 490 + if (this.type == 9) { + this.lineWid = var1.readUnsignedByte(); + this.color = var1.readInt(); + this.field3359 = var1.readUnsignedByte() == 1; } - this.flags = var1.readMedium(); // L: 492 - this.dataText = var1.readStringCp1252NullTerminated(); // L: 493 - int var2 = var1.readUnsignedByte(); // L: 494 - if (var2 > 0) { // L: 495 - this.actions = new String[var2]; // L: 496 + this.flags = var1.readMedium(); + this.dataText = var1.readStringCp1252NullTerminated(); + int var2 = var1.readUnsignedByte(); + if (var2 > 0) { + this.actions = new String[var2]; - for (int var3 = 0; var3 < var2; ++var3) { // L: 497 + for (int var3 = 0; var3 < var2; ++var3) { this.actions[var3] = var1.readStringCp1252NullTerminated(); } } - this.dragZoneSize = var1.readUnsignedByte(); // L: 499 - this.dragThreshold = var1.readUnsignedByte(); // L: 500 - this.isScrollBar = var1.readUnsignedByte() == 1; // L: 501 - this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 502 - this.onLoad = this.readListener(var1); // L: 503 - this.onMouseOver = this.readListener(var1); // L: 504 - this.onMouseLeave = this.readListener(var1); // L: 505 - this.onTargetLeave = this.readListener(var1); // L: 506 - this.onTargetEnter = this.readListener(var1); // L: 507 - this.onVarTransmit = this.readListener(var1); // L: 508 - this.onInvTransmit = this.readListener(var1); // L: 509 - this.onStatTransmit = this.readListener(var1); // L: 510 - this.onTimer = this.readListener(var1); // L: 511 - this.onOp = this.readListener(var1); // L: 512 - this.onMouseRepeat = this.readListener(var1); // L: 513 - this.onClick = this.readListener(var1); // L: 514 - this.onClickRepeat = this.readListener(var1); // L: 515 - this.onRelease = this.readListener(var1); // L: 516 - this.onHold = this.readListener(var1); // L: 517 - this.onDrag = this.readListener(var1); // L: 518 - this.onDragComplete = this.readListener(var1); // L: 519 - this.onScroll = this.readListener(var1); // L: 520 - this.varTransmitTriggers = this.readListenerTriggers(var1); // L: 521 - this.invTransmitTriggers = this.readListenerTriggers(var1); // L: 522 - this.statTransmitTriggers = this.readListenerTriggers(var1); // L: 523 - } // L: 524 + this.dragZoneSize = var1.readUnsignedByte(); + this.dragThreshold = var1.readUnsignedByte(); + this.isScrollBar = var1.readUnsignedByte() == 1; + this.spellActionName = var1.readStringCp1252NullTerminated(); + this.onLoad = this.readListener(var1); + this.onMouseOver = this.readListener(var1); + this.onMouseLeave = this.readListener(var1); + this.onTargetLeave = this.readListener(var1); + this.onTargetEnter = this.readListener(var1); + this.onVarTransmit = this.readListener(var1); + this.onInvTransmit = this.readListener(var1); + this.onStatTransmit = this.readListener(var1); + this.onTimer = this.readListener(var1); + this.onOp = this.readListener(var1); + this.onMouseRepeat = this.readListener(var1); + this.onClick = this.readListener(var1); + this.onClickRepeat = this.readListener(var1); + this.onRelease = this.readListener(var1); + this.onHold = this.readListener(var1); + this.onDrag = this.readListener(var1); + this.onDragComplete = this.readListener(var1); + this.onScroll = this.readListener(var1); + this.varTransmitTriggers = this.readListenerTriggers(var1); + this.invTransmitTriggers = this.readListenerTriggers(var1); + this.statTransmitTriggers = this.readListenerTriggers(var1); + } @ObfuscatedName("w") @ObfuscatedSignature( @@ -1199,23 +1199,23 @@ public class Widget extends Node { ) @Export("readListener") Object[] readListener(Buffer var1) { - int var2 = var1.readUnsignedByte(); // L: 527 - if (var2 == 0) { // L: 528 + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { return null; } else { - Object[] var3 = new Object[var2]; // L: 529 + Object[] var3 = new Object[var2]; - for (int var4 = 0; var4 < var2; ++var4) { // L: 530 - int var5 = var1.readUnsignedByte(); // L: 531 + for (int var4 = 0; var4 < var2; ++var4) { + int var5 = var1.readUnsignedByte(); if (var5 == 0) { - var3[var4] = new Integer(var1.readInt()); // L: 532 - } else if (var5 == 1) { // L: 533 + var3[var4] = new Integer(var1.readInt()); + } else if (var5 == 1) { var3[var4] = var1.readStringCp1252NullTerminated(); } } - this.hasListener = true; // L: 535 - return var3; // L: 536 + this.hasListener = true; + return var3; } } @@ -1226,17 +1226,17 @@ public class Widget extends Node { ) @Export("readListenerTriggers") int[] readListenerTriggers(Buffer var1) { - int var2 = var1.readUnsignedByte(); // L: 540 - if (var2 == 0) { // L: 541 + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { return null; } else { - int[] var3 = new int[var2]; // L: 542 + int[] var3 = new int[var2]; - for (int var4 = 0; var4 < var2; ++var4) { // L: 543 - var3[var4] = var1.readInt(); // L: 544 + for (int var4 = 0; var4 < var2; ++var4) { + var3[var4] = var1.readInt(); } - return var3; // L: 546 + return var3; } } @@ -1247,13 +1247,13 @@ public class Widget extends Node { ) @Export("swapItems") public void swapItems(int var1, int var2) { - int var3 = this.itemIds[var2]; // L: 550 - this.itemIds[var2] = this.itemIds[var1]; // L: 551 - this.itemIds[var1] = var3; // L: 552 - var3 = this.itemQuantities[var2]; // L: 553 - this.itemQuantities[var2] = this.itemQuantities[var1]; // L: 554 - this.itemQuantities[var1] = var3; // L: 555 - } // L: 556 + int var3 = this.itemIds[var2]; + this.itemIds[var2] = this.itemIds[var1]; + this.itemIds[var1] = var3; + var3 = this.itemQuantities[var2]; + this.itemQuantities[var2] = this.itemQuantities[var1]; + this.itemQuantities[var1] = var3; + } @ObfuscatedName("o") @ObfuscatedSignature( @@ -1262,53 +1262,53 @@ public class Widget extends Node { ) @Export("getSprite") public SpritePixels getSprite(boolean var1) { - field3223 = false; // L: 559 + field3223 = false; int var2; - if (var1) { // L: 561 + if (var1) { var2 = this.spriteId; } else { - var2 = this.spriteId2; // L: 562 + var2 = this.spriteId2; } - if (var2 == -1) { // L: 563 + if (var2 == -1) { return null; } else { - long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipV ? 1L : 0L) << 38) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipH ? 1L : 0L) << 39); // L: 564 - SpritePixels var5 = (SpritePixels)Widget_cachedModels.get(var3); // L: 565 - if (var5 != null) { // L: 566 + long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipV ? 1L : 0L) << 38) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipH ? 1L : 0L) << 39); + SpritePixels var5 = (SpritePixels)Widget_cachedModels.get(var3); + if (var5 != null) { return var5; } else { - var5 = class6.SpriteBuffer_getSprite(GraphicsObject.Widget_spritesArchive, var2, 0); // L: 567 - if (var5 == null) { // L: 568 - field3223 = true; // L: 569 - return null; // L: 570 + var5 = class6.SpriteBuffer_getSprite(GraphicsObject.Widget_spritesArchive, var2, 0); + if (var5 == null) { + field3223 = true; + return null; } else { - if (this.spriteFlipV) { // L: 572 + if (this.spriteFlipV) { var5.flipVertically(); } - if (this.spriteFlipH) { // L: 573 + if (this.spriteFlipH) { var5.flipHorizontally(); } - if (this.outline > 0) { // L: 574 + if (this.outline > 0) { var5.pad(this.outline); } - if (this.outline >= 1) { // L: 575 + if (this.outline >= 1) { var5.outline(1); } - if (this.outline >= 2) { // L: 576 + if (this.outline >= 2) { var5.outline(16777215); } - if (this.spriteShadow != 0) { // L: 577 + if (this.spriteShadow != 0) { var5.shadow(this.spriteShadow); } - Widget_cachedModels.put(var5, var3); // L: 578 - return var5; // L: 579 + Widget_cachedModels.put(var5, var3); + return var5; } } } @@ -1321,41 +1321,41 @@ public class Widget extends Node { ) @Export("getFont") public Font getFont() { - field3223 = false; // L: 583 - if (this.fontId == -1) { // L: 584 + field3223 = false; + if (this.fontId == -1) { return null; } else { - Font var1 = (Font)Widget_cachedSpriteMasks.get((long)this.fontId); // L: 585 - if (var1 != null) { // L: 586 + Font var1 = (Font)Widget_cachedSpriteMasks.get((long)this.fontId); + if (var1 != null) { return var1; } else { - AbstractArchive var3 = GraphicsObject.Widget_spritesArchive; // L: 588 - AbstractArchive var4 = NPC.Widget_fontsArchive; // L: 589 - int var5 = this.fontId; // L: 590 + AbstractArchive var3 = GraphicsObject.Widget_spritesArchive; + AbstractArchive var4 = NPC.Widget_fontsArchive; + int var5 = this.fontId; Font var2; - if (!class147.method3009(var3, var5, 0)) { // L: 592 - var2 = null; // L: 593 + if (!class147.method3009(var3, var5, 0)) { + var2 = null; } else { - byte[] var7 = var4.takeFile(var5, 0); // L: 597 + byte[] var7 = var4.takeFile(var5, 0); Font var6; - if (var7 == null) { // L: 599 - var6 = null; // L: 600 + if (var7 == null) { + var6 = null; } else { - Font var8 = new Font(var7, class141.SpriteBuffer_xOffsets, RouteStrategy.SpriteBuffer_yOffsets, class432.SpriteBuffer_spriteWidths, class330.SpriteBuffer_spriteHeights, class432.SpriteBuffer_spritePalette, class369.SpriteBuffer_pixels); // L: 603 - UserComparator3.method2529(); // L: 604 - var6 = var8; // L: 605 + Font var8 = new Font(var7, class141.SpriteBuffer_xOffsets, RouteStrategy.SpriteBuffer_yOffsets, class432.SpriteBuffer_spriteWidths, class330.SpriteBuffer_spriteHeights, class432.SpriteBuffer_spritePalette, class369.SpriteBuffer_pixels); + UserComparator3.method2529(); + var6 = var8; } - var2 = var6; // L: 607 + var2 = var6; } - if (var2 != null) { // L: 610 + if (var2 != null) { Widget_cachedSpriteMasks.put(var2, (long)this.fontId); } else { - field3223 = true; // L: 611 + field3223 = true; } - return var2; // L: 612 + return var2; } } } @@ -1367,24 +1367,24 @@ public class Widget extends Node { ) @Export("getInventorySprite") public SpritePixels getInventorySprite(int var1) { - field3223 = false; // L: 616 - if (var1 >= 0 && var1 < this.inventorySprites.length) { // L: 617 - int var2 = this.inventorySprites[var1]; // L: 618 - if (var2 == -1) { // L: 619 + field3223 = false; + if (var1 >= 0 && var1 < this.inventorySprites.length) { + int var2 = this.inventorySprites[var1]; + if (var2 == -1) { return null; } else { - SpritePixels var3 = (SpritePixels)Widget_cachedModels.get((long)var2); // L: 620 - if (var3 != null) { // L: 621 + SpritePixels var3 = (SpritePixels)Widget_cachedModels.get((long)var2); + if (var3 != null) { return var3; } else { - var3 = class6.SpriteBuffer_getSprite(GraphicsObject.Widget_spritesArchive, var2, 0); // L: 622 - if (var3 != null) { // L: 623 + var3 = class6.SpriteBuffer_getSprite(GraphicsObject.Widget_spritesArchive, var2, 0); + if (var3 != null) { Widget_cachedModels.put(var3, (long)var2); } else { - field3223 = true; // L: 624 + field3223 = true; } - return var3; // L: 625 + return var3; } } } else { @@ -1399,78 +1399,78 @@ public class Widget extends Node { ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerComposition var4) { - field3223 = false; // L: 629 + field3223 = false; int var5; int var6; - if (var3) { // L: 632 - var5 = this.modelType2; // L: 633 - var6 = this.modelId2; // L: 634 + if (var3) { + var5 = this.modelType2; + var6 = this.modelId2; } else { - var5 = this.modelType; // L: 637 - var6 = this.modelId; // L: 638 + var5 = this.modelType; + var6 = this.modelId; } - if (var5 == 0) { // L: 640 + if (var5 == 0) { return null; - } else if (var5 == 1 && var6 == -1) { // L: 641 + } else if (var5 == 1 && var6 == -1) { return null; } else { - Model var7 = (Model)Widget_cachedFonts.get((long)(var6 + (var5 << 16))); // L: 642 - if (var7 == null) { // L: 643 + Model var7 = (Model)Widget_cachedFonts.get((long)(var6 + (var5 << 16))); + if (var7 == null) { ModelData var8; - if (var5 == 1) { // L: 645 - var8 = ModelData.ModelData_get(Widget_modelsArchive, var6, 0); // L: 646 - if (var8 == null) { // L: 647 - field3223 = true; // L: 648 - return null; // L: 649 - } - - var7 = var8.toModel(64, 768, -50, -10, -50); // L: 651 - } - - if (var5 == 2) { // L: 653 - var8 = WorldMapLabelSize.getNpcDefinition(var6).getModelData(); // L: 654 - if (var8 == null) { // L: 655 - field3223 = true; // L: 656 - return null; // L: 657 - } - - var7 = var8.toModel(64, 768, -50, -10, -50); // L: 659 - } - - if (var5 == 3) { // L: 661 - if (var4 == null) { // L: 662 + if (var5 == 1) { + var8 = ModelData.ModelData_get(Widget_modelsArchive, var6, 0); + if (var8 == null) { + field3223 = true; return null; } - var8 = var4.getModelData(); // L: 663 - if (var8 == null) { // L: 664 - field3223 = true; // L: 665 - return null; // L: 666 - } - - var7 = var8.toModel(64, 768, -50, -10, -50); // L: 668 + var7 = var8.toModel(64, 768, -50, -10, -50); } - if (var5 == 4) { // L: 670 - ItemComposition var9 = UserComparator6.ItemDefinition_get(var6); // L: 671 - var8 = var9.getModelData(10); // L: 672 - if (var8 == null) { // L: 673 - field3223 = true; // L: 674 - return null; // L: 675 + if (var5 == 2) { + var8 = WorldMapLabelSize.getNpcDefinition(var6).getModelData(); + if (var8 == null) { + field3223 = true; + return null; } - var7 = var8.toModel(var9.ambient + 64, var9.contrast + 768, -50, -10, -50); // L: 677 + var7 = var8.toModel(64, 768, -50, -10, -50); } - Widget_cachedFonts.put(var7, (long)(var6 + (var5 << 16))); // L: 679 + if (var5 == 3) { + if (var4 == null) { + return null; + } + + var8 = var4.getModelData(); + if (var8 == null) { + field3223 = true; + return null; + } + + var7 = var8.toModel(64, 768, -50, -10, -50); + } + + if (var5 == 4) { + ItemComposition var9 = UserComparator6.ItemDefinition_get(var6); + var8 = var9.getModelData(10); + if (var8 == null) { + field3223 = true; + return null; + } + + var7 = var8.toModel(var9.ambient + 64, var9.contrast + 768, -50, -10, -50); + } + + Widget_cachedFonts.put(var7, (long)(var6 + (var5 << 16))); } - if (var1 != null) { // L: 681 - var7 = var1.transformWidgetModel(var7, var2); // L: 682 + if (var1 != null) { + var7 = var1.transformWidgetModel(var7, var2); } - return var7; // L: 684 + return var7; } } @@ -1481,53 +1481,53 @@ public class Widget extends Node { ) @Export("getSpriteMask") public SpriteMask getSpriteMask(boolean var1) { - if (this.spriteId == -1) { // L: 688 + if (this.spriteId == -1) { var1 = false; } - int var2 = var1 ? this.spriteId * 728672183 * 655222279 : this.spriteId2 * -1083804351 * 949557953; // L: 689 - if (var2 == -1) { // L: 690 + int var2 = var1 ? this.spriteId * 728672183 * 655222279 : this.spriteId2 * -1083804351 * 949557953; + if (var2 == -1) { return null; } else { - long var3 = ((long)this.spriteShadow << 40) + ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipV ? 1L : 0L) << 38) + ((this.spriteFlipH ? 1L : 0L) << 39); // L: 691 - SpriteMask var5 = (SpriteMask)field3222.get(var3); // L: 692 - if (var5 != null) { // L: 693 + long var3 = ((long)this.spriteShadow << 40) + ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipV ? 1L : 0L) << 38) + ((this.spriteFlipH ? 1L : 0L) << 39); + SpriteMask var5 = (SpriteMask)field3222.get(var3); + if (var5 != null) { return var5; } else { - SpritePixels var6 = this.getSprite(var1); // L: 694 - if (var6 == null) { // L: 695 + SpritePixels var6 = this.getSprite(var1); + if (var6 == null) { return null; } else { - SpritePixels var7 = var6.copyNormalized(); // L: 696 - int[] var8 = new int[var7.subHeight]; // L: 697 - int[] var9 = new int[var7.subHeight]; // L: 698 + SpritePixels var7 = var6.copyNormalized(); + int[] var8 = new int[var7.subHeight]; + int[] var9 = new int[var7.subHeight]; - for (int var10 = 0; var10 < var7.subHeight; ++var10) { // L: 699 - int var11 = 0; // L: 700 - int var12 = var7.subWidth; // L: 701 + for (int var10 = 0; var10 < var7.subHeight; ++var10) { + int var11 = 0; + int var12 = var7.subWidth; int var13; - for (var13 = 0; var13 < var7.subWidth; ++var13) { // L: 702 - if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 703 - var11 = var13; // L: 704 + for (var13 = 0; var13 < var7.subWidth; ++var13) { + if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { + var11 = var13; break; } } - for (var13 = var7.subWidth - 1; var13 >= var11; --var13) { // L: 708 - if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 709 - var12 = var13 + 1; // L: 710 + for (var13 = var7.subWidth - 1; var13 >= var11; --var13) { + if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { + var12 = var13 + 1; break; } } - var8[var10] = var11; // L: 714 - var9[var10] = var12 - var11; // L: 715 + var8[var10] = var11; + var9[var10] = var12 - var11; } - var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2); // L: 717 - field3222.put(var5, var3); // L: 718 - return var5; // L: 719 + var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2); + field3222.put(var5, var3); + return var5; } } } @@ -1540,17 +1540,17 @@ public class Widget extends Node { ) @Export("setAction") public void setAction(int var1, String var2) { - if (this.actions == null || this.actions.length <= var1) { // L: 730 - String[] var3 = new String[var1 + 1]; // L: 731 - if (this.actions != null) { // L: 732 - for (int var4 = 0; var4 < this.actions.length; ++var4) { // L: 733 + if (this.actions == null || this.actions.length <= var1) { + String[] var3 = new String[var1 + 1]; + if (this.actions != null) { + for (int var4 = 0; var4 < this.actions.length; ++var4) { var3[var4] = this.actions[var4]; } } - this.actions = var3; // L: 735 + this.actions = var3; } - this.actions[var1] = var2; // L: 737 - } // L: 738 + this.actions[var1] = var2; + } } diff --git a/runescape-client/src/main/java/World.java b/runescape-client/src/main/java/World.java index 4dfa858a67..0db6a3a64a 100644 --- a/runescape-client/src/main/java/World.java +++ b/runescape-client/src/main/java/World.java @@ -75,14 +75,14 @@ public class World { int index; static { - World_count = 0; // L: 14 - World_listCount = 0; // L: 15 - World_sortOption2 = new int[]{1, 1, 1, 1}; // L: 16 - World_sortOption1 = new int[]{0, 1, 2, 3}; // L: 17 + World_count = 0; + World_listCount = 0; + World_sortOption2 = new int[]{1, 1, 1, 1}; + World_sortOption1 = new int[]{0, 1, 2, 3}; } World() { - } // L: 27 + } @ObfuscatedName("r") @ObfuscatedSignature( @@ -91,7 +91,7 @@ public class World { ) @Export("isMembersOnly") boolean isMembersOnly() { - return (1 & this.properties) != 0; // L: 247 + return (1 & this.properties) != 0; } @ObfuscatedName("o") @@ -100,7 +100,7 @@ public class World { garbageValue = "-624791914" ) boolean method1696() { - return (2 & this.properties) != 0; // L: 251 + return (2 & this.properties) != 0; } @ObfuscatedName("v") @@ -110,7 +110,7 @@ public class World { ) @Export("isPvp") boolean isPvp() { - return (4 & this.properties) != 0; // L: 255 + return (4 & this.properties) != 0; } @ObfuscatedName("d") @@ -119,7 +119,7 @@ public class World { garbageValue = "-1754892594" ) boolean method1676() { - return (8 & this.properties) != 0; // L: 259 + return (8 & this.properties) != 0; } @ObfuscatedName("h") @@ -129,7 +129,7 @@ public class World { ) @Export("isDeadman") boolean isDeadman() { - return (536870912 & this.properties) != 0; // L: 263 + return (536870912 & this.properties) != 0; } @ObfuscatedName("g") @@ -139,7 +139,7 @@ public class World { ) @Export("isBeta") boolean isBeta() { - return (33554432 & this.properties) != 0; // L: 267 + return (33554432 & this.properties) != 0; } @ObfuscatedName("e") @@ -148,7 +148,7 @@ public class World { garbageValue = "-98" ) boolean method1679() { - return (1073741824 & this.properties) != 0; // L: 271 + return (1073741824 & this.properties) != 0; } @ObfuscatedName("n") @@ -158,31 +158,31 @@ public class World { ) @Export("Widget_setKey") static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { - if (var0.field3300 == null) { // L: 972 - if (var2 == null) { // L: 973 - return; // L: 979 + if (var0.field3300 == null) { + if (var2 == null) { + return; } - var0.field3300 = new byte[11][]; // L: 974 - var0.field3301 = new byte[11][]; // L: 975 - var0.field3302 = new int[11]; // L: 976 - var0.field3303 = new int[11]; // L: 977 + var0.field3300 = new byte[11][]; + var0.field3301 = new byte[11][]; + var0.field3302 = new int[11]; + var0.field3303 = new int[11]; } - var0.field3300[var1] = var2; // L: 981 + var0.field3300[var1] = var2; if (var2 != null) { - var0.field3299 = true; // L: 982 + var0.field3299 = true; } else { - var0.field3299 = false; // L: 984 + var0.field3299 = false; - for (int var4 = 0; var4 < var0.field3300.length; ++var4) { // L: 985 - if (var0.field3300[var4] != null) { // L: 986 - var0.field3299 = true; // L: 987 + for (int var4 = 0; var4 < var0.field3300.length; ++var4) { + if (var0.field3300[var4] != null) { + var0.field3299 = true; break; } } } - var0.field3301[var1] = var3; // L: 992 - } // L: 993 + var0.field3301[var1] = var3; + } } diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index 2ff964f967..80a75e63fb 100644 --- a/runescape-client/src/main/java/WorldMap.java +++ b/runescape-client/src/main/java/WorldMap.java @@ -286,42 +286,42 @@ public class WorldMap { int field4365; static { - fontNameVerdana11 = FontName.FontName_verdana11; // L: 46 - fontNameVerdana13 = FontName.FontName_verdana13; // L: 47 - fontNameVerdana15 = FontName.FontName_verdana15; // L: 48 + fontNameVerdana11 = FontName.FontName_verdana11; + fontNameVerdana13 = FontName.FontName_verdana13; + fontNameVerdana15 = FontName.FontName_verdana15; } public WorldMap() { - this.worldMapTargetX = -1; // L: 60 - this.worldMapTargetY = -1; // L: 61 - this.worldMapDisplayWidth = -1; // L: 64 - this.worldMapDisplayHeight = -1; // L: 65 - this.worldMapDisplayX = -1; // L: 66 - this.worldMapDisplayY = -1; // L: 67 - this.maxFlashCount = 3; // L: 68 - this.cyclesPerFlash = 50; // L: 69 - this.perpetualFlash = false; // L: 70 - this.flashingElements = null; // L: 71 - this.flashCount = -1; // L: 72 - this.flashCycle = -1; // L: 73 - this.field4340 = -1; // L: 74 - this.field4335 = -1; // L: 75 - this.field4342 = -1; // L: 76 - this.field4343 = -1; // L: 77 - this.field4334 = true; // L: 81 - this.enabledElements = new HashSet(); // L: 84 - this.enabledCategories = new HashSet(); // L: 85 - this.enabledElementIds = new HashSet(); // L: 86 - this.field4351 = new HashSet(); // L: 87 - this.elementsDisabled = false; // L: 88 - this.field4353 = 0; // L: 89 - this.menuOpcodes = new int[]{1008, 1009, 1010, 1011, 1012}; // L: 91 - this.field4358 = 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.field4365 = -1; // L: 101 + this.worldMapTargetX = -1; + this.worldMapTargetY = -1; + this.worldMapDisplayWidth = -1; + this.worldMapDisplayHeight = -1; + this.worldMapDisplayX = -1; + this.worldMapDisplayY = -1; + this.maxFlashCount = 3; + this.cyclesPerFlash = 50; + this.perpetualFlash = false; + this.flashingElements = null; + this.flashCount = -1; + this.flashCycle = -1; + this.field4340 = -1; + this.field4335 = -1; + this.field4342 = -1; + this.field4343 = -1; + this.field4334 = true; + this.enabledElements = new HashSet(); + this.enabledCategories = new HashSet(); + this.enabledElementIds = new HashSet(); + this.field4351 = new HashSet(); + this.elementsDisabled = false; + this.field4353 = 0; + this.menuOpcodes = new int[]{1008, 1009, 1010, 1011, 1012}; + this.field4358 = new HashSet(); + this.mouseCoord = null; + this.showCoord = false; + this.minCachedTileX = -1; + this.minCachedTileY = -1; + this.field4365 = -1; } @ObfuscatedName("c") @@ -331,33 +331,33 @@ public class WorldMap { ) @Export("init") public void init(AbstractArchive var1, AbstractArchive var2, AbstractArchive var3, Font var4, HashMap var5, IndexedSprite[] var6) { - this.mapSceneSprites = var6; // L: 105 - this.WorldMap_archive = var1; // L: 106 - this.WorldMap_geographyArchive = var2; // L: 107 - this.WorldMap_groundArchive = var3; // L: 108 - this.font = var4; // L: 109 - this.fonts = new HashMap(); // L: 110 - this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_small, var5.get(fontNameVerdana11)); // L: 111 - 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.field2768.name); // L: 115 - int[] var8 = this.WorldMap_archive.getGroupFileIds(var7); // L: 116 - this.details = new HashMap(var8.length); // L: 117 + this.mapSceneSprites = var6; + this.WorldMap_archive = var1; + this.WorldMap_geographyArchive = var2; + this.WorldMap_groundArchive = var3; + this.font = var4; + this.fonts = new HashMap(); + this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_small, var5.get(fontNameVerdana11)); + this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_medium, var5.get(fontNameVerdana13)); + this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_large, var5.get(fontNameVerdana15)); + this.cacheLoader = new WorldMapArchiveLoader(var1); + int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field2768.name); + int[] var8 = this.WorldMap_archive.getGroupFileIds(var7); + this.details = new HashMap(var8.length); - for (int var9 = 0; var9 < var8.length; ++var9) { // L: 118 - Buffer var10 = new Buffer(this.WorldMap_archive.takeFile(var7, var8[var9])); // L: 119 - WorldMapArea var11 = new WorldMapArea(); // L: 120 - var11.read(var10, var8[var9]); // L: 121 - this.details.put(var11.getInternalName(), var11); // L: 122 - if (var11.getIsMain()) { // L: 123 - this.mainMapArea = var11; // L: 124 + for (int var9 = 0; var9 < var8.length; ++var9) { + Buffer var10 = new Buffer(this.WorldMap_archive.takeFile(var7, var8[var9])); + WorldMapArea var11 = new WorldMapArea(); + var11.read(var10, var8[var9]); + this.details.put(var11.getInternalName(), var11); + if (var11.getIsMain()) { + this.mainMapArea = var11; } } - this.setCurrentMapArea(this.mainMapArea); // L: 127 - this.field4321 = null; // L: 128 - } // L: 129 + this.setCurrentMapArea(this.mainMapArea); + this.field4321 = null; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -365,8 +365,8 @@ public class WorldMap { garbageValue = "1522497610" ) public void method6902() { - WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); // L: 133 - } // L: 135 + WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -375,49 +375,49 @@ public class WorldMap { ) @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.method4617(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()) { + this.smoothZoom(); + this.scrollToTarget(); + if (var3) { + int var8 = (int)Math.ceil((double)((float)var6 / this.zoom)); + int var9 = (int)Math.ceil((double)((float)var7 / this.zoom)); + List var10 = this.worldMapManager.method4617(this.centerTileX - var8 / 2 - 1, this.centerTileY - var9 / 2 - 1, var8 / 2 + this.centerTileX + 1, var9 / 2 + this.centerTileY + 1, var4, var5, var6, var7, var1, var2); + HashSet var11 = new HashSet(); Iterator var12; AbstractWorldMapIcon var13; ScriptEvent var14; WorldMapEvent var15; - for (var12 = var10.iterator(); var12.hasNext(); class285.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.field4358.contains(var13)) { // L: 157 - var14.setType(17); // L: 158 + for (var12 = var10.iterator(); var12.hasNext(); class285.runScriptEvent(var14)) { + var13 = (AbstractWorldMapIcon)var12.next(); + var11.add(var13); + var14 = new ScriptEvent(); + var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); + var14.setArgs(new Object[]{var15, var1, var2}); + if (this.field4358.contains(var13)) { + var14.setType(17); } else { - var14.setType(15); // L: 161 + var14.setType(15); } } - var12 = this.field4358.iterator(); // L: 166 + var12 = this.field4358.iterator(); 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 - class285.runScriptEvent(var14); // L: 174 + var13 = (AbstractWorldMapIcon)var12.next(); + if (!var11.contains(var13)) { + var14 = new ScriptEvent(); + var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); + var14.setArgs(new Object[]{var15, var1, var2}); + var14.setType(16); + class285.runScriptEvent(var14); } } - this.field4358 = var11; // L: 178 + this.field4358 = var11; } } - } // L: 139 144 179 + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -425,66 +425,66 @@ public class WorldMap { garbageValue = "2076670007" ) public void method7062(int var1, int var2, boolean var3, boolean var4) { - long var5 = Ignored.method6459(); // L: 182 - this.method6886(var1, var2, var4, var5); // L: 183 - if (this.hasTarget() || !var4 && !var3) { // L: 184 - this.method7050(); // L: 198 + long var5 = Ignored.method6459(); + this.method6886(var1, var2, var4, var5); + if (this.hasTarget() || !var4 && !var3) { + this.method7050(); } else { - if (var4) { // L: 185 - this.field4342 = var1; // L: 186 - this.field4343 = var2; // L: 187 - this.field4340 = this.centerTileX; // L: 188 - this.field4335 = this.centerTileY; // L: 189 + if (var4) { + this.field4342 = var1; + this.field4343 = var2; + this.field4340 = this.centerTileX; + this.field4335 = this.centerTileY; } - if (this.field4340 != -1) { // L: 191 - int var7 = var1 - this.field4342; // L: 192 - int var8 = var2 - this.field4343; // L: 193 - this.setWorldMapPosition(this.field4340 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field4335, false); // L: 194 + if (this.field4340 != -1) { + int var7 = var1 - this.field4342; + int var8 = var2 - this.field4343; + this.setWorldMapPosition(this.field4340 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field4335, false); } } - if (var4) { // L: 200 - this.field4311 = var5; // L: 201 - this.field4345 = var1; // L: 202 - this.field4346 = var2; // L: 203 + if (var4) { + this.field4311 = var5; + this.field4345 = var1; + this.field4346 = var2; } - } // L: 205 + } @ObfuscatedName("t") void method6886(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 - boolean var8 = Client.staffModLevel >= 2; // L: 215 - if (var8 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { // L: 217 - BuddyRankComparator.method2547(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); // L: 218 + if (this.currentMapArea != null) { + int var6 = (int)((float)this.centerTileX + ((float)(var1 - this.worldMapDisplayX) - (float)this.getDisplayWith() * this.zoom / 2.0F) / this.zoom); + int var7 = (int)((float)this.centerTileY - ((float)(var2 - this.worldMapDisplayY) - (float)this.getDisplayHeight() * this.zoom / 2.0F) / this.zoom); + this.mouseCoord = this.currentMapArea.coord(var6 + this.currentMapArea.getRegionLowX() * 64, var7 + this.currentMapArea.getRegionLowY() * 64); + if (this.mouseCoord != null && var3) { + boolean var8 = Client.staffModLevel >= 2; + if (var8 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { + BuddyRankComparator.method2547(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); } else { - boolean var9 = true; // L: 221 - if (this.field4334) { // L: 222 - int var10 = var1 - this.field4345; // L: 223 - int var11 = var2 - this.field4346; // L: 224 - if (var4 - this.field4311 > 500L || var10 < -25 || var10 > 25 || var11 < -25 || var11 > 25) { // L: 225 - var9 = false; // L: 226 + boolean var9 = true; + if (this.field4334) { + int var10 = var1 - this.field4345; + int var11 = var2 - this.field4346; + if (var4 - this.field4311 > 500L || var10 < -25 || var10 > 25 || var11 < -25 || var11 > 25) { + var9 = false; } } - if (var9) { // L: 229 - PacketBufferNode var12 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2825, Client.packetWriter.isaacCipher); // L: 230 - var12.packetBuffer.writeIntME(this.mouseCoord.packed()); // L: 231 - Client.packetWriter.addNode(var12); // L: 232 - this.field4311 = 0L; // L: 233 + if (var9) { + PacketBufferNode var12 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2825, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeIntME(this.mouseCoord.packed()); + Client.packetWriter.addNode(var12); + this.field4311 = 0L; } } } } else { - this.mouseCoord = null; // L: 238 + this.mouseCoord = null; } - } // L: 239 + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -493,19 +493,19 @@ public class WorldMap { ) @Export("smoothZoom") void smoothZoom() { - if (Messages.field1273 != null) { // L: 242 - this.zoom = this.zoomTarget; // L: 243 + if (Messages.field1273 != null) { + this.zoom = this.zoomTarget; } else { - if (this.zoom < this.zoomTarget) { // L: 246 - this.zoom = Math.min(this.zoomTarget, this.zoom + this.zoom / 30.0F); // L: 247 + if (this.zoom < this.zoomTarget) { + this.zoom = Math.min(this.zoomTarget, this.zoom + this.zoom / 30.0F); } - if (this.zoom > this.zoomTarget) { // L: 249 - this.zoom = Math.max(this.zoomTarget, this.zoom - this.zoom / 30.0F); // L: 250 + if (this.zoom > this.zoomTarget) { + this.zoom = Math.max(this.zoomTarget, this.zoom - this.zoom / 30.0F); } } - } // L: 244 252 + } @ObfuscatedName("j") @ObfuscatedSignature( @@ -514,25 +514,25 @@ public class WorldMap { ) @Export("scrollToTarget") void scrollToTarget() { - if (this.hasTarget()) { // L: 255 - int var1 = this.worldMapTargetX - this.centerTileX; // L: 258 - int var2 = this.worldMapTargetY - this.centerTileY; // L: 259 - if (var1 != 0) { // L: 260 - var1 /= Math.min(8, Math.abs(var1)); // L: 261 + if (this.hasTarget()) { + int var1 = this.worldMapTargetX - this.centerTileX; + int var2 = this.worldMapTargetY - this.centerTileY; + if (var1 != 0) { + var1 /= Math.min(8, Math.abs(var1)); } - if (var2 != 0) { // L: 263 - var2 /= Math.min(8, Math.abs(var2)); // L: 264 + if (var2 != 0) { + var2 /= Math.min(8, Math.abs(var2)); } - this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); // L: 266 - if (this.centerTileX == this.worldMapTargetX && this.centerTileY == this.worldMapTargetY) { // L: 267 - this.worldMapTargetX = -1; // L: 268 - this.worldMapTargetY = -1; // L: 269 + this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); + if (this.centerTileX == this.worldMapTargetX && this.centerTileY == this.worldMapTargetY) { + this.worldMapTargetX = -1; + this.worldMapTargetY = -1; } } - } // L: 256 271 + } @ObfuscatedName("w") @ObfuscatedSignature( @@ -541,14 +541,14 @@ public class WorldMap { ) @Export("setWorldMapPosition") final void setWorldMapPosition(int var1, int var2, boolean var3) { - this.centerTileX = var1; // L: 274 - this.centerTileY = var2; // L: 275 - Ignored.method6459(); // L: 276 + this.centerTileX = var1; + this.centerTileY = var2; + Ignored.method6459(); if (var3) { - this.method7050(); // L: 277 + this.method7050(); } - } // L: 278 + } @ObfuscatedName("n") @ObfuscatedSignature( @@ -556,11 +556,11 @@ public class WorldMap { garbageValue = "-69" ) final void method7050() { - this.field4343 = -1; // L: 281 - this.field4342 = -1; // L: 282 - this.field4335 = -1; // L: 283 - this.field4340 = -1; // L: 284 - } // L: 285 + this.field4343 = -1; + this.field4342 = -1; + this.field4335 = -1; + this.field4340 = -1; + } @ObfuscatedName("r") @ObfuscatedSignature( @@ -569,7 +569,7 @@ public class WorldMap { ) @Export("hasTarget") boolean hasTarget() { - return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; // L: 288 + return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; } @ObfuscatedName("o") @@ -579,18 +579,18 @@ public class WorldMap { ) @Export("mapAreaAtCoord") public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) { - Iterator var4 = this.details.values().iterator(); // L: 292 + Iterator var4 = this.details.values().iterator(); WorldMapArea var5; do { if (!var4.hasNext()) { - return null; // L: 300 + return null; } - var5 = (WorldMapArea)var4.next(); // L: 293 - } while(!var5.containsCoord(var1, var2, var3)); // L: 295 + var5 = (WorldMapArea)var4.next(); + } while(!var5.containsCoord(var1, var2, var3)); - return var5; // L: 296 + return var5; } @ObfuscatedName("v") @@ -599,27 +599,27 @@ public class WorldMap { garbageValue = "48" ) public void method6870(int var1, int var2, int var3, boolean var4) { - WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); // L: 304 - if (var5 == null) { // L: 305 - if (!var4) { // L: 306 - return; // L: 309 + WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); + if (var5 == null) { + if (!var4) { + return; } - var5 = this.mainMapArea; // L: 307 + var5 = this.mainMapArea; } - boolean var6 = false; // L: 311 - if (var5 != this.field4321 || var4) { // L: 312 - this.field4321 = var5; // L: 313 - this.setCurrentMapArea(var5); // L: 314 - var6 = true; // L: 315 + boolean var6 = false; + if (var5 != this.field4321 || var4) { + this.field4321 = var5; + this.setCurrentMapArea(var5); + var6 = true; } - if (var6 || var4) { // L: 317 - this.jump(var1, var2, var3); // L: 318 + if (var6 || var4) { + this.jump(var1, var2, var3); } - } // L: 320 + } @ObfuscatedName("d") @ObfuscatedSignature( @@ -628,12 +628,12 @@ public class WorldMap { ) @Export("setCurrentMapAreaId") public void setCurrentMapAreaId(int var1) { - WorldMapArea var2 = this.getMapArea(var1); // L: 323 - if (var2 != null) { // L: 324 - this.setCurrentMapArea(var2); // L: 325 + WorldMapArea var2 = this.getMapArea(var1); + if (var2 != null) { + this.setCurrentMapArea(var2); } - } // L: 327 + } @ObfuscatedName("h") @ObfuscatedSignature( @@ -642,7 +642,7 @@ public class WorldMap { ) @Export("currentMapAreaId") public int currentMapAreaId() { - return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); // L: 330 331 333 + return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); } @ObfuscatedName("g") @@ -652,7 +652,7 @@ public class WorldMap { ) @Export("getCurrentMapArea") public WorldMapArea getCurrentMapArea() { - return this.currentMapArea; // L: 337 + return this.currentMapArea; } @ObfuscatedName("e") @@ -662,11 +662,11 @@ public class WorldMap { ) @Export("setCurrentMapArea") void setCurrentMapArea(WorldMapArea var1) { - if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 341 - this.initializeWorldMapManager(var1); // L: 344 - this.jump(-1, -1, -1); // L: 345 + if (this.currentMapArea == null || var1 != this.currentMapArea) { + this.initializeWorldMapManager(var1); + this.jump(-1, -1, -1); } - } // L: 342 346 + } @ObfuscatedName("a") @ObfuscatedSignature( @@ -675,10 +675,10 @@ public class WorldMap { ) @Export("initializeWorldMapManager") void initializeWorldMapManager(WorldMapArea var1) { - this.currentMapArea = var1; // L: 349 - this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.WorldMap_geographyArchive, this.WorldMap_groundArchive); // L: 350 - this.cacheLoader.reset(this.currentMapArea.getInternalName()); // L: 351 - } // L: 352 + this.currentMapArea = var1; + this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.WorldMap_geographyArchive, this.WorldMap_groundArchive); + this.cacheLoader.reset(this.currentMapArea.getInternalName()); + } @ObfuscatedName("u") @ObfuscatedSignature( @@ -686,19 +686,19 @@ public class WorldMap { garbageValue = "-665404074" ) public void method6876(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { - if (var1 != null) { // L: 355 - if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 358 - this.initializeWorldMapManager(var1); // L: 359 + if (var1 != null) { + if (this.currentMapArea == null || var1 != this.currentMapArea) { + this.initializeWorldMapManager(var1); } - if (!var4 && this.currentMapArea.containsCoord(var2.plane, var2.x, var2.y)) { // L: 361 - this.jump(var2.plane, var2.x, var2.y); // L: 365 + if (!var4 && this.currentMapArea.containsCoord(var2.plane, var2.x, var2.y)) { + this.jump(var2.plane, var2.x, var2.y); } else { - this.jump(var3.plane, var3.x, var3.y); // L: 362 + this.jump(var3.plane, var3.x, var3.y); } } - } // L: 356 367 + } @ObfuscatedName("k") @ObfuscatedSignature( @@ -707,22 +707,22 @@ public class WorldMap { ) @Export("jump") void jump(int var1, int var2, int var3) { - if (this.currentMapArea != null) { // L: 370 - int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 373 - if (var4 == null) { // L: 374 - var4 = this.currentMapArea.position(this.currentMapArea.getOriginPlane(), this.currentMapArea.getOriginX(), this.currentMapArea.getOriginY()); // L: 375 + if (this.currentMapArea != null) { + int[] var4 = this.currentMapArea.position(var1, var2, var3); + if (var4 == null) { + var4 = this.currentMapArea.position(this.currentMapArea.getOriginPlane(), this.currentMapArea.getOriginX(), this.currentMapArea.getOriginY()); } - this.setWorldMapPosition(var4[0] - this.currentMapArea.getRegionLowX() * 64, var4[1] - this.currentMapArea.getRegionLowY() * 64, true); // L: 377 - this.worldMapTargetX = -1; // L: 378 - this.worldMapTargetY = -1; // L: 379 - this.zoom = this.getZoomFromPercentage(this.currentMapArea.getZoom()); // L: 380 - this.zoomTarget = this.zoom; // L: 381 - this.field4356 = null; // L: 382 - this.iconIterator = null; // L: 383 - this.worldMapManager.clearIcons(); // L: 384 + this.setWorldMapPosition(var4[0] - this.currentMapArea.getRegionLowX() * 64, var4[1] - this.currentMapArea.getRegionLowY() * 64, true); + this.worldMapTargetX = -1; + this.worldMapTargetY = -1; + this.zoom = this.getZoomFromPercentage(this.currentMapArea.getZoom()); + this.zoomTarget = this.zoom; + this.field4356 = null; + this.iconIterator = null; + this.worldMapManager.clearIcons(); } - } // L: 371 385 + } @ObfuscatedName("f") @ObfuscatedSignature( @@ -731,60 +731,60 @@ public class WorldMap { ) @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5) { - int[] var6 = new int[4]; // L: 388 - Rasterizer2D.Rasterizer2D_getClipArray(var6); // L: 389 - Rasterizer2D.Rasterizer2D_setClip(var1, var2, var3 + var1, var2 + var4); // L: 390 - Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 391 - int var7 = this.cacheLoader.getPercentLoaded(); // L: 392 - if (var7 < 100) { // L: 393 - this.drawLoading(var1, var2, var3, var4, var7); // L: 394 + int[] var6 = new int[4]; + Rasterizer2D.Rasterizer2D_getClipArray(var6); + Rasterizer2D.Rasterizer2D_setClip(var1, var2, var3 + var1, var2 + var4); + Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); + int var7 = this.cacheLoader.getPercentLoaded(); + if (var7 < 100) { + this.drawLoading(var1, var2, var3, var4, var7); } else { - if (!this.worldMapManager.isLoaded()) { // L: 397 - this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 398 - if (!this.worldMapManager.isLoaded()) { // L: 399 - return; // L: 400 + if (!this.worldMapManager.isLoaded()) { + this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); + if (!this.worldMapManager.isLoaded()) { + return; } } - if (this.flashingElements != null) { // L: 403 - ++this.flashCycle; // L: 404 - if (this.flashCycle % this.cyclesPerFlash == 0) { // L: 405 - this.flashCycle = 0; // L: 406 - ++this.flashCount; // L: 407 + if (this.flashingElements != null) { + ++this.flashCycle; + if (this.flashCycle % this.cyclesPerFlash == 0) { + this.flashCycle = 0; + ++this.flashCount; } - if (this.flashCount >= this.maxFlashCount && !this.perpetualFlash) { // L: 409 - this.flashingElements = null; // L: 410 + if (this.flashCount >= this.maxFlashCount && !this.perpetualFlash) { + this.flashingElements = null; } } - int var8 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 413 - int var9 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 414 - 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: 415 + int var8 = (int)Math.ceil((double)((float)var3 / this.zoom)); + int var9 = (int)Math.ceil((double)((float)var4 / this.zoom)); + this.worldMapManager.drawTiles(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4); boolean var10; - if (!this.elementsDisabled) { // L: 416 - var10 = false; // L: 417 - if (var5 - this.field4353 > 100) { // L: 418 - this.field4353 = var5; // L: 419 - var10 = true; // L: 420 + if (!this.elementsDisabled) { + var10 = false; + if (var5 - this.field4353 > 100) { + this.field4353 = var5; + var10 = true; } - this.worldMapManager.drawElements(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4, this.field4351, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); // L: 422 + 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.field4351, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); } - this.method7006(var1, var2, var3, var4, var8, var9); // L: 424 - var10 = Client.staffModLevel >= 2; // L: 427 - if (var10 && this.showCoord && this.mouseCoord != null) { // L: 429 + this.method7006(var1, var2, var3, var4, var8, var9); + var10 = Client.staffModLevel >= 2; + if (var10 && this.showCoord && this.mouseCoord != null) { this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1); } - this.worldMapDisplayWidth = var8; // L: 430 - this.worldMapDisplayHeight = var9; // L: 431 - this.worldMapDisplayX = var1; // L: 432 - this.worldMapDisplayY = var2; // L: 433 - Rasterizer2D.Rasterizer2D_setClipArray(var6); // L: 434 + this.worldMapDisplayWidth = var8; + this.worldMapDisplayHeight = var9; + this.worldMapDisplayX = var1; + this.worldMapDisplayY = var2; + Rasterizer2D.Rasterizer2D_setClipArray(var6); } - } // L: 395 435 + } @ObfuscatedName("l") @ObfuscatedSignature( @@ -792,17 +792,17 @@ public class WorldMap { garbageValue = "54" ) boolean method6879(int var1, int var2, int var3, int var4, int var5, int var6) { - if (this.sprite == null) { // L: 438 + if (this.sprite == null) { return true; - } else if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { // L: 439 - if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) { // L: 440 + } else if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { + if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) { return true; } else if (this.field4365 != Client.field559) { - return true; // L: 441 - } else if (var3 <= 0 && var4 <= 0) { // L: 442 - return var3 + var1 < var5 || var2 + var4 < var6; // L: 443 + return true; + } else if (var3 <= 0 && var4 <= 0) { + return var3 + var1 < var5 || var2 + var4 < var6; } else { - return true; // L: 444 + return true; } } else { return true; @@ -815,42 +815,42 @@ public class WorldMap { garbageValue = "-1766155108" ) void method7006(int var1, int var2, int var3, int var4, int var5, int var6) { - if (Messages.field1273 != null) { // L: 448 - int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); // L: 449 - int var8 = var3 + 512; // L: 450 - int var9 = var4 + 512; // L: 451 - float var10 = 1.0F; // L: 452 - var8 = (int)((float)var8 / var10); // L: 453 - var9 = (int)((float)var9 / var10); // L: 454 - int var11 = this.getDisplayX() - var5 / 2 - var7; // L: 455 - int var12 = this.getDisplayY() - var6 / 2 - var7; // L: 456 - int var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 457 - int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 458 - if (this.method6879(var8, var9, var13, var14, var3, var4)) { // L: 459 - if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) { // L: 460 - Arrays.fill(this.sprite.pixels, 0); // L: 463 + if (Messages.field1273 != null) { + int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); + int var8 = var3 + 512; + int var9 = var4 + 512; + float var10 = 1.0F; + var8 = (int)((float)var8 / var10); + var9 = (int)((float)var9 / var10); + int var11 = this.getDisplayX() - var5 / 2 - var7; + int var12 = this.getDisplayY() - var6 / 2 - var7; + int var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; + int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); + if (this.method6879(var8, var9, var13, var14, var3, var4)) { + if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) { + Arrays.fill(this.sprite.pixels, 0); } else { - this.sprite = new SpritePixels(var8, var9); // L: 461 + this.sprite = new SpritePixels(var8, var9); } - this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; // L: 464 - this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; // L: 465 - this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; // L: 466 - Messages.field1273.method5800(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); // L: 467 - this.field4365 = Client.field559; // L: 468 - var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 469 - var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 470 + this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; + this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; + this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; + Messages.field1273.method5800(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); + this.field4365 = Client.field559; + var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; + var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); } - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); // L: 472 - if (var10 == 1.0F) { // L: 473 - this.sprite.method7809(var13, var14, 192); // L: 474 + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); + if (var10 == 1.0F) { + this.sprite.method7809(var13, var14, 192); } else { - this.sprite.method7776(var13, var14, (int)(var10 * (float)var8), (int)((float)var9 * var10), 192); // L: 477 + this.sprite.method7776(var13, var14, (int)(var10 * (float)var8), (int)((float)var9 * var10), 192); } } - } // L: 480 + } @ObfuscatedName("x") @ObfuscatedSignature( @@ -859,17 +859,17 @@ public class WorldMap { ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4) { - if (this.cacheLoader.isLoaded()) { // L: 483 - if (!this.worldMapManager.isLoaded()) { // L: 486 - this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 487 - if (!this.worldMapManager.isLoaded()) { // L: 488 - return; // L: 489 + if (this.cacheLoader.isLoaded()) { + if (!this.worldMapManager.isLoaded()) { + this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); + if (!this.worldMapManager.isLoaded()) { + return; } } - this.worldMapManager.drawOverview(var1, var2, var3, var4, this.flashingElements, this.flashCycle, this.cyclesPerFlash); // L: 492 + this.worldMapManager.drawOverview(var1, var2, var3, var4, this.flashingElements, this.flashCycle, this.cyclesPerFlash); } - } // L: 484 493 + } @ObfuscatedName("z") @ObfuscatedSignature( @@ -878,8 +878,8 @@ public class WorldMap { ) @Export("setZoomPercentage") public void setZoomPercentage(int var1) { - this.zoomTarget = this.getZoomFromPercentage(var1); // L: 496 - } // L: 497 + this.zoomTarget = this.getZoomFromPercentage(var1); + } @ObfuscatedName("i") @ObfuscatedSignature( @@ -888,14 +888,14 @@ public class WorldMap { ) @Export("drawLoading") void drawLoading(int var1, int var2, int var3, int var4, int var5) { - byte var6 = 20; // L: 500 - int var7 = var3 / 2 + var1; // L: 501 - int var8 = var4 / 2 + var2 - 18 - var6; // L: 502 - Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 503 - Rasterizer2D.Rasterizer2D_drawRectangle(var7 - 152, var8, 304, 34, -65536); // L: 504 - Rasterizer2D.Rasterizer2D_fillRectangle(var7 - 150, var8 + 2, var5 * 3, 30, -65536); // L: 505 - this.font.drawCentered("Loading...", var7, var6 + var8, -1, -1); // L: 506 - } // L: 507 + byte var6 = 20; + int var7 = var3 / 2 + var1; + int var8 = var4 / 2 + var2 - 18 - var6; + Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); + Rasterizer2D.Rasterizer2D_drawRectangle(var7 - 152, var8, 304, 34, -65536); + Rasterizer2D.Rasterizer2D_fillRectangle(var7 - 150, var8 + 2, var5 * 3, 30, -65536); + this.font.drawCentered("Loading...", var7, var6 + var8, -1, -1); + } @ObfuscatedName("y") @ObfuscatedSignature( @@ -904,16 +904,16 @@ public class WorldMap { ) @Export("getZoomFromPercentage") float getZoomFromPercentage(int var1) { - if (var1 == 25) { // L: 510 + if (var1 == 25) { return 1.0F; - } else if (var1 == 37) { // L: 511 + } else if (var1 == 37) { return 1.5F; } else if (var1 == 50) { - return 2.0F; // L: 512 - } else if (var1 == 75) { // L: 513 + return 2.0F; + } else if (var1 == 75) { return 3.0F; } else { - return var1 == 100 ? 4.0F : 8.0F; // L: 514 515 + return var1 == 100 ? 4.0F : 8.0F; } } @@ -924,16 +924,16 @@ public class WorldMap { ) @Export("getZoomLevel") public int getZoomLevel() { - if ((double)this.zoomTarget == 1.0D) { // L: 519 + if ((double)this.zoomTarget == 1.0D) { return 25; - } else if (1.5D == (double)this.zoomTarget) { // L: 520 + } else if (1.5D == (double)this.zoomTarget) { return 37; - } else if (2.0D == (double)this.zoomTarget) { // L: 521 + } else if (2.0D == (double)this.zoomTarget) { return 50; } else if ((double)this.zoomTarget == 3.0D) { - return 75; // L: 522 + return 75; } else { - return (double)this.zoomTarget == 4.0D ? 100 : 200; // L: 523 524 + return (double)this.zoomTarget == 4.0D ? 100 : 200; } } @@ -944,8 +944,8 @@ public class WorldMap { ) @Export("loadCache") public void loadCache() { - this.cacheLoader.load(); // L: 528 - } // L: 529 + this.cacheLoader.load(); + } @ObfuscatedName("ab") @ObfuscatedSignature( @@ -954,7 +954,7 @@ public class WorldMap { ) @Export("isCacheLoaded") public boolean isCacheLoaded() { - return this.cacheLoader.isLoaded(); // L: 532 + return this.cacheLoader.isLoaded(); } @ObfuscatedName("an") @@ -964,18 +964,18 @@ public class WorldMap { ) @Export("getMapArea") public WorldMapArea getMapArea(int var1) { - Iterator var2 = this.details.values().iterator(); // L: 536 + Iterator var2 = this.details.values().iterator(); WorldMapArea var3; do { - if (!var2.hasNext()) { // L: 543 - return null; // L: 544 + if (!var2.hasNext()) { + return null; } - var3 = (WorldMapArea)var2.next(); // L: 537 - } while(var3.getId() != var1); // L: 539 + var3 = (WorldMapArea)var2.next(); + } while(var3.getId() != var1); - return var3; // L: 540 + return var3; } @ObfuscatedName("ax") @@ -985,11 +985,11 @@ public class WorldMap { ) @Export("setWorldMapPositionTarget") public void setWorldMapPositionTarget(int var1, int var2) { - if (this.currentMapArea != null && this.currentMapArea.containsPosition(var1, var2)) { // L: 548 - this.worldMapTargetX = var1 - this.currentMapArea.getRegionLowX() * 64; // L: 551 - this.worldMapTargetY = var2 - this.currentMapArea.getRegionLowY() * 64; // L: 552 + if (this.currentMapArea != null && this.currentMapArea.containsPosition(var1, var2)) { + this.worldMapTargetX = var1 - this.currentMapArea.getRegionLowX() * 64; + this.worldMapTargetY = var2 - this.currentMapArea.getRegionLowY() * 64; } - } // L: 549 553 + } @ObfuscatedName("am") @ObfuscatedSignature( @@ -998,12 +998,12 @@ public class WorldMap { ) @Export("setWorldMapPositionTargetInstant") public void setWorldMapPositionTargetInstant(int var1, int var2) { - if (this.currentMapArea != null) { // L: 556 - this.setWorldMapPosition(var1 - this.currentMapArea.getRegionLowX() * 64, var2 - this.currentMapArea.getRegionLowY() * 64, true); // L: 559 - this.worldMapTargetX = -1; // L: 560 - this.worldMapTargetY = -1; // L: 561 + if (this.currentMapArea != null) { + this.setWorldMapPosition(var1 - this.currentMapArea.getRegionLowX() * 64, var2 - this.currentMapArea.getRegionLowY() * 64, true); + this.worldMapTargetX = -1; + this.worldMapTargetY = -1; } - } // L: 557 562 + } @ObfuscatedName("az") @ObfuscatedSignature( @@ -1012,14 +1012,14 @@ public class WorldMap { ) @Export("jumpToSourceCoord") public void jumpToSourceCoord(int var1, int var2, int var3) { - if (this.currentMapArea != null) { // L: 565 - int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 568 - if (var4 != null) { // L: 569 - this.setWorldMapPositionTarget(var4[0], var4[1]); // L: 570 + if (this.currentMapArea != null) { + int[] var4 = this.currentMapArea.position(var1, var2, var3); + if (var4 != null) { + this.setWorldMapPositionTarget(var4[0], var4[1]); } } - } // L: 566 572 + } @ObfuscatedName("au") @ObfuscatedSignature( @@ -1028,14 +1028,14 @@ public class WorldMap { ) @Export("jumpToSourceCoordInstant") public void jumpToSourceCoordInstant(int var1, int var2, int var3) { - if (this.currentMapArea != null) { // L: 575 - int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 578 - if (var4 != null) { // L: 579 - this.setWorldMapPositionTargetInstant(var4[0], var4[1]); // L: 580 + if (this.currentMapArea != null) { + int[] var4 = this.currentMapArea.position(var1, var2, var3); + if (var4 != null) { + this.setWorldMapPositionTargetInstant(var4[0], var4[1]); } } - } // L: 576 582 + } @ObfuscatedName("av") @ObfuscatedSignature( @@ -1044,7 +1044,7 @@ public class WorldMap { ) @Export("getDisplayX") public int getDisplayX() { - return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; // L: 585 586 588 + return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; } @ObfuscatedName("ap") @@ -1054,7 +1054,7 @@ public class WorldMap { ) @Export("getDisplayY") public int getDisplayY() { - return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; // L: 592 593 595 + return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; } @ObfuscatedName("ac") @@ -1064,7 +1064,7 @@ public class WorldMap { ) @Export("getDisplayCoord") public Coord getDisplayCoord() { - return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); // L: 599 600 602 + return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); } @ObfuscatedName("aj") @@ -1074,7 +1074,7 @@ public class WorldMap { ) @Export("getDisplayWith") public int getDisplayWith() { - return this.worldMapDisplayWidth; // L: 606 + return this.worldMapDisplayWidth; } @ObfuscatedName("af") @@ -1084,7 +1084,7 @@ public class WorldMap { ) @Export("getDisplayHeight") public int getDisplayHeight() { - return this.worldMapDisplayHeight; // L: 610 + return this.worldMapDisplayHeight; } @ObfuscatedName("ar") @@ -1094,11 +1094,11 @@ public class WorldMap { ) @Export("setMaxFlashCount") public void setMaxFlashCount(int var1) { - if (var1 >= 1) { // L: 614 - this.maxFlashCount = var1; // L: 615 + if (var1 >= 1) { + this.maxFlashCount = var1; } - } // L: 617 + } @ObfuscatedName("ag") @ObfuscatedSignature( @@ -1107,8 +1107,8 @@ public class WorldMap { ) @Export("resetMaxFlashCount") public void resetMaxFlashCount() { - this.maxFlashCount = 3; // L: 620 - } // L: 621 + this.maxFlashCount = 3; + } @ObfuscatedName("al") @ObfuscatedSignature( @@ -1117,11 +1117,11 @@ public class WorldMap { ) @Export("setCyclesPerFlash") public void setCyclesPerFlash(int var1) { - if (var1 >= 1) { // L: 624 - this.cyclesPerFlash = var1; // L: 625 + if (var1 >= 1) { + this.cyclesPerFlash = var1; } - } // L: 627 + } @ObfuscatedName("aa") @ObfuscatedSignature( @@ -1130,8 +1130,8 @@ public class WorldMap { ) @Export("resetCyclesPerFlash") public void resetCyclesPerFlash() { - this.cyclesPerFlash = 50; // L: 630 - } // L: 631 + this.cyclesPerFlash = 50; + } @ObfuscatedName("as") @ObfuscatedSignature( @@ -1140,8 +1140,8 @@ public class WorldMap { ) @Export("setPerpetualFlash") public void setPerpetualFlash(boolean var1) { - this.perpetualFlash = var1; // L: 634 - } // L: 635 + this.perpetualFlash = var1; + } @ObfuscatedName("at") @ObfuscatedSignature( @@ -1150,11 +1150,11 @@ public class WorldMap { ) @Export("flashElement") public void flashElement(int var1) { - this.flashingElements = new HashSet(); // L: 638 - this.flashingElements.add(var1); // L: 639 - this.flashCount = 0; // L: 640 - this.flashCycle = 0; // L: 641 - } // L: 642 + this.flashingElements = new HashSet(); + this.flashingElements.add(var1); + this.flashCount = 0; + this.flashCycle = 0; + } @ObfuscatedName("ai") @ObfuscatedSignature( @@ -1163,17 +1163,17 @@ public class WorldMap { ) @Export("flashCategory") public void flashCategory(int var1) { - this.flashingElements = new HashSet(); // L: 645 - this.flashCount = 0; // L: 646 - this.flashCycle = 0; // L: 647 + this.flashingElements = new HashSet(); + this.flashCount = 0; + this.flashCycle = 0; - for (int var2 = 0; var2 < class408.WorldMapElement_count; ++var2) { // L: 648 - if (class78.WorldMapElement_get(var2) != null && class78.WorldMapElement_get(var2).category == var1) { // L: 649 652 - this.flashingElements.add(class78.WorldMapElement_get(var2).objectId); // L: 653 + for (int var2 = 0; var2 < class408.WorldMapElement_count; ++var2) { + if (class78.WorldMapElement_get(var2) != null && class78.WorldMapElement_get(var2).category == var1) { + this.flashingElements.add(class78.WorldMapElement_get(var2).objectId); } } - } // L: 656 + } @ObfuscatedName("aq") @ObfuscatedSignature( @@ -1182,8 +1182,8 @@ public class WorldMap { ) @Export("stopCurrentFlashes") public void stopCurrentFlashes() { - this.flashingElements = null; // L: 659 - } // L: 660 + this.flashingElements = null; + } @ObfuscatedName("aw") @ObfuscatedSignature( @@ -1192,8 +1192,8 @@ public class WorldMap { ) @Export("setElementsDisabled") public void setElementsDisabled(boolean var1) { - this.elementsDisabled = !var1; // L: 663 - } // L: 664 + this.elementsDisabled = !var1; + } @ObfuscatedName("ay") @ObfuscatedSignature( @@ -1202,14 +1202,14 @@ public class WorldMap { ) @Export("disableElement") public void disableElement(int var1, boolean var2) { - if (!var2) { // L: 667 - this.enabledElements.add(var1); // L: 668 + if (!var2) { + this.enabledElements.add(var1); } else { - this.enabledElements.remove(var1); // L: 671 + this.enabledElements.remove(var1); } - this.method6910(); // L: 673 - } // L: 674 + this.method6910(); + } @ObfuscatedName("ae") @ObfuscatedSignature( @@ -1218,25 +1218,25 @@ public class WorldMap { ) @Export("setCategoryDisabled") public void setCategoryDisabled(int var1, boolean var2) { - if (!var2) { // L: 677 - this.enabledCategories.add(var1); // L: 678 + if (!var2) { + this.enabledCategories.add(var1); } else { - this.enabledCategories.remove(var1); // L: 681 + this.enabledCategories.remove(var1); } - for (int var3 = 0; var3 < class408.WorldMapElement_count; ++var3) { // L: 683 - if (class78.WorldMapElement_get(var3) != null && class78.WorldMapElement_get(var3).category == var1) { // L: 684 687 - int var4 = class78.WorldMapElement_get(var3).objectId; // L: 688 - if (!var2) { // L: 689 - this.enabledElementIds.add(var4); // L: 690 + for (int var3 = 0; var3 < class408.WorldMapElement_count; ++var3) { + if (class78.WorldMapElement_get(var3) != null && class78.WorldMapElement_get(var3).category == var1) { + int var4 = class78.WorldMapElement_get(var3).objectId; + if (!var2) { + this.enabledElementIds.add(var4); } else { - this.enabledElementIds.remove(var4); // L: 693 + this.enabledElementIds.remove(var4); } } } - this.method6910(); // L: 697 - } // L: 698 + this.method6910(); + } @ObfuscatedName("ak") @ObfuscatedSignature( @@ -1245,7 +1245,7 @@ public class WorldMap { ) @Export("getElementsDisabled") public boolean getElementsDisabled() { - return !this.elementsDisabled; // L: 701 + return !this.elementsDisabled; } @ObfuscatedName("ad") @@ -1255,7 +1255,7 @@ public class WorldMap { ) @Export("isElementDisabled") public boolean isElementDisabled(int var1) { - return !this.enabledElements.contains(var1); // L: 705 + return !this.enabledElements.contains(var1); } @ObfuscatedName("bp") @@ -1265,7 +1265,7 @@ public class WorldMap { ) @Export("isCategoryDisabled") public boolean isCategoryDisabled(int var1) { - return !this.enabledCategories.contains(var1); // L: 709 + return !this.enabledCategories.contains(var1); } @ObfuscatedName("bd") @@ -1274,10 +1274,10 @@ public class WorldMap { garbageValue = "878025403" ) void method6910() { - this.field4351.clear(); // L: 713 - this.field4351.addAll(this.enabledElements); // L: 714 - this.field4351.addAll(this.enabledElementIds); // L: 715 - } // L: 716 + this.field4351.clear(); + this.field4351.addAll(this.enabledElements); + this.field4351.addAll(this.enabledElementIds); + } @ObfuscatedName("ba") @ObfuscatedSignature( @@ -1286,34 +1286,34 @@ public class WorldMap { ) @Export("addElementMenuOptions") public void addElementMenuOptions(int var1, int var2, int var3, int var4, int var5, int var6) { - if (this.cacheLoader.isLoaded()) { // L: 719 - int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 722 - int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 723 - List var9 = this.worldMapManager.method4617(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: 724 - if (!var9.isEmpty()) { // L: 725 + if (this.cacheLoader.isLoaded()) { + int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); + int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); + List var9 = this.worldMapManager.method4617(this.centerTileX - var7 / 2 - 1, this.centerTileY - var8 / 2 - 1, var7 / 2 + this.centerTileX + 1, var8 / 2 + this.centerTileY + 1, var1, var2, var3, var4, var5, var6); + if (!var9.isEmpty()) { Iterator var10 = var9.iterator(); boolean var13; do { - if (!var10.hasNext()) { // L: 728 - return; // L: 744 + if (!var10.hasNext()) { + return; } - AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); // L: 729 - WorldMapElement var12 = class78.WorldMapElement_get(var11.getElement()); // L: 731 - var13 = false; // L: 732 + AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); + WorldMapElement var12 = class78.WorldMapElement_get(var11.getElement()); + var13 = false; - for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { // L: 733 - if (var12.menuActions[var14] != null) { // L: 734 - class11.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); // L: 735 - var13 = true; // L: 736 + for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { + if (var12.menuActions[var14] != null) { + class11.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); + var13 = true; } } - } while(!var13); // L: 739 + } while(!var13); } } - } // L: 720 726 740 + } @ObfuscatedName("bq") @ObfuscatedSignature( @@ -1321,42 +1321,42 @@ public class WorldMap { garbageValue = "-998971600" ) public Coord method6988(int var1, Coord var2) { - if (!this.cacheLoader.isLoaded()) { // L: 747 - return null; // L: 748 - } else if (!this.worldMapManager.isLoaded()) { // L: 750 - return null; // L: 751 - } else if (!this.currentMapArea.containsPosition(var2.x, var2.y)) { // L: 753 - return null; // L: 754 + if (!this.cacheLoader.isLoaded()) { + return null; + } else if (!this.worldMapManager.isLoaded()) { + return null; + } else if (!this.currentMapArea.containsPosition(var2.x, var2.y)) { + return null; } else { - HashMap var3 = this.worldMapManager.buildIcons(); // L: 756 - List var4 = (List)var3.get(var1); // L: 757 - if (var4 != null && !var4.isEmpty()) { // L: 758 - AbstractWorldMapIcon var5 = null; // L: 761 - int var6 = -1; // L: 762 - Iterator var7 = var4.iterator(); // L: 763 + HashMap var3 = this.worldMapManager.buildIcons(); + List var4 = (List)var3.get(var1); + if (var4 != null && !var4.isEmpty()) { + AbstractWorldMapIcon var5 = null; + int var6 = -1; + Iterator var7 = var4.iterator(); while (true) { AbstractWorldMapIcon var8; int var11; do { if (!var7.hasNext()) { - return var5.coord2; // L: 778 + return var5.coord2; } - var8 = (AbstractWorldMapIcon)var7.next(); // L: 764 - int var9 = var8.coord2.x - var2.x; // L: 766 - int var10 = var8.coord2.y - var2.y; // L: 767 - var11 = var9 * var9 + var10 * var10; // L: 768 - if (var11 == 0) { // L: 769 - return var8.coord2; // L: 770 + var8 = (AbstractWorldMapIcon)var7.next(); + int var9 = var8.coord2.x - var2.x; + int var10 = var8.coord2.y - var2.y; + var11 = var9 * var9 + var10 * var10; + if (var11 == 0) { + return var8.coord2; } - } while(var11 >= var6 && var5 != null); // L: 772 + } while(var11 >= var6 && var5 != null); - var5 = var8; // L: 773 - var6 = var11; // L: 774 + var5 = var8; + var6 = var11; } } else { - return null; // L: 759 + return null; } } } @@ -1368,28 +1368,28 @@ public class WorldMap { ) @Export("worldMapMenuAction") public void worldMapMenuAction(int var1, int var2, Coord var3, Coord var4) { - ScriptEvent var5 = new ScriptEvent(); // L: 782 - WorldMapEvent var6 = new WorldMapEvent(var2, var3, var4); // L: 783 - var5.setArgs(new Object[]{var6}); // L: 784 - switch(var1) { // L: 785 + ScriptEvent var5 = new ScriptEvent(); + WorldMapEvent var6 = new WorldMapEvent(var2, var3, var4); + var5.setArgs(new Object[]{var6}); + switch(var1) { case 1008: - var5.setType(10); // L: 788 + var5.setType(10); break; case 1009: - var5.setType(11); // L: 793 - break; // L: 794 + var5.setType(11); + break; case 1010: - var5.setType(12); // L: 803 - break; // L: 804 + var5.setType(12); + break; case 1011: - var5.setType(13); // L: 798 - break; // L: 799 + var5.setType(13); + break; case 1012: - var5.setType(14); // L: 808 + var5.setType(14); } - class285.runScriptEvent(var5); // L: 812 - } // L: 813 + class285.runScriptEvent(var5); + } @ObfuscatedName("br") @ObfuscatedSignature( @@ -1398,22 +1398,22 @@ public class WorldMap { ) @Export("iconStart") public AbstractWorldMapIcon iconStart() { - if (!this.cacheLoader.isLoaded()) { // L: 816 - return null; // L: 817 - } else if (!this.worldMapManager.isLoaded()) { // L: 819 - return null; // L: 820 + if (!this.cacheLoader.isLoaded()) { + return null; + } else if (!this.worldMapManager.isLoaded()) { + return null; } else { - HashMap var1 = this.worldMapManager.buildIcons(); // L: 822 - this.field4356 = new LinkedList(); // L: 823 - Iterator var2 = var1.values().iterator(); // L: 824 + HashMap var1 = this.worldMapManager.buildIcons(); + this.field4356 = new LinkedList(); + Iterator var2 = var1.values().iterator(); while (var2.hasNext()) { - List var3 = (List)var2.next(); // L: 825 - this.field4356.addAll(var3); // L: 827 + List var3 = (List)var2.next(); + this.field4356.addAll(var3); } - this.iconIterator = this.field4356.iterator(); // L: 830 - return this.iconNext(); // L: 831 + this.iconIterator = this.field4356.iterator(); + return this.iconNext(); } } @@ -1424,19 +1424,19 @@ public class WorldMap { ) @Export("iconNext") public AbstractWorldMapIcon iconNext() { - if (this.iconIterator == null) { // L: 835 - return null; // L: 836 + if (this.iconIterator == null) { + return null; } else { AbstractWorldMapIcon var1; do { - if (!this.iconIterator.hasNext()) { // L: 838 - return null; // L: 844 + if (!this.iconIterator.hasNext()) { + return null; } - var1 = (AbstractWorldMapIcon)this.iconIterator.next(); // L: 839 - } while(var1.getElement() == -1); // L: 840 + var1 = (AbstractWorldMapIcon)this.iconIterator.next(); + } while(var1.getElement() == -1); - return var1; // L: 841 + return var1; } } } diff --git a/runescape-client/src/main/java/WorldMapArchiveLoader.java b/runescape-client/src/main/java/WorldMapArchiveLoader.java index be61270ce8..19ecf5d942 100644 --- a/runescape-client/src/main/java/WorldMapArchiveLoader.java +++ b/runescape-client/src/main/java/WorldMapArchiveLoader.java @@ -30,10 +30,10 @@ public class WorldMapArchiveLoader { descriptor = "(Lku;)V" ) WorldMapArchiveLoader(AbstractArchive var1) { - this.percentLoaded = 0; // L: 13 - this.loaded = false; // L: 14 - this.archive = var1; // L: 17 - } // L: 18 + this.percentLoaded = 0; + this.loaded = false; + this.archive = var1; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -42,15 +42,15 @@ public class WorldMapArchiveLoader { ) @Export("reset") void reset(String var1) { - if (var1 != null && !var1.isEmpty()) { // L: 21 - if (var1 != this.cacheName) { // L: 24 - this.cacheName = var1; // L: 27 - this.percentLoaded = 0; // L: 28 - this.loaded = false; // L: 29 - this.load(); // L: 30 + if (var1 != null && !var1.isEmpty()) { + if (var1 != this.cacheName) { + this.cacheName = var1; + this.percentLoaded = 0; + this.loaded = false; + this.load(); } } - } // L: 22 25 31 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -59,32 +59,32 @@ public class WorldMapArchiveLoader { ) @Export("load") int load() { - if (this.percentLoaded < 33) { // L: 34 - if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field2763.name, this.cacheName)) { // L: 35 - return this.percentLoaded; // L: 36 + if (this.percentLoaded < 33) { + if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field2763.name, this.cacheName)) { + return this.percentLoaded; } - this.percentLoaded = 33; // L: 38 + this.percentLoaded = 33; } - if (this.percentLoaded == 33) { // L: 40 - if (this.archive.isValidFileName(WorldMapCacheName.field2764.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field2764.name, this.cacheName)) { // L: 41 42 - return this.percentLoaded; // L: 43 + if (this.percentLoaded == 33) { + if (this.archive.isValidFileName(WorldMapCacheName.field2764.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field2764.name, this.cacheName)) { + return this.percentLoaded; } - this.percentLoaded = 66; // L: 46 + this.percentLoaded = 66; } - if (this.percentLoaded == 66) { // L: 48 - if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field2766.name)) { // L: 49 - return this.percentLoaded; // L: 50 + if (this.percentLoaded == 66) { + if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field2766.name)) { + return this.percentLoaded; } - this.percentLoaded = 100; // L: 52 - this.loaded = true; // L: 53 + this.percentLoaded = 100; + this.loaded = true; } - return this.percentLoaded; // L: 55 + return this.percentLoaded; } @ObfuscatedName("p") @@ -94,7 +94,7 @@ public class WorldMapArchiveLoader { ) @Export("isLoaded") boolean isLoaded() { - return this.loaded; // L: 59 + return this.loaded; } @ObfuscatedName("m") @@ -104,6 +104,6 @@ public class WorldMapArchiveLoader { ) @Export("getPercentLoaded") int getPercentLoaded() { - return this.percentLoaded; // L: 63 + return this.percentLoaded; } } diff --git a/runescape-client/src/main/java/WorldMapArea.java b/runescape-client/src/main/java/WorldMapArea.java index 97febb3b97..41f05c3be9 100644 --- a/runescape-client/src/main/java/WorldMapArea.java +++ b/runescape-client/src/main/java/WorldMapArea.java @@ -77,15 +77,15 @@ public class WorldMapArea { LinkedList sections; public WorldMapArea() { - this.id = -1; // L: 9 - this.backGroundColor = -1; // L: 12 - this.zoom = -1; // L: 13 - this.origin = null; // L: 14 - this.regionLowX = Integer.MAX_VALUE; // L: 15 - this.regionHighX = 0; // L: 16 - this.regionLowY = Integer.MAX_VALUE; // L: 17 - this.regionHighY = 0; // L: 18 - this.isMain = false; // L: 19 + this.id = -1; + this.backGroundColor = -1; + this.zoom = -1; + this.origin = null; + this.regionLowX = Integer.MAX_VALUE; + this.regionHighX = 0; + this.regionLowY = Integer.MAX_VALUE; + this.regionHighY = 0; + this.isMain = false; } @ObfuscatedName("c") @@ -95,23 +95,23 @@ public class WorldMapArea { ) @Export("read") public void read(Buffer var1, int var2) { - this.id = var2; // L: 23 - this.internalName = var1.readStringCp1252NullTerminated(); // L: 24 - this.externalName = var1.readStringCp1252NullTerminated(); // L: 25 - this.origin = new Coord(var1.readInt()); // L: 26 - this.backGroundColor = var1.readInt(); // L: 27 - var1.readUnsignedByte(); // L: 28 - this.isMain = var1.readUnsignedByte() == 1; // L: 29 - this.zoom = var1.readUnsignedByte(); // L: 30 - int var3 = var1.readUnsignedByte(); // L: 31 - this.sections = new LinkedList(); // L: 32 + this.id = var2; + this.internalName = var1.readStringCp1252NullTerminated(); + this.externalName = var1.readStringCp1252NullTerminated(); + this.origin = new Coord(var1.readInt()); + this.backGroundColor = var1.readInt(); + var1.readUnsignedByte(); + this.isMain = var1.readUnsignedByte() == 1; + this.zoom = var1.readUnsignedByte(); + int var3 = var1.readUnsignedByte(); + this.sections = new LinkedList(); - for (int var4 = 0; var4 < var3; ++var4) { // L: 33 - this.sections.add(this.readWorldMapSection(var1)); // L: 34 + for (int var4 = 0; var4 < var3; ++var4) { + this.sections.add(this.readWorldMapSection(var1)); } - this.setBounds(); // L: 36 - } // L: 37 + this.setBounds(); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -120,28 +120,28 @@ public class WorldMapArea { ) @Export("readWorldMapSection") WorldMapSection readWorldMapSection(Buffer var1) { - int var2 = var1.readUnsignedByte(); // L: 40 - WorldMapSectionType var3 = (WorldMapSectionType)class130.findEnumerated(WorldMapSectionType.method4754(), var2); // L: 41 - Object var4 = null; // L: 42 - switch(var3.type) { // L: 43 + int var2 = var1.readUnsignedByte(); + WorldMapSectionType var3 = (WorldMapSectionType)class130.findEnumerated(WorldMapSectionType.method4754(), var2); + Object var4 = null; + switch(var3.type) { case 0: - var4 = new WorldMapSection1(); // L: 51 - break; // L: 52 + var4 = new WorldMapSection1(); + break; case 1: - var4 = new WorldMapSection2(); // L: 48 - break; // L: 49 + var4 = new WorldMapSection2(); + break; case 2: - var4 = new class221(); // L: 45 + var4 = new class221(); break; case 3: - var4 = new WorldMapSection0(); // L: 54 - break; // L: 55 + var4 = new WorldMapSection0(); + break; default: - throw new IllegalStateException(""); // L: 57 + throw new IllegalStateException(""); } - ((WorldMapSection)var4).read(var1); // L: 59 - return (WorldMapSection)var4; // L: 60 + ((WorldMapSection)var4).read(var1); + return (WorldMapSection)var4; } @ObfuscatedName("p") @@ -151,18 +151,18 @@ public class WorldMapArea { ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - Iterator var4 = this.sections.iterator(); // L: 64 + Iterator var4 = this.sections.iterator(); WorldMapSection var5; do { if (!var4.hasNext()) { - return false; // L: 72 + return false; } - var5 = (WorldMapSection)var4.next(); // L: 65 - } while(!var5.containsCoord(var1, var2, var3)); // L: 67 + var5 = (WorldMapSection)var4.next(); + } while(!var5.containsCoord(var1, var2, var3)); - return true; // L: 68 + return true; } @ObfuscatedName("m") @@ -172,22 +172,22 @@ public class WorldMapArea { ) @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; + int var4 = var2 / 64; + if (var3 >= this.regionLowX && var3 <= this.regionHighX) { + if (var4 >= this.regionLowY && var4 <= this.regionHighY) { + Iterator var5 = this.sections.iterator(); WorldMapSection var6; do { if (!var5.hasNext()) { - return false; // L: 88 + return false; } - var6 = (WorldMapSection)var5.next(); // L: 81 - } while(!var6.containsPosition(var1, var2)); // L: 83 + var6 = (WorldMapSection)var5.next(); + } while(!var6.containsPosition(var1, var2)); - return true; // L: 84 + return true; } else { return false; } @@ -203,18 +203,18 @@ public class WorldMapArea { ) @Export("position") public int[] position(int var1, int var2, int var3) { - Iterator var4 = this.sections.iterator(); // L: 92 + Iterator var4 = this.sections.iterator(); WorldMapSection var5; do { if (!var4.hasNext()) { - return null; // L: 100 + return null; } - var5 = (WorldMapSection)var4.next(); // L: 93 - } while(!var5.containsCoord(var1, var2, var3)); // L: 95 + var5 = (WorldMapSection)var4.next(); + } while(!var5.containsCoord(var1, var2, var3)); - return var5.getBorderTileLengths(var1, var2, var3); // L: 96 + return var5.getBorderTileLengths(var1, var2, var3); } @ObfuscatedName("s") @@ -224,18 +224,18 @@ public class WorldMapArea { ) @Export("coord") public Coord coord(int var1, int var2) { - Iterator var3 = this.sections.iterator(); // L: 104 + Iterator var3 = this.sections.iterator(); WorldMapSection var4; do { if (!var3.hasNext()) { - return null; // L: 112 + return null; } - var4 = (WorldMapSection)var3.next(); // L: 105 - } while(!var4.containsPosition(var1, var2)); // L: 107 + var4 = (WorldMapSection)var3.next(); + } while(!var4.containsPosition(var1, var2)); - return var4.coord(var1, var2); // L: 108 + return var4.coord(var1, var2); } @ObfuscatedName("j") @@ -245,14 +245,14 @@ public class WorldMapArea { ) @Export("setBounds") void setBounds() { - Iterator var1 = this.sections.iterator(); // L: 116 + Iterator var1 = this.sections.iterator(); while (var1.hasNext()) { - WorldMapSection var2 = (WorldMapSection)var1.next(); // L: 117 - var2.expandBounds(this); // L: 119 + WorldMapSection var2 = (WorldMapSection)var1.next(); + var2.expandBounds(this); } - } // L: 122 + } @ObfuscatedName("w") @ObfuscatedSignature( @@ -261,7 +261,7 @@ public class WorldMapArea { ) @Export("getId") public int getId() { - return this.id; // L: 125 + return this.id; } @ObfuscatedName("n") @@ -271,7 +271,7 @@ public class WorldMapArea { ) @Export("getIsMain") public boolean getIsMain() { - return this.isMain; // L: 129 + return this.isMain; } @ObfuscatedName("r") @@ -281,7 +281,7 @@ public class WorldMapArea { ) @Export("getInternalName") public String getInternalName() { - return this.internalName; // L: 133 + return this.internalName; } @ObfuscatedName("o") @@ -291,7 +291,7 @@ public class WorldMapArea { ) @Export("getExternalName") public String getExternalName() { - return this.externalName; // L: 137 + return this.externalName; } @ObfuscatedName("v") @@ -301,7 +301,7 @@ public class WorldMapArea { ) @Export("getBackGroundColor") int getBackGroundColor() { - return this.backGroundColor; // L: 141 + return this.backGroundColor; } @ObfuscatedName("d") @@ -331,7 +331,7 @@ public class WorldMapArea { ) @Export("getRegionHighX") public int getRegionHighX() { - return this.regionHighX; // L: 153 + return this.regionHighX; } @ObfuscatedName("e") @@ -341,7 +341,7 @@ public class WorldMapArea { ) @Export("getRegionLowY") public int getRegionLowY() { - return this.regionLowY; // L: 157 + return this.regionLowY; } @ObfuscatedName("a") @@ -351,7 +351,7 @@ public class WorldMapArea { ) @Export("getRegionHighY") public int getRegionHighY() { - return this.regionHighY; // L: 161 + return this.regionHighY; } @ObfuscatedName("u") @@ -361,7 +361,7 @@ public class WorldMapArea { ) @Export("getOriginX") public int getOriginX() { - return this.origin.x; // L: 165 + return this.origin.x; } @ObfuscatedName("k") @@ -371,7 +371,7 @@ public class WorldMapArea { ) @Export("getOriginPlane") public int getOriginPlane() { - return this.origin.plane; // L: 169 + return this.origin.plane; } @ObfuscatedName("f") @@ -381,7 +381,7 @@ public class WorldMapArea { ) @Export("getOriginY") public int getOriginY() { - return this.origin.y; // L: 173 + return this.origin.y; } @ObfuscatedName("l") @@ -391,7 +391,7 @@ public class WorldMapArea { ) @Export("getOrigin") public Coord getOrigin() { - return new Coord(this.origin); // L: 177 + return new Coord(this.origin); } @ObfuscatedName("c") @@ -400,27 +400,27 @@ public class WorldMapArea { garbageValue = "0" ) static int method4490(AbstractArchive var0, AbstractArchive var1) { - int var2 = 0; // L: 143 - String[] var3 = Login.field892; // L: 145 + int var2 = 0; + String[] var3 = Login.field892; int var4; String var5; - for (var4 = 0; var4 < var3.length; ++var4) { // L: 146 - var5 = var3[var4]; // L: 147 - if (var0.tryLoadFileByNames(var5, "")) { // L: 149 + for (var4 = 0; var4 < var3.length; ++var4) { + var5 = var3[var4]; + if (var0.tryLoadFileByNames(var5, "")) { ++var2; } } - var3 = Login.field893; // L: 154 + var3 = Login.field893; - for (var4 = 0; var4 < var3.length; ++var4) { // L: 155 - var5 = var3[var4]; // L: 156 - if (var1.tryLoadFileByNames(var5, "")) { // L: 158 + for (var4 = 0; var4 < var3.length; ++var4) { + var5 = var3[var4]; + if (var1.tryLoadFileByNames(var5, "")) { ++var2; } } - return var2; // L: 162 + return var2; } } diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index 07d1b95ac4..a45c2eaa33 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -22,7 +22,7 @@ public class WorldMapAreaData extends WorldMapArea { List iconList; WorldMapAreaData() { - } // L: 14 + } @ObfuscatedName("bo") @ObfuscatedSignature( @@ -32,39 +32,39 @@ public class WorldMapAreaData extends WorldMapArea { @Export("init") void init(Buffer var1, Buffer var2, int var3, boolean var4) { this.read(var1, var3); - int var5 = var2.readUnsignedShort(); // L: 18 - this.worldMapData0Set = new HashSet(var5); // L: 19 + int var5 = var2.readUnsignedShort(); + this.worldMapData0Set = new HashSet(var5); int var6; - for (var6 = 0; var6 < var5; ++var6) { // L: 20 - WorldMapData_0 var7 = new WorldMapData_0(); // L: 21 + for (var6 = 0; var6 < var5; ++var6) { + WorldMapData_0 var7 = new WorldMapData_0(); try { - var7.init(var2); // L: 23 - } catch (IllegalStateException var12) { // L: 25 - continue; // L: 26 + var7.init(var2); + } catch (IllegalStateException var12) { + continue; } - this.worldMapData0Set.add(var7); // L: 28 + this.worldMapData0Set.add(var7); } - var6 = var2.readUnsignedShort(); // L: 30 - this.worldMapData1Set = new HashSet(var6); // L: 31 + var6 = var2.readUnsignedShort(); + this.worldMapData1Set = new HashSet(var6); - for (int var10 = 0; var10 < var6; ++var10) { // L: 32 - WorldMapData_1 var8 = new WorldMapData_1(); // L: 33 + for (int var10 = 0; var10 < var6; ++var10) { + WorldMapData_1 var8 = new WorldMapData_1(); try { - var8.init(var2); // L: 35 - } catch (IllegalStateException var11) { // L: 37 - continue; // L: 38 + var8.init(var2); + } catch (IllegalStateException var11) { + continue; } - this.worldMapData1Set.add(var8); // L: 40 + this.worldMapData1Set.add(var8); } - this.initIconsList(var2, var4); // L: 42 - } // L: 43 + this.initIconsList(var2, var4); + } @ObfuscatedName("bf") @ObfuscatedSignature( @@ -73,19 +73,19 @@ public class WorldMapAreaData extends WorldMapArea { ) @Export("initIconsList") void initIconsList(Buffer var1, boolean var2) { - this.iconList = new LinkedList(); // L: 46 - int var3 = var1.readUnsignedShort(); // L: 47 + this.iconList = new LinkedList(); + int var3 = var1.readUnsignedShort(); - for (int var4 = 0; var4 < var3; ++var4) { // L: 48 - int var5 = var1.method7400(); // L: 49 - Coord var6 = new Coord(var1.readInt()); // L: 50 - boolean var7 = var1.readUnsignedByte() == 1; // L: 51 - if (var2 || !var7) { // L: 52 - this.iconList.add(new WorldMapIcon_0((Coord)null, var6, var5, (WorldMapLabel)null)); // L: 53 + for (int var4 = 0; var4 < var3; ++var4) { + int var5 = var1.method7400(); + Coord var6 = new Coord(var1.readInt()); + boolean var7 = var1.readUnsignedByte() == 1; + if (var2 || !var7) { + this.iconList.add(new WorldMapIcon_0((Coord)null, var6, var5, (WorldMapLabel)null)); } } - } // L: 56 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -93,6 +93,6 @@ public class WorldMapAreaData extends WorldMapArea { garbageValue = "1226375978" ) public static StudioGame[] method4894() { - return new StudioGame[]{StudioGame.oldscape, StudioGame.stellardawn, StudioGame.game4, StudioGame.game5, StudioGame.runescape, StudioGame.game3}; // L: 17 + return new StudioGame[]{StudioGame.oldscape, StudioGame.stellardawn, StudioGame.game4, StudioGame.game5, StudioGame.runescape, StudioGame.game3}; } } diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java index fb5b0f2fc3..f0903e2b6a 100644 --- a/runescape-client/src/main/java/WorldMapCacheName.java +++ b/runescape-client/src/main/java/WorldMapCacheName.java @@ -42,15 +42,15 @@ public class WorldMapCacheName { public final String name; static { - field2768 = new WorldMapCacheName("details"); // L: 4 - field2763 = new WorldMapCacheName("compositemap"); // L: 5 - field2764 = new WorldMapCacheName("compositetexture"); // L: 6 - field2765 = new WorldMapCacheName("area"); // L: 7 - field2766 = new WorldMapCacheName("labels"); // L: 8 + field2768 = new WorldMapCacheName("details"); + field2763 = new WorldMapCacheName("compositemap"); + field2764 = new WorldMapCacheName("compositetexture"); + field2765 = new WorldMapCacheName("area"); + field2766 = new WorldMapCacheName("labels"); } WorldMapCacheName(String var1) { - this.name = var1; // L: 12 + this.name = var1; } @ObfuscatedName("c") @@ -60,19 +60,19 @@ public class WorldMapCacheName { ) public static int method4865(int var0, int var1) { int var2; - if (var1 > var0) { // L: 24 - var2 = var0; // L: 25 - var0 = var1; // L: 26 - var1 = var2; // L: 27 + if (var1 > var0) { + var2 = var0; + var0 = var1; + var1 = var2; } - while (var1 != 0) { // L: 29 - var2 = var0 % var1; // L: 30 - var0 = var1; // L: 31 - var1 = var2; // L: 32 + while (var1 != 0) { + var2 = var0 % var1; + var0 = var1; + var1 = var2; } - return var0; // L: 34 + return var0; } @ObfuscatedName("b") @@ -81,6 +81,6 @@ public class WorldMapCacheName { garbageValue = "985293867" ) public static boolean method4864(int var0, int var1) { - return (var0 >> var1 + 1 & 1) != 0; // L: 13 + return (var0 >> var1 + 1 & 1) != 0; } } diff --git a/runescape-client/src/main/java/WorldMapData_0.java b/runescape-client/src/main/java/WorldMapData_0.java index e109707383..ea90880a89 100644 --- a/runescape-client/src/main/java/WorldMapData_0.java +++ b/runescape-client/src/main/java/WorldMapData_0.java @@ -7,7 +7,7 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("WorldMapData_0") public class WorldMapData_0 extends AbstractWorldMapData { WorldMapData_0() { - } // L: 6 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -16,17 +16,17 @@ public class WorldMapData_0 extends AbstractWorldMapData { ) @Export("init") void init(Buffer var1) { - int var2 = var1.readUnsignedByte(); // L: 9 - if (var2 != WorldMapID.field2739.value) { // L: 10 - throw new IllegalStateException(""); // L: 11 + int var2 = var1.readUnsignedByte(); + if (var2 != WorldMapID.field2739.value) { + throw new IllegalStateException(""); } else { - super.minPlane = var1.readUnsignedByte(); // L: 13 - super.planes = var1.readUnsignedByte(); // L: 14 - super.regionXLow = var1.readUnsignedShort(); // L: 15 - super.regionYLow = var1.readUnsignedShort(); // L: 16 - super.regionX = var1.readUnsignedShort(); // L: 17 - super.regionY = var1.readUnsignedShort(); // L: 18 - super.groupId = var1.method7400(); // L: 19 + super.minPlane = var1.readUnsignedByte(); + super.planes = var1.readUnsignedByte(); + super.regionXLow = var1.readUnsignedShort(); + super.regionYLow = var1.readUnsignedShort(); + super.regionX = var1.readUnsignedShort(); + super.regionY = var1.readUnsignedShort(); + super.groupId = var1.method7400(); super.fileId = var1.method7400(); } } @@ -38,41 +38,41 @@ public class WorldMapData_0 extends AbstractWorldMapData { ) @Export("readGeography") void readGeography(Buffer var1) { - 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.planes = Math.min(super.planes, 4); + super.floorUnderlayIds = new short[1][64][64]; + super.floorOverlayIds = new short[super.planes][64][64]; super.field2699 = new byte[super.planes][64][64]; - super.field2706 = 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 != class231.field2736.value) { // L: 32 - throw new IllegalStateException(""); // L: 33 + super.field2706 = new byte[super.planes][64][64]; + super.decorations = new WorldMapDecoration[super.planes][64][64][]; + int var2 = var1.readUnsignedByte(); + if (var2 != class231.field2736.value) { + throw new IllegalStateException(""); } else { - 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 + int var3 = var1.readUnsignedByte(); + int var4 = var1.readUnsignedByte(); + if (var3 == super.regionX && var4 == super.regionY) { + for (int var5 = 0; var5 < 64; ++var5) { + for (int var6 = 0; var6 < 64; ++var6) { + this.readTile(var5, var6, var1); } } } else { - throw new IllegalStateException(""); // L: 38 + throw new IllegalStateException(""); } } - } // L: 45 + } public int hashCode() { - return super.regionX | super.regionY << 8; // L: 58 + return super.regionX | super.regionY << 8; } public boolean equals(Object var1) { - if (!(var1 instanceof WorldMapData_0)) { // L: 49 - return false; // L: 50 + if (!(var1 instanceof WorldMapData_0)) { + return false; } else { - WorldMapData_0 var2 = (WorldMapData_0)var1; // L: 52 - return var2.regionX == super.regionX && super.regionY == var2.regionY; // L: 53 + WorldMapData_0 var2 = (WorldMapData_0)var1; + return var2.regionX == super.regionX && super.regionY == var2.regionY; } } @@ -82,15 +82,15 @@ public class WorldMapData_0 extends AbstractWorldMapData { garbageValue = "-1557280299" ) public static PrivateChatMode method4353(int var0) { - PrivateChatMode[] var1 = FloorUnderlayDefinition.method3381(); // L: 20 + PrivateChatMode[] var1 = FloorUnderlayDefinition.method3381(); - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 21 - PrivateChatMode var3 = var1[var2]; // L: 22 + for (int var2 = 0; var2 < var1.length; ++var2) { + PrivateChatMode var3 = var1[var2]; if (var0 == var3.field4597) { - return var3; // L: 24 + return var3; } } - return null; // L: 28 + return null; } } diff --git a/runescape-client/src/main/java/WorldMapData_1.java b/runescape-client/src/main/java/WorldMapData_1.java index ec73c333fd..3ac4dfd02d 100644 --- a/runescape-client/src/main/java/WorldMapData_1.java +++ b/runescape-client/src/main/java/WorldMapData_1.java @@ -44,7 +44,7 @@ public class WorldMapData_1 extends AbstractWorldMapData { int chunkY; WorldMapData_1() { - } // L: 11 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -53,24 +53,24 @@ public class WorldMapData_1 extends AbstractWorldMapData { ) @Export("init") void init(Buffer var1) { - int var2 = var1.readUnsignedByte(); // L: 14 - if (var2 != WorldMapID.field2741.value) { // L: 15 - throw new IllegalStateException(""); // L: 16 + int var2 = var1.readUnsignedByte(); + if (var2 != WorldMapID.field2741.value) { + throw new IllegalStateException(""); } else { - super.minPlane = var1.readUnsignedByte(); // L: 18 - super.planes = var1.readUnsignedByte(); // L: 19 - super.regionXLow = var1.readUnsignedShort(); // L: 20 - super.regionYLow = var1.readUnsignedShort(); // L: 21 - this.chunkXLow = var1.readUnsignedByte(); // L: 22 - this.chunkYLow = var1.readUnsignedByte(); // L: 23 - super.regionX = var1.readUnsignedShort(); // L: 24 - super.regionY = var1.readUnsignedShort(); // L: 25 - this.chunkX = var1.readUnsignedByte(); // L: 26 - this.chunkY = var1.readUnsignedByte(); // L: 27 - super.groupId = var1.method7400(); // L: 28 - super.fileId = var1.method7400(); // L: 29 + super.minPlane = var1.readUnsignedByte(); + super.planes = var1.readUnsignedByte(); + super.regionXLow = var1.readUnsignedShort(); + super.regionYLow = var1.readUnsignedShort(); + this.chunkXLow = var1.readUnsignedByte(); + this.chunkYLow = var1.readUnsignedByte(); + super.regionX = var1.readUnsignedShort(); + super.regionY = var1.readUnsignedShort(); + this.chunkX = var1.readUnsignedByte(); + this.chunkY = var1.readUnsignedByte(); + super.groupId = var1.method7400(); + super.fileId = var1.method7400(); } - } // L: 30 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -79,32 +79,32 @@ public class WorldMapData_1 extends AbstractWorldMapData { ) @Export("readGeography") void readGeography(Buffer var1) { - 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.field2699 = new byte[super.planes][64][64]; // L: 37 - super.field2706 = 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 != class231.field2735.value) { // L: 41 - throw new IllegalStateException(""); // L: 42 + super.planes = Math.min(super.planes, 4); + super.floorUnderlayIds = new short[1][64][64]; + super.floorOverlayIds = new short[super.planes][64][64]; + super.field2699 = new byte[super.planes][64][64]; + super.field2706 = new byte[super.planes][64][64]; + super.decorations = new WorldMapDecoration[super.planes][64][64][]; + int var2 = var1.readUnsignedByte(); + if (var2 != class231.field2735.value) { + throw new IllegalStateException(""); } else { - 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 + int var3 = var1.readUnsignedByte(); + int var4 = var1.readUnsignedByte(); + int var5 = var1.readUnsignedByte(); + int var6 = var1.readUnsignedByte(); + if (var3 == super.regionX && var4 == super.regionY && var5 == this.chunkX && var6 == this.chunkY) { + for (int var7 = 0; var7 < 8; ++var7) { + for (int var8 = 0; var8 < 8; ++var8) { + this.readTile(var7 + this.chunkX * 8, var8 + this.chunkY * 8, var1); } } } else { - throw new IllegalStateException(""); // L: 49 + throw new IllegalStateException(""); } } - } // L: 56 + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -113,7 +113,7 @@ public class WorldMapData_1 extends AbstractWorldMapData { ) @Export("getChunkXLow") int getChunkXLow() { - return this.chunkXLow; // L: 76 + return this.chunkXLow; } @ObfuscatedName("m") @@ -123,7 +123,7 @@ public class WorldMapData_1 extends AbstractWorldMapData { ) @Export("getChunkYLow") int getChunkYLow() { - return this.chunkYLow; // L: 80 + return this.chunkYLow; } @ObfuscatedName("j") @@ -133,7 +133,7 @@ public class WorldMapData_1 extends AbstractWorldMapData { ) @Export("getChunkX") int getChunkX() { - return this.chunkX; // L: 84 + return this.chunkX; } @ObfuscatedName("w") @@ -143,23 +143,23 @@ public class WorldMapData_1 extends AbstractWorldMapData { ) @Export("getChunkY") int getChunkY() { - return this.chunkY; // L: 88 + return this.chunkY; } public boolean equals(Object var1) { - if (!(var1 instanceof WorldMapData_1)) { // L: 60 - return false; // L: 61 + if (!(var1 instanceof WorldMapData_1)) { + return false; } else { - WorldMapData_1 var2 = (WorldMapData_1)var1; // L: 63 - if (var2.regionX == super.regionX && super.regionY == var2.regionY) { // L: 64 - return var2.chunkX == this.chunkX && this.chunkY == var2.chunkY; // L: 67 + WorldMapData_1 var2 = (WorldMapData_1)var1; + if (var2.regionX == super.regionX && super.regionY == var2.regionY) { + return var2.chunkX == this.chunkX && this.chunkY == var2.chunkY; } else { - return false; // L: 65 + return false; } } } public int hashCode() { - return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; // L: 72 + return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; } } diff --git a/runescape-client/src/main/java/WorldMapDecoration.java b/runescape-client/src/main/java/WorldMapDecoration.java index ccbc01f88e..a348402d02 100644 --- a/runescape-client/src/main/java/WorldMapDecoration.java +++ b/runescape-client/src/main/java/WorldMapDecoration.java @@ -32,10 +32,10 @@ public class WorldMapDecoration { final int rotation; WorldMapDecoration(int var1, int var2, int var3) { - this.objectDefinitionId = var1; // L: 9 - this.decoration = var2; // L: 10 - this.rotation = var3; // L: 11 - } // L: 12 + this.objectDefinitionId = var1; + this.decoration = var2; + this.rotation = var3; + } @ObfuscatedName("gc") @ObfuscatedSignature( @@ -44,88 +44,88 @@ public class WorldMapDecoration { ) @Export("setViewportShape") static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { - if (var2 < 1) { // L: 5366 + if (var2 < 1) { var2 = 1; } - if (var3 < 1) { // L: 5367 + if (var3 < 1) { var3 = 1; } - int var5 = var3 - 334; // L: 5368 + int var5 = var3 - 334; int var6; - if (var5 < 0) { // L: 5370 + if (var5 < 0) { var6 = Client.field690; - } else if (var5 >= 100) { // L: 5371 + } else if (var5 >= 100) { var6 = Client.field707; } else { - var6 = (Client.field707 - Client.field690) * var5 / 100 + Client.field690; // L: 5372 + var6 = (Client.field707 - Client.field690) * var5 / 100 + Client.field690; } - int var7 = var3 * var6 * 512 / (var2 * 334); // L: 5373 + int var7 = var3 * var6 * 512 / (var2 * 334); int var8; int var9; short var17; - if (var7 < Client.field736) { // L: 5374 - var17 = Client.field736; // L: 5375 - var6 = var17 * var2 * 334 / (var3 * 512); // L: 5376 - if (var6 > Client.field735) { // L: 5377 - var6 = Client.field735; // L: 5378 - var8 = var3 * var6 * 512 / (var17 * 334); // L: 5379 - var9 = (var2 - var8) / 2; // L: 5380 - if (var4) { // L: 5381 - Rasterizer2D.Rasterizer2D_resetClip(); // L: 5382 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); // L: 5383 - Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); // L: 5384 + if (var7 < Client.field736) { + var17 = Client.field736; + var6 = var17 * var2 * 334 / (var3 * 512); + if (var6 > Client.field735) { + var6 = Client.field735; + var8 = var3 * var6 * 512 / (var17 * 334); + var9 = (var2 - var8) / 2; + if (var4) { + Rasterizer2D.Rasterizer2D_resetClip(); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); + Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); } - var0 += var9; // L: 5386 - var2 -= var9 * 2; // L: 5387 + var0 += var9; + var2 -= var9 * 2; } - } else if (var7 > Client.field737) { // L: 5390 - var17 = Client.field737; // L: 5391 - var6 = var17 * var2 * 334 / (var3 * 512); // L: 5392 - if (var6 < Client.field619) { // L: 5393 - var6 = Client.field619; // L: 5394 - var8 = var17 * var2 * 334 / (var6 * 512); // L: 5395 - var9 = (var3 - var8) / 2; // L: 5396 - if (var4) { // L: 5397 - Rasterizer2D.Rasterizer2D_resetClip(); // L: 5398 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); // L: 5399 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); // L: 5400 + } else if (var7 > Client.field737) { + var17 = Client.field737; + var6 = var17 * var2 * 334 / (var3 * 512); + if (var6 < Client.field619) { + var6 = Client.field619; + var8 = var17 * var2 * 334 / (var6 * 512); + var9 = (var3 - var8) / 2; + if (var4) { + Rasterizer2D.Rasterizer2D_resetClip(); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); } - var1 += var9; // L: 5402 - var3 -= var9 * 2; // L: 5403 + var1 += var9; + var3 -= var9 * 2; } } - Client.viewportZoom = var3 * var6 / 334; // L: 5406 - if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { // L: 5407 - int[] var16 = new int[9]; // L: 5409 + Client.viewportZoom = var3 * var6 / 334; + if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { + int[] var16 = new int[9]; - for (var9 = 0; var9 < var16.length; ++var9) { // L: 5410 - int var10 = var9 * 32 + 15 + 128; // L: 5411 - int var11 = class142.method2958(var10); // L: 5412 - int var12 = Rasterizer3D.Rasterizer3D_sine[var10]; // L: 5413 - int var14 = var3 - 334; // L: 5416 - if (var14 < 0) { // L: 5417 + for (var9 = 0; var9 < var16.length; ++var9) { + int var10 = var9 * 32 + 15 + 128; + int var11 = class142.method2958(var10); + int var12 = Rasterizer3D.Rasterizer3D_sine[var10]; + int var14 = var3 - 334; + if (var14 < 0) { var14 = 0; - } else if (var14 > 100) { // L: 5418 + } else if (var14 > 100) { var14 = 100; } - int var15 = (Client.zoomWidth - Client.zoomHeight) * var14 / 100 + Client.zoomHeight; // L: 5419 - int var13 = var15 * var11 / 256; // L: 5420 - var16[var9] = var13 * var12 >> 16; // L: 5423 + int var15 = (Client.zoomWidth - Client.zoomHeight) * var14 / 100 + Client.zoomHeight; + int var13 = var15 * var11 / 256; + var16[var9] = var13 * var12 >> 16; } - Scene.Scene_buildVisiblityMap(var16, 500, 800, var2 * 334 / var3, 334); // L: 5425 + Scene.Scene_buildVisiblityMap(var16, 500, 800, var2 * 334 / var3, 334); } - Client.viewportOffsetX = var0; // L: 5428 - Client.viewportOffsetY = var1; // L: 5429 - Client.viewportWidth = var2; // L: 5430 - Client.viewportHeight = var3; // L: 5431 - } // L: 5432 + Client.viewportOffsetX = var0; + Client.viewportOffsetY = var1; + Client.viewportWidth = var2; + Client.viewportHeight = var3; + } } diff --git a/runescape-client/src/main/java/WorldMapDecorationType.java b/runescape-client/src/main/java/WorldMapDecorationType.java index 2a469a0c8a..25a4788f28 100644 --- a/runescape-client/src/main/java/WorldMapDecorationType.java +++ b/runescape-client/src/main/java/WorldMapDecorationType.java @@ -141,8 +141,8 @@ public enum WorldMapDecorationType implements MouseWheel { garbageValue = "0" ) WorldMapDecorationType(int var3, int var4) { - this.id = var3; // L: 34 - } // L: 35 + this.id = var3; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -151,6 +151,6 @@ public enum WorldMapDecorationType implements MouseWheel { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 39 + return this.id; } } diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index 54f5e962bc..b3b3a307bb 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -113,25 +113,25 @@ public class WorldMapElement extends DualNode { public int category; static { - PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(256); // L: 16 + PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(256); } public WorldMapElement(int var1) { - this.sprite1 = -1; // L: 18 - this.sprite2 = -1; // L: 19 - this.textSize = 0; // L: 22 - this.field1758 = true; // L: 24 - this.field1759 = false; // L: 25 - this.menuActions = new String[5]; // L: 26 - this.field1770 = Integer.MAX_VALUE; // L: 29 - this.field1764 = Integer.MAX_VALUE; // L: 30 - this.field1763 = Integer.MIN_VALUE; // L: 31 - this.field1766 = Integer.MIN_VALUE; // L: 32 - this.horizontalAlignment = HorizontalAlignment.HorizontalAlignment_centered; // L: 33 - this.verticalAlignment = VerticalAlignment.VerticalAlignment_centered; // L: 34 - this.category = -1; // L: 37 - this.objectId = var1; // L: 40 - } // L: 41 + this.sprite1 = -1; + this.sprite2 = -1; + this.textSize = 0; + this.field1758 = true; + this.field1759 = false; + this.menuActions = new String[5]; + this.field1770 = Integer.MAX_VALUE; + this.field1764 = Integer.MAX_VALUE; + this.field1763 = Integer.MIN_VALUE; + this.field1766 = Integer.MIN_VALUE; + this.horizontalAlignment = HorizontalAlignment.HorizontalAlignment_centered; + this.verticalAlignment = VerticalAlignment.VerticalAlignment_centered; + this.category = -1; + this.objectId = var1; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -141,12 +141,12 @@ public class WorldMapElement extends DualNode { @Export("decode") public void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 52 - if (var2 == 0) { // L: 53 - return; // L: 56 + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; } - this.decodeNext(var1, var2); // L: 54 + this.decodeNext(var1, var2); } } @@ -157,87 +157,87 @@ public class WorldMapElement extends DualNode { ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 59 + if (var2 == 1) { this.sprite1 = var1.method7400(); - } else if (var2 == 2) { // L: 60 + } else if (var2 == 2) { this.sprite2 = var1.method7400(); - } else if (var2 == 3) { // L: 61 + } else if (var2 == 3) { this.name = var1.readStringCp1252NullTerminated(); - } else if (var2 == 4) { // L: 62 + } else if (var2 == 4) { this.field1756 = var1.readMedium(); - } else if (var2 == 5) { // L: 63 - var1.readMedium(); // L: 64 - } else if (var2 == 6) { // L: 66 + } else if (var2 == 5) { + var1.readMedium(); + } else if (var2 == 6) { this.textSize = var1.readUnsignedByte(); } else { int var3; - if (var2 == 7) { // L: 67 - var3 = var1.readUnsignedByte(); // L: 68 - if ((var3 & 1) == 0) { // L: 69 + if (var2 == 7) { + var3 = var1.readUnsignedByte(); + if ((var3 & 1) == 0) { this.field1758 = false; } - if ((var3 & 2) == 2) { // L: 70 + if ((var3 & 2) == 2) { this.field1759 = true; } - } else if (var2 == 8) { // L: 72 - var1.readUnsignedByte(); // L: 73 - } else if (var2 >= 10 && var2 <= 14) { // L: 75 + } else if (var2 == 8) { + var1.readUnsignedByte(); + } else if (var2 >= 10 && var2 <= 14) { this.menuActions[var2 - 10] = var1.readStringCp1252NullTerminated(); - } else if (var2 == 15) { // L: 76 - var3 = var1.readUnsignedByte(); // L: 77 - this.field1762 = new int[var3 * 2]; // L: 78 + } else if (var2 == 15) { + var3 = var1.readUnsignedByte(); + this.field1762 = new int[var3 * 2]; int var4; - for (var4 = 0; var4 < var3 * 2; ++var4) { // L: 79 + for (var4 = 0; var4 < var3 * 2; ++var4) { this.field1762[var4] = var1.readShort(); } - var1.readInt(); // L: 80 - var4 = var1.readUnsignedByte(); // L: 81 - this.field1749 = new int[var4]; // L: 82 + var1.readInt(); + var4 = var1.readUnsignedByte(); + this.field1749 = new int[var4]; int var5; - for (var5 = 0; var5 < this.field1749.length; ++var5) { // L: 83 + for (var5 = 0; var5 < this.field1749.length; ++var5) { this.field1749[var5] = var1.readInt(); } - this.field1769 = new byte[var3]; // L: 84 + this.field1769 = new byte[var3]; - for (var5 = 0; var5 < var3; ++var5) { // L: 85 + for (var5 = 0; var5 < var3; ++var5) { this.field1769[var5] = var1.readByte(); } - } else if (var2 != 16) { // L: 87 - if (var2 == 17) { // L: 88 + } else if (var2 != 16) { + if (var2 == 17) { this.menuTargetName = var1.readStringCp1252NullTerminated(); - } else if (var2 == 18) { // L: 89 - var1.method7400(); // L: 90 - } else if (var2 == 19) { // L: 92 + } else if (var2 == 18) { + var1.method7400(); + } else if (var2 == 19) { this.category = var1.readUnsignedShort(); - } else if (var2 == 21) { // L: 93 - var1.readInt(); // L: 94 - } else if (var2 == 22) { // L: 96 - var1.readInt(); // L: 97 - } else if (var2 == 23) { // L: 99 - var1.readUnsignedByte(); // L: 100 - var1.readUnsignedByte(); // L: 101 - var1.readUnsignedByte(); // L: 102 - } else if (var2 == 24) { // L: 104 - var1.readShort(); // L: 105 - var1.readShort(); // L: 106 - } else if (var2 == 25) { // L: 108 - var1.method7400(); // L: 109 - } else if (var2 == 28) { // L: 111 - var1.readUnsignedByte(); // L: 112 - } else if (var2 == 29) { // L: 114 - this.horizontalAlignment = (HorizontalAlignment)class130.findEnumerated(class186.method3739(), var1.readUnsignedByte()); // L: 115 - } else if (var2 == 30) { // L: 117 - this.verticalAlignment = (VerticalAlignment)class130.findEnumerated(MouseHandler.method651(), var1.readUnsignedByte()); // L: 118 + } else if (var2 == 21) { + var1.readInt(); + } else if (var2 == 22) { + var1.readInt(); + } else if (var2 == 23) { + var1.readUnsignedByte(); + var1.readUnsignedByte(); + var1.readUnsignedByte(); + } else if (var2 == 24) { + var1.readShort(); + var1.readShort(); + } else if (var2 == 25) { + var1.method7400(); + } else if (var2 == 28) { + var1.readUnsignedByte(); + } else if (var2 == 29) { + this.horizontalAlignment = (HorizontalAlignment)class130.findEnumerated(class186.method3739(), var1.readUnsignedByte()); + } else if (var2 == 30) { + this.verticalAlignment = (VerticalAlignment)class130.findEnumerated(MouseHandler.method651(), var1.readUnsignedByte()); } } } - } // L: 121 + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -245,23 +245,23 @@ public class WorldMapElement extends DualNode { garbageValue = "2062943344" ) public void method3173() { - if (this.field1762 != null) { // L: 124 - for (int var1 = 0; var1 < this.field1762.length; var1 += 2) { // L: 125 - if (this.field1762[var1] < this.field1770) { // L: 126 + if (this.field1762 != null) { + for (int var1 = 0; var1 < this.field1762.length; var1 += 2) { + if (this.field1762[var1] < this.field1770) { this.field1770 = this.field1762[var1]; - } else if (this.field1762[var1] > this.field1763) { // L: 127 + } else if (this.field1762[var1] > this.field1763) { this.field1763 = this.field1762[var1]; } - if (this.field1762[var1 + 1] < this.field1764) { // L: 128 + if (this.field1762[var1 + 1] < this.field1764) { this.field1764 = this.field1762[var1 + 1]; } else if (this.field1762[var1 + 1] > this.field1766) { - this.field1766 = this.field1762[var1 + 1]; // L: 129 + this.field1766 = this.field1762[var1 + 1]; } } } - } // L: 132 + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -270,8 +270,8 @@ public class WorldMapElement extends DualNode { ) @Export("getSpriteBool") public SpritePixels getSpriteBool(boolean var1) { - int var2 = this.sprite1; // L: 135 - return this.getSprite(var2); // L: 136 + int var2 = this.sprite1; + return this.getSprite(var2); } @ObfuscatedName("s") @@ -281,19 +281,19 @@ public class WorldMapElement extends DualNode { ) @Export("getSprite") SpritePixels getSprite(int var1) { - if (var1 < 0) { // L: 140 + if (var1 < 0) { return null; } else { - SpritePixels var2 = (SpritePixels)PlayerAppearance_cachedModels.get((long)var1); // L: 141 - if (var2 != null) { // L: 142 + SpritePixels var2 = (SpritePixels)PlayerAppearance_cachedModels.get((long)var1); + if (var2 != null) { return var2; } else { - var2 = class6.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); // L: 143 - if (var2 != null) { // L: 144 - PlayerAppearance_cachedModels.put(var2, (long)var1); // L: 145 + var2 = class6.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); + if (var2 != null) { + PlayerAppearance_cachedModels.put(var2, (long)var1); } - return var2; // L: 147 + return var2; } } } @@ -305,7 +305,7 @@ public class WorldMapElement extends DualNode { ) @Export("getObjectId") public int getObjectId() { - return this.objectId; // L: 151 + return this.objectId; } @ObfuscatedName("hx") @@ -315,11 +315,11 @@ public class WorldMapElement extends DualNode { ) @Export("addCancelMenuEntry") static void addCancelMenuEntry() { - UrlRequest.method2489(); // L: 8786 - Client.menuActions[0] = "Cancel"; // L: 8787 - Client.menuTargets[0] = ""; // L: 8788 - Client.menuOpcodes[0] = 1006; // L: 8789 - Client.menuShiftClick[0] = false; // L: 8790 - Client.menuOptionsCount = 1; // L: 8791 - } // L: 8792 + UrlRequest.method2489(); + Client.menuActions[0] = "Cancel"; + Client.menuTargets[0] = ""; + Client.menuOpcodes[0] = 1006; + Client.menuShiftClick[0] = false; + Client.menuOptionsCount = 1; + } } diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java index 3374827a74..2b80d2ca44 100644 --- a/runescape-client/src/main/java/WorldMapEvent.java +++ b/runescape-client/src/main/java/WorldMapEvent.java @@ -30,10 +30,10 @@ public class WorldMapEvent { descriptor = "(ILju;Lju;)V" ) public WorldMapEvent(int var1, Coord var2, Coord var3) { - this.mapElement = var1; // L: 11 - this.coord1 = var2; // L: 12 - this.coord2 = var3; // L: 13 - } // L: 14 + this.mapElement = var1; + this.coord1 = var2; + this.coord2 = var3; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -41,6 +41,6 @@ public class WorldMapEvent { garbageValue = "438167000" ) public static int method4942(int var0) { - return class258.field3049[var0]; // L: 38 + return class258.field3049[var0]; } } diff --git a/runescape-client/src/main/java/WorldMapID.java b/runescape-client/src/main/java/WorldMapID.java index a07e0c9357..27604c649d 100644 --- a/runescape-client/src/main/java/WorldMapID.java +++ b/runescape-client/src/main/java/WorldMapID.java @@ -29,13 +29,13 @@ public class WorldMapID { final int value; static { - field2739 = new WorldMapID(0); // L: 4 - field2741 = new WorldMapID(1); // L: 5 + field2739 = new WorldMapID(0); + field2741 = new WorldMapID(1); } WorldMapID(int var1) { - this.value = var1; // L: 9 - } // L: 10 + this.value = var1; + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -43,13 +43,13 @@ public class WorldMapID { garbageValue = "-3" ) static void method4805() { - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 339 - Login.currentLoginField = 1; // L: 340 + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { + Login.currentLoginField = 1; } else { - Login.currentLoginField = 0; // L: 343 + Login.currentLoginField = 0; } - } // L: 345 + } @ObfuscatedName("v") @ObfuscatedSignature( @@ -58,115 +58,115 @@ public class WorldMapID { ) static int method4804(int var0, Script var1, boolean var2) { Widget var3; - if (var0 >= 2000) { // L: 1015 - var0 -= 1000; // L: 1016 - var3 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 1017 + if (var0 >= 2000) { + var0 -= 1000; + var3 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); } else { - var3 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; // L: 1019 + var3 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; } - String var4 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 1020 - int[] var5 = null; // L: 1021 - if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { // L: 1022 - int var6 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1023 - if (var6 > 0) { // L: 1024 - for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]) { // L: 1025 1026 + String var4 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + int[] var5 = null; + if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { + int var6 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + if (var6 > 0) { + for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]) { } } - var4 = var4.substring(0, var4.length() - 1); // L: 1028 + var4 = var4.substring(0, var4.length() - 1); } - Object[] var8 = new Object[var4.length() + 1]; // L: 1030 + Object[] var8 = new Object[var4.length() + 1]; int var7; - for (var7 = var8.length - 1; var7 >= 1; --var7) { // L: 1031 - if (var4.charAt(var7 - 1) == 's') { // L: 1032 + for (var7 = var8.length - 1; var7 >= 1; --var7) { + if (var4.charAt(var7 - 1) == 's') { var8[var7] = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; } else { - var8[var7] = new Integer(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 1033 + var8[var7] = new Integer(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); } } - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1035 - if (var7 != -1) { // L: 1036 + var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + if (var7 != -1) { var8[0] = new Integer(var7); } else { - var8 = null; // L: 1037 + var8 = null; } if (var0 == ScriptOpcodes.CC_SETONCLICK) { - var3.onClick = var8; // L: 1038 - } else if (var0 == ScriptOpcodes.CC_SETONHOLD) { // L: 1039 + var3.onClick = var8; + } else if (var0 == ScriptOpcodes.CC_SETONHOLD) { var3.onHold = var8; - } else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { // L: 1040 + } else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { var3.onRelease = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { // L: 1041 + } else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { var3.onMouseOver = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { // L: 1042 + } else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { var3.onMouseLeave = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDRAG) { // L: 1043 + } else if (var0 == ScriptOpcodes.CC_SETONDRAG) { var3.onDrag = var8; - } else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { // L: 1044 + } else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { var3.onTargetLeave = var8; - } else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { // L: 1045 - var3.onVarTransmit = var8; // L: 1046 - var3.varTransmitTriggers = var5; // L: 1047 - } else if (var0 == ScriptOpcodes.CC_SETONTIMER) { // L: 1049 + } else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { + var3.onVarTransmit = var8; + var3.varTransmitTriggers = var5; + } else if (var0 == ScriptOpcodes.CC_SETONTIMER) { var3.onTimer = var8; - } else if (var0 == ScriptOpcodes.CC_SETONOP) { // L: 1050 + } else if (var0 == ScriptOpcodes.CC_SETONOP) { var3.onOp = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { // L: 1051 + } else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { var3.onDragComplete = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { // L: 1052 + } else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { var3.onClickRepeat = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { // L: 1053 + } else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { var3.onMouseRepeat = var8; - } else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { // L: 1054 - var3.onInvTransmit = var8; // L: 1055 - var3.invTransmitTriggers = var5; // L: 1056 - } else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { // L: 1058 - var3.onStatTransmit = var8; // L: 1059 - var3.statTransmitTriggers = var5; // L: 1060 - } else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { // L: 1062 + } else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { + var3.onInvTransmit = var8; + var3.invTransmitTriggers = var5; + } else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { + var3.onStatTransmit = var8; + var3.statTransmitTriggers = var5; + } else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { var3.onTargetEnter = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { // L: 1063 + } else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { var3.onScroll = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { // L: 1064 + } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { var3.onChatTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONKEY) { // L: 1065 + } else if (var0 == ScriptOpcodes.CC_SETONKEY) { var3.onKey = var8; - } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { // L: 1066 + } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { var3.onFriendTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { // L: 1067 + } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { var3.onClanTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { // L: 1068 + } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { var3.onMiscTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { // L: 1069 + } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { var3.onDialogAbort = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { // L: 1070 + } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { var3.onSubChange = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { // L: 1071 + } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { var3.onStockTransmit = var8; - } else if (var0 == 1426) { // L: 1072 + } else if (var0 == 1426) { var3.field3294 = var8; - } else if (var0 == ScriptOpcodes.CC_SETONRESIZE) { // L: 1073 + } else if (var0 == ScriptOpcodes.CC_SETONRESIZE) { var3.onResize = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLANSETTINGSTRANSMIT) { // L: 1074 + } else if (var0 == ScriptOpcodes.CC_SETONCLANSETTINGSTRANSMIT) { var3.field3217 = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLANCHANNELTRANSMIT) { // L: 1075 + } else if (var0 == ScriptOpcodes.CC_SETONCLANCHANNELTRANSMIT) { var3.field3340 = var8; } else if (var0 == 1430) { - var3.field3335 = var8; // L: 1076 + var3.field3335 = var8; } else { - if (var0 != 1431) { // L: 1077 - return 2; // L: 1078 + if (var0 != 1431) { + return 2; } var3.field3336 = var8; } - var3.hasListener = true; // L: 1079 - return 1; // L: 1080 + var3.hasListener = true; + return 1; } } diff --git a/runescape-client/src/main/java/WorldMapIcon_0.java b/runescape-client/src/main/java/WorldMapIcon_0.java index 72d273c5b4..100a9b9346 100644 --- a/runescape-client/src/main/java/WorldMapIcon_0.java +++ b/runescape-client/src/main/java/WorldMapIcon_0.java @@ -36,20 +36,20 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { descriptor = "(Lju;Lju;ILhm;)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 = class78.WorldMapElement_get(this.getElement()); // L: 17 - SpritePixels var6 = var5.getSpriteBool(false); // L: 18 - if (var6 != null) { // L: 19 - this.subWidth = var6.subWidth; // L: 20 - this.subHeight = var6.subHeight; // L: 21 + super(var1, var2); + this.element = var3; + this.label = var4; + WorldMapElement var5 = class78.WorldMapElement_get(this.getElement()); + SpritePixels var6 = var5.getSpriteBool(false); + if (var6 != null) { + this.subWidth = var6.subWidth; + this.subHeight = var6.subHeight; } else { - this.subWidth = 0; // L: 24 - this.subHeight = 0; // L: 25 + this.subWidth = 0; + this.subHeight = 0; } - } // L: 27 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -58,7 +58,7 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { ) @Export("getElement") public int getElement() { - return this.element; // L: 31 + return this.element; } @ObfuscatedName("p") @@ -68,7 +68,7 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { ) @Export("getLabel") WorldMapLabel getLabel() { - return this.label; // L: 36 + return this.label; } @ObfuscatedName("m") @@ -78,7 +78,7 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { ) @Export("getSubWidth") int getSubWidth() { - return this.subWidth; // L: 41 + return this.subWidth; } @ObfuscatedName("t") @@ -88,7 +88,7 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { ) @Export("getSubHeight") int getSubHeight() { - return this.subHeight; // L: 46 + return this.subHeight; } @ObfuscatedName("r") @@ -98,6 +98,6 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { ) @Export("isAlphaNumeric") public static boolean isAlphaNumeric(char var0) { - return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 152 + return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; } } diff --git a/runescape-client/src/main/java/WorldMapIcon_1.java b/runescape-client/src/main/java/WorldMapIcon_1.java index fccbba5f62..6f424f1ee4 100644 --- a/runescape-client/src/main/java/WorldMapIcon_1.java +++ b/runescape-client/src/main/java/WorldMapIcon_1.java @@ -48,11 +48,11 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { descriptor = "(Lju;Lju;ILhw;)V" ) WorldMapIcon_1(Coord var1, Coord var2, int var3, WorldMapRegion var4) { - super(var1, var2); // L: 17 - this.objectDefId = var3; // L: 18 - this.region = var4; // L: 19 - this.init(); // L: 20 - } // L: 21 + super(var1, var2); + this.objectDefId = var3; + this.region = var4; + this.init(); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -61,19 +61,19 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { ) @Export("init") void init() { - this.element = class148.getObjectDefinition(this.objectDefId).transform().mapIconId; // L: 24 - this.label = this.region.createMapLabel(class78.WorldMapElement_get(this.element)); // L: 25 - WorldMapElement var1 = class78.WorldMapElement_get(this.getElement()); // L: 26 - SpritePixels var2 = var1.getSpriteBool(false); // L: 27 - if (var2 != null) { // L: 28 - this.subWidth = var2.subWidth; // L: 29 - this.subHeight = var2.subHeight; // L: 30 + this.element = class148.getObjectDefinition(this.objectDefId).transform().mapIconId; + this.label = this.region.createMapLabel(class78.WorldMapElement_get(this.element)); + WorldMapElement var1 = class78.WorldMapElement_get(this.getElement()); + SpritePixels var2 = var1.getSpriteBool(false); + if (var2 != null) { + this.subWidth = var2.subWidth; + this.subHeight = var2.subHeight; } else { - this.subWidth = 0; // L: 33 - this.subHeight = 0; // L: 34 + this.subWidth = 0; + this.subHeight = 0; } - } // L: 36 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -82,7 +82,7 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { ) @Export("getElement") public int getElement() { - return this.element; // L: 40 + return this.element; } @ObfuscatedName("p") @@ -92,7 +92,7 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { ) @Export("getLabel") WorldMapLabel getLabel() { - return this.label; // L: 45 + return this.label; } @ObfuscatedName("m") @@ -102,7 +102,7 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { ) @Export("getSubWidth") int getSubWidth() { - return this.subWidth; // L: 50 + return this.subWidth; } @ObfuscatedName("t") @@ -112,7 +112,7 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { ) @Export("getSubHeight") int getSubHeight() { - return this.subHeight; // L: 55 + return this.subHeight; } @ObfuscatedName("iy") @@ -121,8 +121,8 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { garbageValue = "-77644822" ) static final void method4385(MenuAction var0, int var1, int var2) { - Decimator.menuAction(var0.param0, var0.param1, var0.opcode, var0.identifier, var0.action, var0.action, var1, var2); // L: 9015 - } // L: 9016 + Decimator.menuAction(var0.param0, var0.param1, var0.opcode, var0.identifier, var0.action, var0.action, var1, var2); + } @ObfuscatedName("lq") @ObfuscatedSignature( @@ -131,8 +131,8 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { ) @Export("Clan_leaveChat") static final void Clan_leaveChat() { - PacketBufferNode var0 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2857, Client.packetWriter.isaacCipher); // L: 12504 - var0.packetBuffer.writeByte(0); // L: 12505 - Client.packetWriter.addNode(var0); // L: 12506 - } // L: 12507 + PacketBufferNode var0 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2857, Client.packetWriter.isaacCipher); + var0.packetBuffer.writeByte(0); + Client.packetWriter.addNode(var0); + } } diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java index 998810508c..b3c39e910d 100644 --- a/runescape-client/src/main/java/WorldMapLabel.java +++ b/runescape-client/src/main/java/WorldMapLabel.java @@ -39,9 +39,9 @@ public class WorldMapLabel { descriptor = "(Ljava/lang/String;IILhh;)V" ) WorldMapLabel(String var1, int var2, int var3, WorldMapLabelSize var4) { - this.text = var1; // L: 10 - this.width = var2; // L: 11 - this.height = var3; // L: 12 - this.size = var4; // L: 13 - } // L: 14 + this.text = var1; + this.width = var2; + this.height = var3; + this.size = var4; + } } diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java index ce456d7380..1d005dcfbd 100644 --- a/runescape-client/src/main/java/WorldMapLabelSize.java +++ b/runescape-client/src/main/java/WorldMapLabelSize.java @@ -50,16 +50,16 @@ public class WorldMapLabelSize { final int field2579; static { - WorldMapLabelSize_small = new WorldMapLabelSize(2, 0, 4); // L: 7 - WorldMapLabelSize_medium = new WorldMapLabelSize(1, 1, 2); // L: 8 - WorldMapLabelSize_large = new WorldMapLabelSize(0, 2, 0); // L: 9 + WorldMapLabelSize_small = new WorldMapLabelSize(2, 0, 4); + WorldMapLabelSize_medium = new WorldMapLabelSize(1, 1, 2); + WorldMapLabelSize_large = new WorldMapLabelSize(0, 2, 0); } WorldMapLabelSize(int var1, int var2, int var3) { - this.field2583 = var1; // L: 19 - this.field2578 = var2; // L: 20 - this.field2579 = var3; // L: 21 - } // L: 22 + this.field2583 = var1; + this.field2578 = var2; + this.field2579 = var3; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -67,7 +67,7 @@ public class WorldMapLabelSize { garbageValue = "714158034" ) boolean method4370(float var1) { - return var1 >= (float)this.field2579; // L: 25 + return var1 >= (float)this.field2579; } @ObfuscatedName("c") @@ -76,7 +76,7 @@ public class WorldMapLabelSize { garbageValue = "1279044140" ) static WorldMapLabelSize[] method4357() { - return new WorldMapLabelSize[]{WorldMapLabelSize_large, WorldMapLabelSize_medium, WorldMapLabelSize_small}; // L: 15 + return new WorldMapLabelSize[]{WorldMapLabelSize_large, WorldMapLabelSize_medium, WorldMapLabelSize_small}; } @ObfuscatedName("b") @@ -86,20 +86,20 @@ public class WorldMapLabelSize { ) @Export("getNpcDefinition") public static NPCComposition getNpcDefinition(int var0) { - NPCComposition var1 = (NPCComposition)NPCComposition.NpcDefinition_cached.get((long)var0); // L: 62 - if (var1 != null) { // L: 63 + NPCComposition var1 = (NPCComposition)NPCComposition.NpcDefinition_cached.get((long)var0); + if (var1 != null) { 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 + byte[] var2 = NPCComposition.NpcDefinition_archive.takeFile(9, var0); + var1 = new NPCComposition(); + var1.id = var0; + if (var2 != null) { var1.decode(new Buffer(var2)); } - var1.postDecode(); // L: 68 - NPCComposition.NpcDefinition_cached.put(var1, (long)var0); // L: 69 - return var1; // L: 70 + var1.postDecode(); + NPCComposition.NpcDefinition_cached.put(var1, (long)var0); + return var1; } } @@ -109,16 +109,16 @@ public class WorldMapLabelSize { garbageValue = "-1103968142" ) static WorldMapLabelSize method4362(int var0) { - WorldMapLabelSize[] var1 = method4357(); // L: 30 + WorldMapLabelSize[] var1 = method4357(); - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 31 - WorldMapLabelSize var3 = var1[var2]; // L: 32 - if (var0 == var3.field2578) { // L: 34 - return var3; // L: 35 + for (int var2 = 0; var2 < var1.length; ++var2) { + WorldMapLabelSize var3 = var1[var2]; + if (var0 == var3.field2578) { + return var3; } } - return null; // L: 40 + return null; } @ObfuscatedName("aq") @@ -127,43 +127,43 @@ public class WorldMapLabelSize { garbageValue = "0" ) static int method4359(int var0, Script var1, boolean var2) { - if (var0 == 7100) { // L: 4382 - ++IsaacCipher.Interpreter_intStackSize; // L: 4383 - return 1; // L: 4384 - } else if (var0 == 7101) { // L: 4386 - class13.Interpreter_stringStackSize += 2; // L: 4387 - return 1; // L: 4388 - } else if (var0 != 7102 && var0 != 7103 && var0 != 7104 && var0 != 7105 && var0 != 7109) { // L: 4390 - if (var0 == 7106) { // L: 4394 - ++IsaacCipher.Interpreter_intStackSize; // L: 4395 - return 1; // L: 4396 - } else if (var0 == 7107) { // L: 4398 - ++IsaacCipher.Interpreter_intStackSize; // L: 4399 - return 1; // L: 4400 - } else if (var0 == 7108) { // L: 4402 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class14.method204() ? 1 : 0; // L: 4403 - return 1; // L: 4404 - } else if (var0 == 7110) { // L: 4406 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 4407 - return 1; // L: 4408 - } else if (var0 == 7120) { // L: 4410 - --IsaacCipher.Interpreter_intStackSize; // L: 4411 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 4412 - return 1; // L: 4413 - } else if (var0 == 7121) { // L: 4415 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 4416 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4417 - return 1; // L: 4418 - } else if (var0 == 7122) { // L: 4420 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 4421 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 4422 - return 1; // L: 4423 + if (var0 == 7100) { + ++IsaacCipher.Interpreter_intStackSize; + return 1; + } else if (var0 == 7101) { + class13.Interpreter_stringStackSize += 2; + return 1; + } else if (var0 != 7102 && var0 != 7103 && var0 != 7104 && var0 != 7105 && var0 != 7109) { + if (var0 == 7106) { + ++IsaacCipher.Interpreter_intStackSize; + return 1; + } else if (var0 == 7107) { + ++IsaacCipher.Interpreter_intStackSize; + return 1; + } else if (var0 == 7108) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class14.method204() ? 1 : 0; + return 1; + } else if (var0 == 7110) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 7120) { + --IsaacCipher.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 7121) { + IsaacCipher.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; + return 1; + } else if (var0 == 7122) { + IsaacCipher.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + return 1; } else { - return 2; // L: 4425 + return 2; } } else { - ++IsaacCipher.Interpreter_intStackSize; // L: 4391 - return 1; // L: 4392 + ++IsaacCipher.Interpreter_intStackSize; + return 1; } } @@ -173,12 +173,12 @@ public class WorldMapLabelSize { garbageValue = "1715943871" ) static void method4358() { - if (Varcs.worldMap != null) { // L: 4939 - Varcs.worldMap.method6870(class20.Client_plane, (class340.localPlayer.x >> 7) + class131.baseX, (class340.localPlayer.y >> 7) + TileItem.baseY, false); // L: 4940 - Varcs.worldMap.loadCache(); // L: 4941 + if (Varcs.worldMap != null) { + Varcs.worldMap.method6870(class20.Client_plane, (class340.localPlayer.x >> 7) + class131.baseX, (class340.localPlayer.y >> 7) + TileItem.baseY, false); + Varcs.worldMap.loadCache(); } - } // L: 4943 + } @ObfuscatedName("ln") @ObfuscatedSignature( @@ -186,16 +186,16 @@ public class WorldMapLabelSize { garbageValue = "-62" ) static void method4373() { - if (Messages.field1273 != null) { // L: 12712 - Client.field559 = Client.cycle; // L: 12713 - Messages.field1273.method5795(); // L: 12714 + if (Messages.field1273 != null) { + Client.field559 = Client.cycle; + Messages.field1273.method5795(); - for (int var0 = 0; var0 < Client.players.length; ++var0) { // L: 12715 - if (Client.players[var0] != null) { // L: 12716 - Messages.field1273.method5806((Client.players[var0].x >> 7) + class131.baseX, (Client.players[var0].y >> 7) + TileItem.baseY); // L: 12717 + for (int var0 = 0; var0 < Client.players.length; ++var0) { + if (Client.players[var0] != null) { + Messages.field1273.method5806((Client.players[var0].x >> 7) + class131.baseX, (Client.players[var0].y >> 7) + TileItem.baseY); } } } - } // L: 12721 + } } diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java index 18fe033a21..52c01d3ffe 100644 --- a/runescape-client/src/main/java/WorldMapManager.java +++ b/runescape-client/src/main/java/WorldMapManager.java @@ -98,15 +98,15 @@ public final class WorldMapManager { descriptor = "([Lpa;Ljava/util/HashMap;Lku;Lku;)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(); // L: 22 - this.pixelsPerTile = 0; // L: 31 - this.mapSceneSprites = var1; // L: 34 - this.fonts = var2; // L: 35 - this.geographyArchive = var3; // L: 36 - this.groundArchive = var4; // L: 37 - } // L: 38 + this.loaded = false; + this.loadStarted = false; + this.scaleHandlers = new HashMap(); + this.pixelsPerTile = 0; + this.mapSceneSprites = var1; + this.fonts = var2; + this.geographyArchive = var3; + this.groundArchive = var4; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -115,71 +115,71 @@ public final class WorldMapManager { ) @Export("load") public void load(AbstractArchive var1, String var2, boolean var3) { - if (!this.loadStarted) { // L: 41 - this.loaded = false; // L: 44 - this.loadStarted = true; // L: 45 - System.nanoTime(); // L: 46 - int var4 = var1.getGroupId(WorldMapCacheName.field2768.name); // L: 47 - int var5 = var1.getFileId(var4, var2); // L: 48 - Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2768.name, var2)); // L: 49 - Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2763.name, var2)); // L: 50 - System.nanoTime(); // L: 51 - System.nanoTime(); // L: 52 - this.mapAreaData = new WorldMapAreaData(); // L: 53 + if (!this.loadStarted) { + this.loaded = false; + this.loadStarted = true; + System.nanoTime(); + int var4 = var1.getGroupId(WorldMapCacheName.field2768.name); + int var5 = var1.getFileId(var4, var2); + Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2768.name, var2)); + Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2763.name, var2)); + System.nanoTime(); + System.nanoTime(); + this.mapAreaData = new WorldMapAreaData(); try { - this.mapAreaData.init(var6, var7, var5, var3); // L: 55 - } catch (IllegalStateException var19) { // L: 57 - return; // L: 58 + this.mapAreaData.init(var6, var7, var5, var3); + } catch (IllegalStateException var19) { + return; } - this.mapAreaData.getOriginX(); // L: 60 - this.mapAreaData.getOriginPlane(); // L: 61 - this.mapAreaData.getOriginY(); // L: 62 - this.tileX = this.mapAreaData.getRegionLowX() * 64; // L: 63 - this.tileY = this.mapAreaData.getRegionLowY() * 64; // L: 64 - this.tileWidth = (this.mapAreaData.getRegionHighX() - this.mapAreaData.getRegionLowX() + 1) * 64; // L: 65 - this.tileHeight = (this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1) * 64; // L: 66 - int var16 = this.mapAreaData.getRegionHighX() - this.mapAreaData.getRegionLowX() + 1; // L: 67 - int var9 = this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1; // L: 68 - System.nanoTime(); // L: 69 - System.nanoTime(); // L: 70 - class127.method2770(); // L: 71 - this.regions = new WorldMapRegion[var16][var9]; // L: 72 - Iterator var10 = this.mapAreaData.worldMapData0Set.iterator(); // L: 73 + this.mapAreaData.getOriginX(); + this.mapAreaData.getOriginPlane(); + this.mapAreaData.getOriginY(); + this.tileX = this.mapAreaData.getRegionLowX() * 64; + this.tileY = this.mapAreaData.getRegionLowY() * 64; + this.tileWidth = (this.mapAreaData.getRegionHighX() - this.mapAreaData.getRegionLowX() + 1) * 64; + this.tileHeight = (this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1) * 64; + int var16 = this.mapAreaData.getRegionHighX() - this.mapAreaData.getRegionLowX() + 1; + int var9 = this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1; + System.nanoTime(); + System.nanoTime(); + class127.method2770(); + this.regions = new WorldMapRegion[var16][var9]; + Iterator var10 = this.mapAreaData.worldMapData0Set.iterator(); while (var10.hasNext()) { - WorldMapData_0 var11 = (WorldMapData_0)var10.next(); // L: 74 - int var12 = var11.regionX; // L: 76 - int 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(); + int var12 = var11.regionX; + int var13 = var11.regionY; + int var14 = var12 - this.mapAreaData.getRegionLowX(); + int var15 = var13 - this.mapAreaData.getRegionLowY(); + this.regions[var14][var15] = new WorldMapRegion(var12, var13, this.mapAreaData.getBackGroundColor(), this.fonts); + this.regions[var14][var15].initWorldMapData0(var11, this.mapAreaData.iconList); } - for (int var17 = 0; var17 < var16; ++var17) { // L: 84 - for (int var18 = 0; var18 < var9; ++var18) { // L: 85 - 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) { + for (int var18 = 0; var18 < var9; ++var18) { + if (this.regions[var17][var18] == null) { + this.regions[var17][var18] = new WorldMapRegion(this.mapAreaData.getRegionLowX() + var17, this.mapAreaData.getRegionLowY() + var18, this.mapAreaData.getBackGroundColor(), this.fonts); + this.regions[var17][var18].initWorldMapData1(this.mapAreaData.worldMapData1Set, this.mapAreaData.iconList); } } } - System.nanoTime(); // L: 92 - System.nanoTime(); // L: 93 - if (var1.isValidFileName(WorldMapCacheName.field2764.name, var2)) { // L: 94 - byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field2764.name, var2); // L: 95 - this.compositeTextureSprite = MouseRecorder.method2161(var20); // L: 96 + System.nanoTime(); + System.nanoTime(); + if (var1.isValidFileName(WorldMapCacheName.field2764.name, var2)) { + byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field2764.name, var2); + this.compositeTextureSprite = MouseRecorder.method2161(var20); } - System.nanoTime(); // L: 98 - var1.clearGroups(); // L: 99 - var1.clearFiles(); // L: 100 - this.loaded = true; // L: 101 + System.nanoTime(); + var1.clearGroups(); + var1.clearFiles(); + this.loaded = true; } - } // L: 42 102 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -188,8 +188,8 @@ public final class WorldMapManager { ) @Export("clearIcons") public final void clearIcons() { - this.icons = null; // L: 105 - } // L: 106 + this.icons = null; + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -198,45 +198,45 @@ public final class WorldMapManager { ) @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; + int var10 = Rasterizer2D.Rasterizer2D_width; + int var11 = Rasterizer2D.Rasterizer2D_height; + int[] var12 = new int[4]; + Rasterizer2D.Rasterizer2D_getClipArray(var12); + WorldMapRectangle var13 = this.createWorldMapRectangle(var1, var2, var3, var4); + float var14 = this.getPixelsPerTile(var7 - var5, var3 - var1); + int var15 = (int)Math.ceil((double)var14); + this.pixelsPerTile = var15; + if (!this.scaleHandlers.containsKey(var15)) { + WorldMapScaleHandler var16 = new WorldMapScaleHandler(var15); + var16.init(); + this.scaleHandlers.put(var15, var16); } - int var23 = var13.width + var13.x - 1; // L: 123 - int var17 = var13.height + var13.y - 1; // L: 124 + int var23 = var13.width + var13.x - 1; + int var17 = var13.height + var13.y - 1; 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) { + for (var19 = var13.y; var19 <= var17; ++var19) { + this.regions[var18][var19].drawTile(var15, (WorldMapScaleHandler)this.scaleHandlers.get(var15), this.mapSceneSprites, this.geographyArchive, this.groundArchive); } } - 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); + Rasterizer2D.Rasterizer2D_setClipArray(var12); + var18 = (int)(var14 * 64.0F); + var19 = this.tileX + var1; + int var20 = var2 + this.tileY; - for (int var21 = var13.x; var21 < var13.x + var13.width; ++var21) { // L: 135 - for (int var22 = var13.y; var22 < var13.height + var13.y; ++var22) { // L: 136 - this.regions[var21][var22].method4492(var5 + (this.regions[var21][var22].regionX * 64 - var19) * var18 / 64, var8 - (this.regions[var21][var22].regionY * 64 - var20 + 64) * var18 / 64, var18); // L: 137 + for (int var21 = var13.x; var21 < var13.x + var13.width; ++var21) { + for (int var22 = var13.y; var22 < var13.height + var13.y; ++var22) { + this.regions[var21][var22].method4492(var5 + (this.regions[var21][var22].regionX * 64 - var19) * var18 / 64, var8 - (this.regions[var21][var22].regionY * 64 - var20 + 64) * var18 / 64, var18); } } - } // L: 140 + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -245,33 +245,33 @@ public final class WorldMapManager { ) @Export("drawElements") public final void drawElements(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, HashSet var9, HashSet var10, int var11, int var12, boolean var13) { - WorldMapRectangle var14 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 143 - float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1); // L: 144 - int var16 = (int)(var15 * 64.0F); // L: 145 - int var17 = this.tileX + var1; // L: 146 - int var18 = var2 + this.tileY; // L: 147 + WorldMapRectangle var14 = this.createWorldMapRectangle(var1, var2, var3, var4); + float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1); + int var16 = (int)(var15 * 64.0F); + int var17 = this.tileX + var1; + int var18 = var2 + this.tileY; int var19; int var20; - for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { // L: 148 - for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { // L: 149 - if (var13) { // L: 150 - this.regions[var19][var20].initWorldMapIcon1s(); // L: 151 + for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { + for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { + if (var13) { + this.regions[var19][var20].initWorldMapIcon1s(); } - this.regions[var19][var20].method4588(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].method4588(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); } } - 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.y + var14.height; ++var20) { // L: 158 - this.regions[var19][var20].flashElements(var10, var11, var12); // L: 159 + if (var10 != null && var11 > 0) { + for (var19 = var14.x; var19 < var14.x + var14.width; ++var19) { + for (var20 = var14.y; var20 < var14.y + var14.height; ++var20) { + this.regions[var19][var20].flashElements(var10, var11, var12); } } } - } // L: 163 + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -280,38 +280,38 @@ public final class WorldMapManager { ) @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) { + 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; } - 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(); + var10 = (List)this.icons.get(var9); + } while(var10 == null); - Iterator var11 = var10.iterator(); // L: 183 + Iterator var11 = var10.iterator(); while (var11.hasNext()) { - 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 + AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var11.next(); + int var13 = var3 * (var12.coord2.x - this.tileX) / this.tileWidth; + int var14 = var4 - (var12.coord2.y - this.tileY) * var4 / this.tileHeight; + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var13 + var1, var14 + var2, 2, 16776960, 256); } } } } - } // L: 167 171 + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -319,26 +319,26 @@ public final class WorldMapManager { garbageValue = "546478193" ) public List method4617(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 + LinkedList var11 = new LinkedList(); + if (!this.loaded) { + return var11; } 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); + float var13 = this.getPixelsPerTile(var7, var3 - var1); + int var14 = (int)(64.0F * var13); + int var15 = this.tileX + var1; + int var16 = var2 + this.tileY; - 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].method4522(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.x + var12.width; ++var17) { + for (int var18 = var12.y; var18 < var12.y + var12.height; ++var18) { + List var19 = this.regions[var17][var18].method4522(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); + if (!var19.isEmpty()) { + var11.addAll(var19); } } } - return var11; // L: 213 + return var11; } } @@ -349,40 +349,40 @@ public final class WorldMapManager { ) @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 + WorldMapRectangle var5 = new WorldMapRectangle(this); + int var6 = this.tileX + var1; + int var7 = var2 + this.tileY; + int var8 = var3 + this.tileX; + int var9 = var4 + this.tileY; + int var10 = var6 / 64; + int var11 = var7 / 64; + int var12 = var8 / 64; + int var13 = var9 / 64; + var5.width = var12 - var10 + 1; + var5.height = var13 - var11 + 1; + var5.x = var10 - this.mapAreaData.getRegionLowX(); + var5.y = var11 - this.mapAreaData.getRegionLowY(); + if (var5.x < 0) { + var5.width += var5.x; + var5.x = 0; } - if (var5.x > this.regions.length - var5.width) { // L: 234 - var5.width = this.regions.length - var5.x; // L: 235 + if (var5.x > this.regions.length - var5.width) { + var5.width = this.regions.length - var5.x; } - if (var5.y < 0) { // L: 237 - var5.height += var5.y; // L: 238 - var5.y = 0; // L: 239 + if (var5.y < 0) { + var5.height += var5.y; + var5.y = 0; } - if (var5.y > this.regions[0].length - var5.height) { // L: 241 - var5.height = this.regions[0].length - var5.y; // L: 242 + if (var5.y > this.regions[0].length - var5.height) { + var5.height = this.regions[0].length - var5.y; } - 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 + var5.width = Math.min(var5.width, this.regions.length); + var5.height = Math.min(var5.height, this.regions[0].length); + return var5; } @ObfuscatedName("w") @@ -392,7 +392,7 @@ public final class WorldMapManager { ) @Export("isLoaded") public boolean isLoaded() { - return this.loaded; // L: 250 + return this.loaded; } @ObfuscatedName("n") @@ -402,8 +402,8 @@ public final class WorldMapManager { ) @Export("buildIcons") public HashMap buildIcons() { - this.buildIcons0(); // L: 254 - return this.icons; // L: 255 + this.buildIcons0(); + return this.icons; } @ObfuscatedName("r") @@ -413,35 +413,35 @@ public final class WorldMapManager { ) @Export("buildIcons0") void buildIcons0() { - if (this.icons == null) { // L: 259 - this.icons = new HashMap(); // L: 260 + if (this.icons == null) { + this.icons = new HashMap(); } - this.icons.clear(); // L: 262 + this.icons.clear(); - 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) { + for (int var2 = 0; var2 < this.regions[var1].length; ++var2) { + List var3 = this.regions[var1][var2].icons(); + Iterator var4 = var3.iterator(); 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(); + if (var5.hasValidElement()) { + int var6 = var5.getElement(); + if (!this.icons.containsKey(var6)) { + LinkedList var7 = new LinkedList(); + var7.add(var5); + this.icons.put(var6, var7); } else { - List var8 = (List)this.icons.get(var6); // L: 277 - var8.add(var5); // L: 278 + List var8 = (List)this.icons.get(var6); + var8.add(var5); } } } } } - } // L: 284 + } @ObfuscatedName("o") @ObfuscatedSignature( @@ -450,14 +450,14 @@ public final class WorldMapManager { ) @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; + if (var3 > 8.0F) { return 8.0F; - } else if (var3 < 1.0F) { // L: 289 + } else if (var3 < 1.0F) { 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); + return Math.abs((float)var4 - var3) < 0.05F ? (float)var4 : var3; } } } diff --git a/runescape-client/src/main/java/WorldMapRectangle.java b/runescape-client/src/main/java/WorldMapRectangle.java index cb4883bc21..cae871e929 100644 --- a/runescape-client/src/main/java/WorldMapRectangle.java +++ b/runescape-client/src/main/java/WorldMapRectangle.java @@ -47,7 +47,7 @@ public final class WorldMapRectangle { descriptor = "(Lhe;)V" ) WorldMapRectangle(WorldMapManager var1) { - this.this$0 = var1; // L: 303 + this.this$0 = var1; } @ObfuscatedName("b") @@ -56,24 +56,24 @@ public final class WorldMapRectangle { garbageValue = "18" ) static int method4794(int var0, int var1, int var2) { - if (var2 > 179) { // L: 84 + if (var2 > 179) { var1 /= 2; } - if (var2 > 192) { // L: 85 + if (var2 > 192) { var1 /= 2; } - if (var2 > 217) { // L: 86 + if (var2 > 217) { var1 /= 2; } - if (var2 > 243) { // L: 87 + if (var2 > 243) { var1 /= 2; } - int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 88 - return var3; // L: 89 + int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; + return var3; } @ObfuscatedName("n") @@ -82,199 +82,199 @@ public final class WorldMapRectangle { garbageValue = "-105" ) static void method4793() { - Login.Login_username = Login.Login_username.trim(); // L: 1066 - if (Login.Login_username.length() == 0) { // L: 1067 - class19.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 1068 + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + class19.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); } else { long var1; try { - URL var3 = new URL(InterfaceParent.method2146("services", false) + "m=accountappeal/login.ws"); // L: 1075 - URLConnection var4 = var3.openConnection(); // L: 1076 - var4.setRequestProperty("connection", "close"); // L: 1077 - var4.setDoInput(true); // L: 1078 - var4.setDoOutput(true); // L: 1079 - var4.setConnectTimeout(5000); // L: 1080 - OutputStreamWriter var5 = new OutputStreamWriter(var4.getOutputStream()); // L: 1081 - var5.write("data1=req"); // L: 1082 - var5.flush(); // L: 1083 - InputStream var6 = var4.getInputStream(); // L: 1084 - Buffer var7 = new Buffer(new byte[1000]); // L: 1085 + URL var3 = new URL(InterfaceParent.method2146("services", false) + "m=accountappeal/login.ws"); + URLConnection var4 = var3.openConnection(); + var4.setRequestProperty("connection", "close"); + var4.setDoInput(true); + var4.setDoOutput(true); + var4.setConnectTimeout(5000); + OutputStreamWriter var5 = new OutputStreamWriter(var4.getOutputStream()); + var5.write("data1=req"); + var5.flush(); + InputStream var6 = var4.getInputStream(); + Buffer var7 = new Buffer(new byte[1000]); while (true) { - int var8 = var6.read(var7.array, var7.offset, 1000 - var7.offset); // L: 1087 - if (var8 == -1) { // L: 1088 - var7.offset = 0; // L: 1095 - long var24 = var7.readLong(); // L: 1096 - var1 = var24; // L: 1097 + int var8 = var6.read(var7.array, var7.offset, 1000 - var7.offset); + if (var8 == -1) { + var7.offset = 0; + long var24 = var7.readLong(); + var1 = var24; break; } - var7.offset += var8; // L: 1089 - if (var7.offset >= 1000) { // L: 1090 - var1 = 0L; // L: 1091 + var7.offset += var8; + if (var7.offset >= 1000) { + var1 = 0L; break; } } - } catch (Exception var33) { // L: 1099 - var1 = 0L; // L: 1100 + } catch (Exception var33) { + var1 = 0L; } byte var0; - if (var1 == 0L) { // L: 1104 + if (var1 == 0L) { var0 = 5; } else { - String var34 = Login.Login_username; // L: 1107 - Random var35 = new Random(); // L: 1109 - Buffer var28 = new Buffer(128); // L: 1110 - Buffer var9 = new Buffer(128); // L: 1111 - int[] var10 = new int[]{var35.nextInt(), var35.nextInt(), (int)(var1 >> 32), (int)var1}; // L: 1112 1113 1114 1115 1116 - var28.writeByte(10); // L: 1117 + String var34 = Login.Login_username; + Random var35 = new Random(); + Buffer var28 = new Buffer(128); + Buffer var9 = new Buffer(128); + int[] var10 = new int[]{var35.nextInt(), var35.nextInt(), (int)(var1 >> 32), (int)var1}; + var28.writeByte(10); int var11; - for (var11 = 0; var11 < 4; ++var11) { // L: 1118 - var28.writeInt(var35.nextInt()); // L: 1119 + for (var11 = 0; var11 < 4; ++var11) { + var28.writeInt(var35.nextInt()); } - var28.writeInt(var10[0]); // L: 1121 - var28.writeInt(var10[1]); // L: 1122 - var28.writeLong(var1); // L: 1123 - var28.writeLong(0L); // L: 1124 + var28.writeInt(var10[0]); + var28.writeInt(var10[1]); + var28.writeLong(var1); + var28.writeLong(0L); - for (var11 = 0; var11 < 4; ++var11) { // L: 1125 - var28.writeInt(var35.nextInt()); // L: 1126 + for (var11 = 0; var11 < 4; ++var11) { + var28.writeInt(var35.nextInt()); } - var28.encryptRsa(class65.field841, class65.field842); // L: 1128 - var9.writeByte(10); // L: 1129 + var28.encryptRsa(class65.field841, class65.field842); + var9.writeByte(10); - for (var11 = 0; var11 < 3; ++var11) { // L: 1130 - var9.writeInt(var35.nextInt()); // L: 1131 + for (var11 = 0; var11 < 3; ++var11) { + var9.writeInt(var35.nextInt()); } - var9.writeLong(var35.nextLong()); // L: 1133 - var9.writeLongMedium(var35.nextLong()); // L: 1134 - Decimator.method1082(var9); // L: 1135 - var9.writeLong(var35.nextLong()); // L: 1136 - var9.encryptRsa(class65.field841, class65.field842); // L: 1137 - var11 = class116.stringCp1252NullTerminatedByteSize(var34); // L: 1138 - if (var11 % 8 != 0) { // L: 1139 + var9.writeLong(var35.nextLong()); + var9.writeLongMedium(var35.nextLong()); + Decimator.method1082(var9); + var9.writeLong(var35.nextLong()); + var9.encryptRsa(class65.field841, class65.field842); + var11 = class116.stringCp1252NullTerminatedByteSize(var34); + if (var11 % 8 != 0) { var11 += 8 - var11 % 8; } - Buffer var12 = new Buffer(var11); // L: 1140 - var12.writeStringCp1252NullTerminated(var34); // L: 1141 - var12.offset = var11; // L: 1142 - var12.xteaEncryptAll(var10); // L: 1143 - Buffer var13 = new Buffer(var12.offset + var28.offset + var9.offset + 5); // L: 1144 - var13.writeByte(2); // L: 1145 - var13.writeByte(var28.offset); // L: 1146 - var13.writeBytes(var28.array, 0, var28.offset); // L: 1147 - var13.writeByte(var9.offset); // L: 1148 - var13.writeBytes(var9.array, 0, var9.offset); // L: 1149 - var13.writeShort(var12.offset); // L: 1150 - var13.writeBytes(var12.array, 0, var12.offset); // L: 1151 - byte[] var15 = var13.array; // L: 1153 - String var14 = PendingSpawn.method2224(var15, 0, var15.length); // L: 1155 - String var16 = var14; // L: 1157 + Buffer var12 = new Buffer(var11); + var12.writeStringCp1252NullTerminated(var34); + var12.offset = var11; + var12.xteaEncryptAll(var10); + Buffer var13 = new Buffer(var12.offset + var28.offset + var9.offset + 5); + var13.writeByte(2); + var13.writeByte(var28.offset); + var13.writeBytes(var28.array, 0, var28.offset); + var13.writeByte(var9.offset); + var13.writeBytes(var9.array, 0, var9.offset); + var13.writeShort(var12.offset); + var13.writeBytes(var12.array, 0, var12.offset); + byte[] var15 = var13.array; + String var14 = PendingSpawn.method2224(var15, 0, var15.length); + String var16 = var14; byte var29; try { - URL var17 = new URL(InterfaceParent.method2146("services", false) + "m=accountappeal/login.ws"); // L: 1159 - URLConnection var18 = var17.openConnection(); // L: 1160 - var18.setDoInput(true); // L: 1161 - var18.setDoOutput(true); // L: 1162 - var18.setConnectTimeout(5000); // L: 1163 - OutputStreamWriter var19 = new OutputStreamWriter(var18.getOutputStream()); // L: 1164 - var19.write("data2=" + class260.method5070(var16) + "&dest=" + class260.method5070("passwordchoice.ws")); // L: 1165 - var19.flush(); // L: 1166 - InputStream var20 = var18.getInputStream(); // L: 1167 - var13 = new Buffer(new byte[1000]); // L: 1168 + URL var17 = new URL(InterfaceParent.method2146("services", false) + "m=accountappeal/login.ws"); + URLConnection var18 = var17.openConnection(); + var18.setDoInput(true); + var18.setDoOutput(true); + var18.setConnectTimeout(5000); + OutputStreamWriter var19 = new OutputStreamWriter(var18.getOutputStream()); + var19.write("data2=" + class260.method5070(var16) + "&dest=" + class260.method5070("passwordchoice.ws")); + var19.flush(); + InputStream var20 = var18.getInputStream(); + var13 = new Buffer(new byte[1000]); while (true) { - int var21 = var20.read(var13.array, var13.offset, 1000 - var13.offset); // L: 1170 - if (var21 == -1) { // L: 1171 - var19.close(); // L: 1178 - var20.close(); // L: 1179 - String var30 = new String(var13.array); // L: 1180 - if (var30.startsWith("OFFLINE")) { // L: 1181 - var29 = 4; // L: 1182 - } else if (var30.startsWith("WRONG")) { // L: 1185 - var29 = 7; // L: 1186 - } else if (var30.startsWith("RELOAD")) { // L: 1189 - var29 = 3; // L: 1190 - } else if (var30.startsWith("Not permitted for social network accounts.")) { // L: 1193 - var29 = 6; // L: 1194 + int var21 = var20.read(var13.array, var13.offset, 1000 - var13.offset); + if (var21 == -1) { + var19.close(); + var20.close(); + String var30 = new String(var13.array); + if (var30.startsWith("OFFLINE")) { + var29 = 4; + } else if (var30.startsWith("WRONG")) { + var29 = 7; + } else if (var30.startsWith("RELOAD")) { + var29 = 3; + } else if (var30.startsWith("Not permitted for social network accounts.")) { + var29 = 6; } else { - var13.xteaDecryptAll(var10); // L: 1197 + var13.xteaDecryptAll(var10); - while (var13.offset > 0 && var13.array[var13.offset - 1] == 0) { // L: 1198 - --var13.offset; // L: 1199 + while (var13.offset > 0 && var13.array[var13.offset - 1] == 0) { + --var13.offset; } - var30 = new String(var13.array, 0, var13.offset); // L: 1201 + var30 = new String(var13.array, 0, var13.offset); boolean var22; - if (var30 == null) { // L: 1204 - var22 = false; // L: 1205 + if (var30 == null) { + var22 = false; } else { label113: { try { new URL(var30); - } catch (MalformedURLException var31) { // L: 1211 - var22 = false; // L: 1212 - break label113; // L: 1213 + } catch (MalformedURLException var31) { + var22 = false; + break label113; } - var22 = true; // L: 1215 + var22 = true; } } - if (var22) { // L: 1217 - WorldMapSprite.openURL(var30, true, false); // L: 1218 - var29 = 2; // L: 1219 + if (var22) { + WorldMapSprite.openURL(var30, true, false); + var29 = 2; } else { - var29 = 5; // L: 1221 + var29 = 5; } } break; } - var13.offset += var21; // L: 1172 - if (var13.offset >= 1000) { // L: 1173 - var29 = 5; // L: 1174 + var13.offset += var21; + if (var13.offset >= 1000) { + var29 = 5; break; } } - } catch (Throwable var32) { // L: 1223 - var32.printStackTrace(); // L: 1224 - var29 = 5; // L: 1225 + } catch (Throwable var32) { + var32.printStackTrace(); + var29 = 5; } - var0 = var29; // L: 1228 + var0 = var29; } - switch(var0) { // L: 1230 + switch(var0) { case 2: - class19.setLoginResponseString(Strings.field3747, Strings.field3551, Strings.field3749); // L: 1232 - PlayerType.method5521(6); // L: 1233 - break; // L: 1234 + class19.setLoginResponseString(Strings.field3747, Strings.field3551, Strings.field3749); + PlayerType.method5521(6); + break; case 3: - class19.setLoginResponseString("", "Error connecting to server.", ""); // L: 1248 + class19.setLoginResponseString("", "Error connecting to server.", ""); break; case 4: - class19.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); // L: 1236 - break; // L: 1237 + class19.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); + break; case 5: - class19.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); // L: 1242 - break; // L: 1243 + class19.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); + break; case 6: - class19.setLoginResponseString("", "Error connecting to server.", ""); // L: 1245 - break; // L: 1246 + class19.setLoginResponseString("", "Error connecting to server.", ""); + break; case 7: - class19.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: 1239 + class19.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: 1069 1251 + } @ObfuscatedName("es") @ObfuscatedSignature( @@ -283,6 +283,6 @@ public final class WorldMapRectangle { ) @Export("getWorldMap") static WorldMap getWorldMap() { - return Varcs.worldMap; // L: 656 + return Varcs.worldMap; } } diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index 78c308a155..4aac30dff8 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -63,18 +63,18 @@ public class WorldMapRegion { final HashMap fonts; static { - WorldMapRegion_cachedSprites = new DemotingHashTable(37748736, 256); // L: 26 + WorldMapRegion_cachedSprites = new DemotingHashTable(37748736, 256); } WorldMapRegion(int var1, int var2, int var3, HashMap var4) { - this.regionX = var1; // L: 52 - this.regionY = var2; // L: 53 - this.worldMapData1List = new LinkedList(); // L: 54 - this.icon0List = new LinkedList(); // L: 55 - this.iconMap = new HashMap(); // L: 56 - this.backgroundColor = var3 | -16777216; // L: 57 - this.fonts = var4; // L: 58 - } // L: 59 + this.regionX = var1; + this.regionY = var2; + this.worldMapData1List = new LinkedList(); + this.icon0List = new LinkedList(); + this.iconMap = new HashMap(); + this.backgroundColor = var3 | -16777216; + this.fonts = var4; + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -82,21 +82,21 @@ public class WorldMapRegion { garbageValue = "24" ) void method4492(int var1, int var2, int var3) { - int var5 = this.regionX; // L: 63 - int var6 = this.regionY; // L: 64 - int var7 = this.pixelsPerTile; // L: 65 - DemotingHashTable var8 = WorldMapRegion_cachedSprites; // L: 67 - long var9 = (long)(var7 << 16 | var5 << 8 | var6); // L: 70 - SpritePixels var4 = (SpritePixels)var8.get(var9); // L: 72 + int var5 = this.regionX; + int var6 = this.regionY; + int var7 = this.pixelsPerTile; + DemotingHashTable var8 = WorldMapRegion_cachedSprites; + long var9 = (long)(var7 << 16 | var5 << 8 | var6); + SpritePixels var4 = (SpritePixels)var8.get(var9); if (var4 != null) { - if (var3 == this.pixelsPerTile * 64) { // L: 76 - var4.drawAt(var1, var2); // L: 77 + if (var3 == this.pixelsPerTile * 64) { + var4.drawAt(var1, var2); } else { - var4.drawScaledWorldmap(var1, var2, var3, var3); // L: 80 + var4.drawScaledWorldmap(var1, var2, var3, var3); } } - } // L: 75 82 + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -105,10 +105,10 @@ public class WorldMapRegion { ) @Export("initWorldMapData0") void initWorldMapData0(WorldMapData_0 var1, List var2) { - this.iconMap.clear(); // L: 85 - this.worldMapData_0 = var1; // L: 86 - this.addAllToIconList(var2); // L: 87 - } // L: 88 + this.iconMap.clear(); + this.worldMapData_0 = var1; + this.addAllToIconList(var2); + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -117,18 +117,18 @@ public class WorldMapRegion { ) @Export("initWorldMapData1") void initWorldMapData1(HashSet var1, List var2) { - this.iconMap.clear(); // L: 91 - Iterator var3 = var1.iterator(); // L: 92 + this.iconMap.clear(); + Iterator var3 = var1.iterator(); while (var3.hasNext()) { - WorldMapData_1 var4 = (WorldMapData_1)var3.next(); // L: 93 - if (var4.getRegionX() == this.regionX && var4.getRegionY() == this.regionY) { // L: 95 - this.worldMapData1List.add(var4); // L: 96 + WorldMapData_1 var4 = (WorldMapData_1)var3.next(); + if (var4.getRegionX() == this.regionX && var4.getRegionY() == this.regionY) { + this.worldMapData1List.add(var4); } } - this.addAllToIconList(var2); // L: 100 - } // L: 101 + this.addAllToIconList(var2); + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -137,42 +137,42 @@ public class WorldMapRegion { ) @Export("getIconsForTiles") void getIconsForTiles(int var1, int var2, int var3, int var4, AbstractWorldMapData var5) { - for (int var6 = var1; var6 < var3 + var1; ++var6) { // L: 104 + for (int var6 = var1; var6 < var3 + var1; ++var6) { label75: - for (int var7 = var2; var7 < var2 + var4; ++var7) { // L: 105 - for (int var8 = 0; var8 < var5.planes; ++var8) { // L: 106 - WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7]; // L: 107 - if (var9 != null && var9.length != 0) { // L: 108 - WorldMapDecoration[] var10 = var9; // L: 112 + for (int var7 = var2; var7 < var2 + var4; ++var7) { + for (int var8 = 0; var8 < var5.planes; ++var8) { + WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7]; + if (var9 != null && var9.length != 0) { + WorldMapDecoration[] var10 = var9; - for (int var11 = 0; var11 < var10.length; ++var11) { // L: 113 + for (int var11 = 0; var11 < var10.length; ++var11) { ObjectComposition var13; boolean var14; label66: { - WorldMapDecoration var12 = var10[var11]; // L: 114 - var13 = class148.getObjectDefinition(var12.objectDefinitionId); // L: 116 - if (var13.transforms != null) { // L: 119 - int[] var15 = var13.transforms; // L: 121 + WorldMapDecoration var12 = var10[var11]; + var13 = class148.getObjectDefinition(var12.objectDefinitionId); + if (var13.transforms != null) { + int[] var15 = var13.transforms; - for (int var16 = 0; var16 < var15.length; ++var16) { // L: 122 - int var17 = var15[var16]; // L: 123 - ObjectComposition var18 = class148.getObjectDefinition(var17); // L: 125 - if (var18.mapIconId != -1) { // L: 126 - var14 = true; // L: 127 + for (int var16 = 0; var16 < var15.length; ++var16) { + int var17 = var15[var16]; + ObjectComposition var18 = class148.getObjectDefinition(var17); + if (var18.mapIconId != -1) { + var14 = true; break label66; } } - } else if (var13.mapIconId != -1) { // L: 134 - var14 = true; // L: 135 - break label66; // L: 136 + } else if (var13.mapIconId != -1) { + var14 = true; + break label66; } - var14 = false; // L: 138 + var14 = false; } - if (var14) { // L: 140 - this.getIcon(var13, var8, var6, var7, var5); // L: 143 - continue label75; // L: 144 + if (var14) { + this.getIcon(var13, var8, var6, var7, var5); + continue label75; } } } @@ -180,7 +180,7 @@ public class WorldMapRegion { } } - } // L: 151 + } @ObfuscatedName("j") @ObfuscatedSignature( @@ -189,30 +189,30 @@ public class WorldMapRegion { ) @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: 154 - Coord var7 = null; // L: 155 - if (this.worldMapData_0 != null) { // L: 156 - var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 64, var4 + this.worldMapData_0.regionYLow * 64); // L: 157 + Coord var6 = new Coord(var2, var3 + this.regionX * 64, this.regionY * 64 + var4); + Coord var7 = null; + if (this.worldMapData_0 != null) { + var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 64, var4 + this.worldMapData_0.regionYLow * 64); } else { - WorldMapData_1 var8 = (WorldMapData_1)var5; // L: 160 - var7 = new Coord(var2 + var8.minPlane, var8.regionXLow * 64 + var3 + var8.getChunkXLow() * 8, var8.regionYLow * 64 + var4 + var8.getChunkYLow() * 8); // L: 161 + WorldMapData_1 var8 = (WorldMapData_1)var5; + var7 = new Coord(var2 + var8.minPlane, var8.regionXLow * 64 + var3 + var8.getChunkXLow() * 8, var8.regionYLow * 64 + var4 + var8.getChunkYLow() * 8); } WorldMapElement var9; Object var10; - if (var1.transforms != null) { // L: 164 - var10 = new WorldMapIcon_1(var7, var6, var1.id, this); // L: 165 + if (var1.transforms != null) { + var10 = new WorldMapIcon_1(var7, var6, var1.id, this); } else { - var9 = class78.WorldMapElement_get(var1.mapIconId); // L: 168 - var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); // L: 169 + var9 = class78.WorldMapElement_get(var1.mapIconId); + var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); } - var9 = class78.WorldMapElement_get(((AbstractWorldMapIcon)var10).getElement()); // L: 171 - if (var9.field1758) { // L: 172 - this.iconMap.put(new Coord(0, var3, var4), var10); // L: 173 + var9 = class78.WorldMapElement_get(((AbstractWorldMapIcon)var10).getElement()); + if (var9.field1758) { + this.iconMap.put(new Coord(0, var3, var4), var10); } - } // L: 175 + } @ObfuscatedName("w") @ObfuscatedSignature( @@ -221,16 +221,16 @@ public class WorldMapRegion { ) @Export("initWorldMapIcon1s") void initWorldMapIcon1s() { - Iterator var1 = this.iconMap.values().iterator(); // L: 178 + Iterator var1 = this.iconMap.values().iterator(); while (var1.hasNext()) { - AbstractWorldMapIcon var2 = (AbstractWorldMapIcon)var1.next(); // L: 179 - if (var2 instanceof WorldMapIcon_1) { // L: 181 - ((WorldMapIcon_1)var2).init(); // L: 182 + AbstractWorldMapIcon var2 = (AbstractWorldMapIcon)var1.next(); + if (var2 instanceof WorldMapIcon_1) { + ((WorldMapIcon_1)var2).init(); } } - } // L: 186 + } @ObfuscatedName("n") @ObfuscatedSignature( @@ -239,17 +239,17 @@ public class WorldMapRegion { ) @Export("addAllToIconList") void addAllToIconList(List var1) { - Iterator var2 = var1.iterator(); // L: 189 + Iterator var2 = var1.iterator(); - while (var2.hasNext()) { // L: 193 - WorldMapIcon_0 var3 = (WorldMapIcon_0)var2.next(); // L: 190 - if (class78.WorldMapElement_get(var3.element).field1758 && var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) { // L: 192 195 - WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method4551(var3.element)); // L: 196 - this.icon0List.add(var4); // L: 197 + while (var2.hasNext()) { + WorldMapIcon_0 var3 = (WorldMapIcon_0)var2.next(); + if (class78.WorldMapElement_get(var3.element).field1758 && var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) { + WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method4551(var3.element)); + this.icon0List.add(var4); } } - } // L: 201 + } @ObfuscatedName("r") @ObfuscatedSignature( @@ -257,18 +257,18 @@ public class WorldMapRegion { garbageValue = "-1724854251" ) void method4499() { - if (this.worldMapData_0 != null) { // L: 204 - this.worldMapData_0.reset(); // L: 205 + if (this.worldMapData_0 != null) { + this.worldMapData_0.reset(); } else { - Iterator var1 = this.worldMapData1List.iterator(); // L: 208 + Iterator var1 = this.worldMapData1List.iterator(); while (var1.hasNext()) { - WorldMapData_1 var2 = (WorldMapData_1)var1.next(); // L: 209 - var2.reset(); // L: 211 + WorldMapData_1 var2 = (WorldMapData_1)var1.next(); + var2.reset(); } } - } // L: 215 + } @ObfuscatedName("o") @ObfuscatedSignature( @@ -277,35 +277,35 @@ public class WorldMapRegion { ) @Export("loadGeography") boolean loadGeography(AbstractArchive var1) { - this.iconMap.clear(); // L: 218 - if (this.worldMapData_0 != null) { // L: 219 - this.worldMapData_0.loadGeography(var1); // L: 220 - if (this.worldMapData_0.isFullyLoaded()) { // L: 221 - this.getIconsForTiles(0, 0, 64, 64, this.worldMapData_0); // L: 222 - return true; // L: 223 + this.iconMap.clear(); + if (this.worldMapData_0 != null) { + this.worldMapData_0.loadGeography(var1); + if (this.worldMapData_0.isFullyLoaded()) { + this.getIconsForTiles(0, 0, 64, 64, this.worldMapData_0); + return true; } else { - return false; // L: 225 + return false; } } else { - boolean var2 = true; // L: 228 + boolean var2 = true; Iterator var3; WorldMapData_1 var4; - for (var3 = this.worldMapData1List.iterator(); var3.hasNext(); var2 &= var4.isFullyLoaded()) { // L: 229 233 - var4 = (WorldMapData_1)var3.next(); // L: 230 - var4.loadGeography(var1); // L: 232 + for (var3 = this.worldMapData1List.iterator(); var3.hasNext(); var2 &= var4.isFullyLoaded()) { + var4 = (WorldMapData_1)var3.next(); + var4.loadGeography(var1); } - if (var2) { // L: 236 - var3 = this.worldMapData1List.iterator(); // L: 237 + if (var2) { + var3 = this.worldMapData1List.iterator(); while (var3.hasNext()) { - var4 = (WorldMapData_1)var3.next(); // L: 238 - this.getIconsForTiles(var4.getChunkX() * 8, var4.getChunkY() * 8, 8, 8, var4); // L: 240 + var4 = (WorldMapData_1)var3.next(); + this.getIconsForTiles(var4.getChunkX() * 8, var4.getChunkY() * 8, 8, 8, var4); } } - return var2; // L: 244 + return var2; } } @@ -316,47 +316,47 @@ public class WorldMapRegion { ) @Export("drawTile") void drawTile(int var1, WorldMapScaleHandler var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) { - this.pixelsPerTile = var1; // L: 249 - if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { // L: 250 - int var7 = this.regionX; // L: 254 - int var8 = this.regionY; // L: 255 - DemotingHashTable var9 = WorldMapRegion_cachedSprites; // L: 257 - long var10 = (long)(var1 << 16 | var7 << 8 | var8); // L: 260 - SpritePixels var6 = (SpritePixels)var9.get(var10); // L: 262 - if (var6 == null) { // L: 264 - boolean var15 = true; // L: 267 - var15 &= this.loadGeography(var4); // L: 268 + this.pixelsPerTile = var1; + if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { + int var7 = this.regionX; + int var8 = this.regionY; + DemotingHashTable var9 = WorldMapRegion_cachedSprites; + long var10 = (long)(var1 << 16 | var7 << 8 | var8); + SpritePixels var6 = (SpritePixels)var9.get(var10); + if (var6 == null) { + boolean var15 = true; + var15 &= this.loadGeography(var4); int var11; - if (this.worldMapData_0 != null) { // L: 271 - var11 = this.worldMapData_0.groupId; // L: 272 + if (this.worldMapData_0 != null) { + var11 = this.worldMapData_0.groupId; } else { - var11 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; // L: 275 + var11 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; } - var15 &= var5.tryLoadGroup(var11); // L: 277 - if (var15) { // L: 278 - byte[] var16 = var5.takeFileFlat(var11); // L: 279 + var15 &= var5.tryLoadGroup(var11); + if (var15) { + byte[] var16 = var5.takeFileFlat(var11); WorldMapSprite var12; - if (var16 == null) { // L: 282 - var12 = new WorldMapSprite(); // L: 283 + if (var16 == null) { + var12 = new WorldMapSprite(); } else { - var12 = new WorldMapSprite(MouseRecorder.method2161(var16).pixels); // L: 286 + var12 = new WorldMapSprite(MouseRecorder.method2161(var16).pixels); } - SpritePixels var14 = new SpritePixels(this.pixelsPerTile * 64, this.pixelsPerTile * 64); // L: 289 - var14.setRaster(); // L: 290 - if (this.worldMapData_0 != null) { // L: 291 - this.method4561(var2, var3, var12); // L: 292 + SpritePixels var14 = new SpritePixels(this.pixelsPerTile * 64, this.pixelsPerTile * 64); + var14.setRaster(); + if (this.worldMapData_0 != null) { + this.method4561(var2, var3, var12); } else { - this.method4566(var2, var3, var12); // L: 295 + this.method4566(var2, var3, var12); } - ArchiveDiskAction.method5526(var14, this.regionX, this.regionY, this.pixelsPerTile); // L: 297 - this.method4499(); // L: 298 + ArchiveDiskAction.method5526(var14, this.regionX, this.regionY, this.pixelsPerTile); + this.method4499(); } } } - } // L: 251 265 299 + } @ObfuscatedName("d") @ObfuscatedSignature( @@ -364,13 +364,13 @@ public class WorldMapRegion { garbageValue = "-83" ) void method4588(int var1, int var2, int var3, HashSet var4) { - if (var4 == null) { // L: 302 - var4 = new HashSet(); // L: 303 + if (var4 == null) { + var4 = new HashSet(); } - this.drawNonLinkMapIcons(var1, var2, var4, var3); // L: 305 - this.drawMapLinks(var1, var2, var4, var3); // L: 306 - } // L: 307 + this.drawNonLinkMapIcons(var1, var2, var4, var3); + this.drawMapLinks(var1, var2, var4, var3); + } @ObfuscatedName("h") @ObfuscatedSignature( @@ -379,21 +379,21 @@ public class WorldMapRegion { ) @Export("flashElements") void flashElements(HashSet var1, int var2, int var3) { - Iterator var4 = this.iconMap.values().iterator(); // L: 310 + Iterator var4 = this.iconMap.values().iterator(); while (var4.hasNext()) { - AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 311 - if (var5.hasValidElement()) { // L: 313 - int var6 = var5.getElement(); // L: 314 - if (var1.contains(var6)) { // L: 315 - WorldMapElement var7 = class78.WorldMapElement_get(var6); // L: 316 - this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); // L: 317 + AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); + if (var5.hasValidElement()) { + int var6 = var5.getElement(); + if (var1.contains(var6)) { + WorldMapElement var7 = class78.WorldMapElement_get(var6); + this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); } } } - this.method4512(var1, var2, var3); // L: 321 - } // L: 322 + this.method4512(var1, var2, var3); + } @ObfuscatedName("g") @ObfuscatedSignature( @@ -403,20 +403,20 @@ public class WorldMapRegion { void method4561(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { int var4; int var5; - for (var4 = 0; var4 < 64; ++var4) { // L: 325 - for (var5 = 0; var5 < 64; ++var5) { // L: 326 - this.drawTileGround(var4, var5, this.worldMapData_0, var1, var3); // L: 327 - this.method4507(var4, var5, this.worldMapData_0, var1); // L: 328 + for (var4 = 0; var4 < 64; ++var4) { + for (var5 = 0; var5 < 64; ++var5) { + this.drawTileGround(var4, var5, this.worldMapData_0, var1, var3); + this.method4507(var4, var5, this.worldMapData_0, var1); } } - for (var4 = 0; var4 < 64; ++var4) { // L: 331 - for (var5 = 0; var5 < 64; ++var5) { // L: 332 - this.method4505(var4, var5, this.worldMapData_0, var1, var2); // L: 333 + for (var4 = 0; var4 < 64; ++var4) { + for (var5 = 0; var5 < 64; ++var5) { + this.method4505(var4, var5, this.worldMapData_0, var1, var2); } } - } // L: 336 + } @ObfuscatedName("e") @ObfuscatedSignature( @@ -424,35 +424,35 @@ public class WorldMapRegion { garbageValue = "1976683107" ) void method4566(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { - Iterator var4 = this.worldMapData1List.iterator(); // L: 339 + Iterator var4 = this.worldMapData1List.iterator(); WorldMapData_1 var5; int var6; int var7; while (var4.hasNext()) { - var5 = (WorldMapData_1)var4.next(); // L: 340 + var5 = (WorldMapData_1)var4.next(); - for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 342 - for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 343 - this.drawTileGround(var6, var7, var5, var1, var3); // L: 344 - this.method4507(var6, var7, var5, var1); // L: 345 + for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { + for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { + this.drawTileGround(var6, var7, var5, var1, var3); + this.method4507(var6, var7, var5, var1); } } } - var4 = this.worldMapData1List.iterator(); // L: 350 + var4 = this.worldMapData1List.iterator(); while (var4.hasNext()) { - var5 = (WorldMapData_1)var4.next(); // L: 351 + var5 = (WorldMapData_1)var4.next(); - for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 353 - for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 354 - this.method4505(var6, var7, var5, var1, var2); // L: 355 + for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { + for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { + this.method4505(var6, var7, var5, var1, var2); } } } - } // L: 360 + } @ObfuscatedName("a") @ObfuscatedSignature( @@ -460,9 +460,9 @@ public class WorldMapRegion { garbageValue = "-1372993512" ) void method4505(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) { - this.method4510(var1, var2, var3); // L: 363 - this.method4509(var1, var2, var3, var5); // L: 364 - } // L: 365 + this.method4510(var1, var2, var3); + this.method4509(var1, var2, var3, var5); + } @ObfuscatedName("u") @ObfuscatedSignature( @@ -471,28 +471,28 @@ public class WorldMapRegion { ) @Export("drawTileGround") void drawTileGround(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, WorldMapSprite var5) { - int var6 = var3.floorUnderlayIds[0][var1][var2] - 1; // L: 368 - int var7 = var3.floorOverlayIds[0][var1][var2] - 1; // L: 369 - if (var6 == -1 && var7 == -1) { // L: 370 - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, this.backgroundColor); // L: 371 + int var6 = var3.floorUnderlayIds[0][var1][var2] - 1; + int var7 = var3.floorOverlayIds[0][var1][var2] - 1; + if (var6 == -1 && var7 == -1) { + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, this.backgroundColor); } - int var8 = 16711935; // L: 373 - if (var7 != -1) { // L: 374 - var8 = Actor.method2235(var7, this.backgroundColor); // L: 375 + int var8 = 16711935; + if (var7 != -1) { + var8 = Actor.method2235(var7, this.backgroundColor); } - if (var7 > -1 && var3.field2699[0][var1][var2] == 0) { // L: 377 - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); // L: 378 + if (var7 > -1 && var3.field2699[0][var1][var2] == 0) { + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); } else { - int var9 = this.method4508(var1, var2, var3, var5); // L: 381 - if (var7 == -1) { // L: 382 - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); // L: 383 + int var9 = this.method4508(var1, var2, var3, var5); + if (var7 == -1) { + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); } else { - var4.method4907(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field2699[0][var1][var2], var3.field2706[0][var1][var2]); // L: 386 + var4.method4907(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field2699[0][var1][var2], var3.field2706[0][var1][var2]); } } - } // L: 379 384 387 + } @ObfuscatedName("k") @ObfuscatedSignature( @@ -500,19 +500,19 @@ public class WorldMapRegion { garbageValue = "-1920100331" ) void method4507(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) { - for (int var5 = 1; var5 < var3.planes; ++var5) { // L: 390 - int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; // L: 391 - if (var6 > -1) { // L: 392 - int var7 = Actor.method2235(var6, this.backgroundColor); // L: 393 - if (var3.field2699[var5][var1][var2] == 0) { // L: 394 - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); // L: 395 + for (int var5 = 1; var5 < var3.planes; ++var5) { + int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; + if (var6 > -1) { + int var7 = Actor.method2235(var6, this.backgroundColor); + if (var3.field2699[var5][var1][var2] == 0) { + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); } else { - var4.method4907(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field2699[var5][var1][var2], var3.field2706[var5][var1][var2]); // L: 398 + var4.method4907(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field2699[var5][var1][var2], var3.field2706[var5][var1][var2]); } } } - } // L: 402 + } @ObfuscatedName("f") @ObfuscatedSignature( @@ -520,7 +520,7 @@ public class WorldMapRegion { garbageValue = "-2111432629" ) int method4508(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { - return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); // L: 405 406 408 + return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); } @ObfuscatedName("l") @@ -529,36 +529,36 @@ public class WorldMapRegion { garbageValue = "-1600468399" ) void method4509(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { - for (int var5 = 0; var5 < var3.planes; ++var5) { // L: 412 - WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; // L: 413 - if (var6 != null && var6.length != 0) { // L: 414 - WorldMapDecoration[] var7 = var6; // L: 418 + for (int var5 = 0; var5 < var3.planes; ++var5) { + WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; + if (var6 != null && var6.length != 0) { + WorldMapDecoration[] var7 = var6; - for (int var8 = 0; var8 < var7.length; ++var8) { // L: 419 - WorldMapDecoration var9 = var7[var8]; // L: 420 - int var11 = var9.decoration; // L: 423 - boolean var10 = var11 >= WorldMapDecorationType.field3402.id && var11 <= WorldMapDecorationType.field3403.id; // L: 425 - if (!var10) { // L: 428 - int var13 = var9.decoration; // L: 430 - boolean var12 = var13 == WorldMapDecorationType.field3389.id; // L: 432 - if (!var12) { // L: 434 + for (int var8 = 0; var8 < var7.length; ++var8) { + WorldMapDecoration var9 = var7[var8]; + int var11 = var9.decoration; + boolean var10 = var11 >= WorldMapDecorationType.field3402.id && var11 <= WorldMapDecorationType.field3403.id; + if (!var10) { + int var13 = var9.decoration; + boolean var12 = var13 == WorldMapDecorationType.field3389.id; + if (!var12) { continue; } } - ObjectComposition var14 = class148.getObjectDefinition(var9.objectDefinitionId); // L: 436 - if (var14.mapSceneId != -1) { // L: 437 - if (var14.mapSceneId != 46 && var14.mapSceneId != 52) { // L: 438 - var4[var14.mapSceneId].method7732(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); // L: 442 + ObjectComposition var14 = class148.getObjectDefinition(var9.objectDefinitionId); + if (var14.mapSceneId != -1) { + if (var14.mapSceneId != 46 && var14.mapSceneId != 52) { + var4[var14.mapSceneId].method7732(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); } else { - var4[var14.mapSceneId].method7732(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); // L: 439 + var4[var14.mapSceneId].method7732(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); } } } } } - } // L: 450 + } @ObfuscatedName("q") @ObfuscatedSignature( @@ -566,53 +566,53 @@ public class WorldMapRegion { garbageValue = "1344943338" ) void method4510(int var1, int var2, AbstractWorldMapData var3) { - for (int var4 = 0; var4 < var3.planes; ++var4) { // L: 453 - WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; // L: 454 - if (var5 != null && var5.length != 0) { // L: 455 - WorldMapDecoration[] var6 = var5; // L: 459 + for (int var4 = 0; var4 < var3.planes; ++var4) { + WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; + if (var5 != null && var5.length != 0) { + WorldMapDecoration[] var6 = var5; - for (int var7 = 0; var7 < var6.length; ++var7) { // L: 460 - WorldMapDecoration var8 = var6[var7]; // L: 461 - if (AbstractWorldMapIcon.method4863(var8.decoration)) { // L: 463 - ObjectComposition var9 = class148.getObjectDefinition(var8.objectDefinitionId); // L: 464 - int var10 = var9.int1 != 0 ? -3407872 : -3355444; // L: 465 - if (var8.decoration == WorldMapDecorationType.field3391.id) { // L: 466 - this.method4501(var1, var2, var8.rotation, var10); // L: 467 + for (int var7 = 0; var7 < var6.length; ++var7) { + WorldMapDecoration var8 = var6[var7]; + if (AbstractWorldMapIcon.method4863(var8.decoration)) { + ObjectComposition var9 = class148.getObjectDefinition(var8.objectDefinitionId); + int var10 = var9.int1 != 0 ? -3407872 : -3355444; + if (var8.decoration == WorldMapDecorationType.field3391.id) { + this.method4501(var1, var2, var8.rotation, var10); } - if (var8.decoration == WorldMapDecorationType.field3384.id) { // L: 469 - this.method4501(var1, var2, var8.rotation, -3355444); // L: 470 - this.method4501(var1, var2, var8.rotation + 1, var10); // L: 471 + if (var8.decoration == WorldMapDecorationType.field3384.id) { + this.method4501(var1, var2, var8.rotation, -3355444); + this.method4501(var1, var2, var8.rotation + 1, var10); } - if (var8.decoration == WorldMapDecorationType.field3385.id) { // L: 473 - if (var8.rotation == 0) { // L: 474 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var10); + if (var8.decoration == WorldMapDecorationType.field3385.id) { + if (var8.rotation == 0) { + Rasterizer2D.method7649(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var10); } if (var8.rotation == 1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2), 1, var10); // L: 475 + Rasterizer2D.method7649(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2), 1, var10); } - if (var8.rotation == 2) { // L: 476 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); + if (var8.rotation == 2) { + Rasterizer2D.method7649(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); } - if (var8.rotation == 3) { // L: 477 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); + if (var8.rotation == 3) { + Rasterizer2D.method7649(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); } } - if (var8.decoration == WorldMapDecorationType.field3406.id) { // L: 479 - int var11 = var8.rotation % 2; // L: 480 + if (var8.decoration == WorldMapDecorationType.field3406.id) { + int var11 = var8.rotation % 2; int var12; - if (var11 == 0) { // L: 481 - for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 482 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var12, 1, var10); // L: 483 + if (var11 == 0) { + for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { + Rasterizer2D.method7649(var12 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var12, 1, var10); } } else { - for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 487 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, var12 + this.pixelsPerTile * (63 - var2), 1, var10); // L: 488 + for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { + Rasterizer2D.method7649(var12 + this.pixelsPerTile * var1, var12 + this.pixelsPerTile * (63 - var2), 1, var10); } } } @@ -621,7 +621,7 @@ public class WorldMapRegion { } } - } // L: 497 + } @ObfuscatedName("x") @ObfuscatedSignature( @@ -630,27 +630,27 @@ public class WorldMapRegion { ) @Export("drawNonLinkMapIcons") void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) { - float var5 = (float)var4 / 64.0F; // L: 500 - float var6 = var5 / 2.0F; // L: 501 - Iterator var7 = this.iconMap.entrySet().iterator(); // L: 502 + float var5 = (float)var4 / 64.0F; + float var6 = var5 / 2.0F; + Iterator var7 = this.iconMap.entrySet().iterator(); while (var7.hasNext()) { - Entry var8 = (Entry)var7.next(); // L: 503 - Coord var9 = (Coord)var8.getKey(); // L: 505 - int var10 = (int)((float)var1 + (float)var9.x * var5 - var6); // L: 506 - int var11 = (int)((float)(var2 + var4) - (float)var9.y * var5 - var6); // L: 507 - AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); // L: 508 - if (var12 != null && var12.hasValidElement()) { // L: 509 - var12.screenX = var10; // L: 510 - var12.screenY = var11; // L: 511 - WorldMapElement var13 = class78.WorldMapElement_get(var12.getElement()); // L: 512 - if (!var3.contains(var13.getObjectId())) { // L: 513 - this.method4569(var12, var10, var11, var5); // L: 514 + Entry var8 = (Entry)var7.next(); + Coord var9 = (Coord)var8.getKey(); + int var10 = (int)((float)var1 + (float)var9.x * var5 - var6); + int var11 = (int)((float)(var2 + var4) - (float)var9.y * var5 - var6); + AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); + if (var12 != null && var12.hasValidElement()) { + var12.screenX = var10; + var12.screenY = var11; + WorldMapElement var13 = class78.WorldMapElement_get(var12.getElement()); + if (!var3.contains(var13.getObjectId())) { + this.method4569(var12, var10, var11, var5); } } } - } // L: 519 + } @ObfuscatedName("z") @ObfuscatedSignature( @@ -658,19 +658,19 @@ public class WorldMapRegion { garbageValue = "1160918022" ) void method4512(HashSet var1, int var2, int var3) { - Iterator var4 = this.icon0List.iterator(); // L: 522 + Iterator var4 = this.icon0List.iterator(); while (var4.hasNext()) { - AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 523 - if (var5.hasValidElement()) { // L: 525 - WorldMapElement var6 = class78.WorldMapElement_get(var5.getElement()); // L: 526 - if (var6 != null && var1.contains(var6.getObjectId())) { // L: 527 - this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); // L: 528 + AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); + if (var5.hasValidElement()) { + WorldMapElement var6 = class78.WorldMapElement_get(var5.getElement()); + if (var6 != null && var1.contains(var6.getObjectId())) { + this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); } } } - } // L: 532 + } @ObfuscatedName("i") @ObfuscatedSignature( @@ -679,16 +679,16 @@ public class WorldMapRegion { ) @Export("drawBackgroundCircle") void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, int var5) { - SpritePixels var6 = var1.getSpriteBool(false); // L: 535 - if (var6 != null) { // L: 536 - var6.drawTransBgAt(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); // L: 539 - if (var4 % var5 < var5 / 2) { // L: 540 - Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128); // L: 541 - Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256); // L: 542 + SpritePixels var6 = var1.getSpriteBool(false); + if (var6 != null) { + var6.drawTransBgAt(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); + if (var4 % var5 < var5 / 2) { + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128); + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256); } } - } // L: 537 544 + } @ObfuscatedName("y") @ObfuscatedSignature( @@ -696,10 +696,10 @@ public class WorldMapRegion { garbageValue = "99" ) void method4569(AbstractWorldMapIcon var1, int var2, int var3, float var4) { - WorldMapElement var5 = class78.WorldMapElement_get(var1.getElement()); // L: 547 - this.method4515(var5, var2, var3); // L: 548 - this.method4516(var1, var5, var2, var3, var4); // L: 549 - } // L: 550 + WorldMapElement var5 = class78.WorldMapElement_get(var1.getElement()); + this.method4515(var5, var2, var3); + this.method4516(var1, var5, var2, var3, var4); + } @ObfuscatedName("ah") @ObfuscatedSignature( @@ -707,14 +707,14 @@ public class WorldMapRegion { garbageValue = "980896550" ) void method4515(WorldMapElement var1, int var2, int var3) { - SpritePixels var4 = var1.getSpriteBool(false); // L: 553 - if (var4 != null) { // L: 554 - int var5 = this.method4518(var4, var1.horizontalAlignment); // L: 555 - int var6 = this.method4519(var4, var1.verticalAlignment); // L: 556 - var4.drawTransBgAt(var5 + var2, var3 + var6); // L: 557 + SpritePixels var4 = var1.getSpriteBool(false); + if (var4 != null) { + int var5 = this.method4518(var4, var1.horizontalAlignment); + int var6 = this.method4519(var4, var1.verticalAlignment); + var4.drawTransBgAt(var5 + var2, var3 + var6); } - } // L: 559 + } @ObfuscatedName("ao") @ObfuscatedSignature( @@ -722,14 +722,14 @@ public class WorldMapRegion { garbageValue = "87" ) void method4516(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { - WorldMapLabel var6 = var1.getLabel(); // L: 562 - if (var6 != null) { // L: 563 - if (var6.size.method4370(var5)) { // L: 566 - Font var7 = (Font)this.fonts.get(var6.size); // L: 569 - var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1756, 0, 1, 0, var7.ascent / 2); // L: 570 + WorldMapLabel var6 = var1.getLabel(); + if (var6 != null) { + if (var6.size.method4370(var5)) { + Font var7 = (Font)this.fonts.get(var6.size); + var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1756, 0, 1, 0, var7.ascent / 2); } } - } // L: 564 567 571 + } @ObfuscatedName("ab") @ObfuscatedSignature( @@ -738,23 +738,23 @@ public class WorldMapRegion { ) @Export("drawMapLinks") void drawMapLinks(int var1, int var2, HashSet var3, int var4) { - float var5 = (float)var4 / 64.0F; // L: 574 - Iterator var6 = this.icon0List.iterator(); // L: 575 + float var5 = (float)var4 / 64.0F; + Iterator var6 = this.icon0List.iterator(); while (var6.hasNext()) { - AbstractWorldMapIcon var7 = (AbstractWorldMapIcon)var6.next(); // L: 576 - if (var7.hasValidElement()) { // L: 578 - int var8 = var7.coord2.x % 64; // L: 579 - int var9 = var7.coord2.y % 64; // L: 580 - var7.screenX = (int)((float)var1 + var5 * (float)var8); // L: 581 - var7.screenY = (int)((float)var2 + var5 * (float)(63 - var9)); // L: 582 - if (!var3.contains(var7.getElement())) { // L: 583 - this.method4569(var7, var7.screenX, var7.screenY, var5); // L: 586 + AbstractWorldMapIcon var7 = (AbstractWorldMapIcon)var6.next(); + if (var7.hasValidElement()) { + int var8 = var7.coord2.x % 64; + int var9 = var7.coord2.y % 64; + var7.screenX = (int)((float)var1 + var5 * (float)var8); + var7.screenY = (int)((float)var2 + var5 * (float)(63 - var9)); + if (!var3.contains(var7.getElement())) { + this.method4569(var7, var7.screenX, var7.screenY, var5); } } } - } // L: 589 + } @ObfuscatedName("an") @ObfuscatedSignature( @@ -762,13 +762,13 @@ public class WorldMapRegion { garbageValue = "-2104998727" ) int method4518(SpritePixels var1, HorizontalAlignment var2) { - switch(var2.value) { // L: 592 + switch(var2.value) { case 0: - return 0; // L: 595 + return 0; case 2: - return -var1.subWidth / 2; // L: 603 + return -var1.subWidth / 2; default: - return -var1.subWidth; // L: 599 + return -var1.subWidth; } } @@ -778,13 +778,13 @@ public class WorldMapRegion { garbageValue = "-51" ) int method4519(SpritePixels var1, VerticalAlignment var2) { - switch(var2.value) { // L: 609 + switch(var2.value) { case 1: - return -var1.subHeight / 2; // L: 616 + return -var1.subHeight / 2; case 2: - return 0; // L: 620 + return 0; default: - return -var1.subHeight; // L: 612 + return -var1.subHeight; } } @@ -794,8 +794,8 @@ public class WorldMapRegion { garbageValue = "-2073836265" ) WorldMapLabel method4551(int var1) { - WorldMapElement var2 = class78.WorldMapElement_get(var1); // L: 626 - return this.createMapLabel(var2); // L: 627 + WorldMapElement var2 = class78.WorldMapElement_get(var1); + return this.createMapLabel(var2); } @ObfuscatedName("az") @@ -805,35 +805,35 @@ public class WorldMapRegion { ) @Export("createMapLabel") WorldMapLabel createMapLabel(WorldMapElement var1) { - if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { // L: 631 - WorldMapLabelSize var2 = WorldMapLabelSize.method4362(var1.textSize); // L: 634 - if (var2 == null) { // L: 635 - return null; // L: 636 + if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { + WorldMapLabelSize var2 = WorldMapLabelSize.method4362(var1.textSize); + if (var2 == null) { + return null; } else { - Font var3 = (Font)this.fonts.get(var2); // L: 638 - if (var3 == null) { // L: 639 - return null; // L: 640 + Font var3 = (Font)this.fonts.get(var2); + if (var3 == null) { + return null; } else { - int var4 = var3.lineCount(var1.name, 1000000); // L: 642 - String[] var5 = new String[var4]; // L: 643 - var3.breakLines(var1.name, (int[])null, var5); // L: 644 - int var6 = var5.length * var3.ascent / 2; // L: 645 - int var7 = 0; // L: 646 - String[] var8 = var5; // L: 648 + int var4 = var3.lineCount(var1.name, 1000000); + String[] var5 = new String[var4]; + var3.breakLines(var1.name, (int[])null, var5); + int var6 = var5.length * var3.ascent / 2; + int var7 = 0; + String[] var8 = var5; - for (int var9 = 0; var9 < var8.length; ++var9) { // L: 649 - String var10 = var8[var9]; // L: 650 - int var11 = var3.stringWidth(var10); // L: 652 - if (var11 > var7) { // L: 653 - var7 = var11; // L: 654 + for (int var9 = 0; var9 < var8.length; ++var9) { + String var10 = var8[var9]; + int var11 = var3.stringWidth(var10); + if (var11 > var7) { + var7 = var11; } } - return new WorldMapLabel(var1.name, var7, var6, var2); // L: 659 + return new WorldMapLabel(var1.name, var7, var6, var2); } } } else { - return null; // L: 632 + return null; } } @@ -843,31 +843,31 @@ public class WorldMapRegion { garbageValue = "2" ) List method4522(int var1, int var2, int var3, int var4, int var5) { - LinkedList var6 = new LinkedList(); // L: 663 - if (var4 >= var1 && var5 >= var2) { // L: 664 - if (var4 < var3 + var1 && var5 < var3 + var2) { // L: 665 - Iterator var7 = this.iconMap.values().iterator(); // L: 666 + LinkedList var6 = new LinkedList(); + if (var4 >= var1 && var5 >= var2) { + if (var4 < var3 + var1 && var5 < var3 + var2) { + Iterator var7 = this.iconMap.values().iterator(); AbstractWorldMapIcon var8; while (var7.hasNext()) { - var8 = (AbstractWorldMapIcon)var7.next(); // L: 667 - if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 669 - var6.add(var8); // L: 670 + var8 = (AbstractWorldMapIcon)var7.next(); + if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { + var6.add(var8); } } - var7 = this.icon0List.iterator(); // L: 674 + var7 = this.icon0List.iterator(); while (var7.hasNext()) { - var8 = (AbstractWorldMapIcon)var7.next(); // L: 675 - if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 677 - var6.add(var8); // L: 678 + var8 = (AbstractWorldMapIcon)var7.next(); + if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { + var6.add(var8); } } - return var6; // L: 682 + return var6; } else { - return var6; // L: 673 + return var6; } } else { return var6; @@ -881,10 +881,10 @@ public class WorldMapRegion { ) @Export("icons") List icons() { - LinkedList var1 = new LinkedList(); // L: 686 - var1.addAll(this.icon0List); // L: 687 - var1.addAll(this.iconMap.values()); // L: 688 - return var1; // L: 689 + LinkedList var1 = new LinkedList(); + var1.addAll(this.icon0List); + var1.addAll(this.iconMap.values()); + return var1; } @ObfuscatedName("ap") @@ -893,22 +893,22 @@ public class WorldMapRegion { garbageValue = "46" ) void method4501(int var1, int var2, int var3, int var4) { - var3 %= 4; // L: 693 - if (var3 == 0) { // L: 694 - Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); + var3 %= 4; + if (var3 == 0) { + Rasterizer2D.method7709(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } - if (var3 == 1) { // L: 695 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); + if (var3 == 1) { + Rasterizer2D.method7649(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } - if (var3 == 2) { // L: 696 - Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); + if (var3 == 2) { + Rasterizer2D.method7709(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: 697 + Rasterizer2D.method7649(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4); } - } // L: 698 + } } diff --git a/runescape-client/src/main/java/WorldMapScaleHandler.java b/runescape-client/src/main/java/WorldMapScaleHandler.java index 79e02abc75..cad86b1ca7 100644 --- a/runescape-client/src/main/java/WorldMapScaleHandler.java +++ b/runescape-client/src/main/java/WorldMapScaleHandler.java @@ -24,8 +24,8 @@ public class WorldMapScaleHandler { byte[][][] tileTemplates; WorldMapScaleHandler(int var1) { - this.pixelsPerTile = var1; // L: 10 - } // L: 11 + this.pixelsPerTile = var1; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -33,12 +33,12 @@ public class WorldMapScaleHandler { garbageValue = "-14" ) void method4907(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.method4895(var8, var7); // L: 15 - var7 = this.method4897(var7); // L: 16 - Rasterizer2D.Rasterizer2D_drawGradientPixels(var1, var2, var5, var6, var3, var4, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile); // L: 17 + if (var7 != 0 && this.pixelsPerTile != 0 && this.tileTemplates != null) { + var8 = this.method4895(var8, var7); + var7 = this.method4897(var7); + Rasterizer2D.Rasterizer2D_drawGradientPixels(var1, var2, var5, var6, var3, var4, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile); } - } // L: 18 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -46,19 +46,19 @@ public class WorldMapScaleHandler { garbageValue = "-1888183468" ) int method4895(int var1, int var2) { - if (var2 == 9) { // L: 21 + if (var2 == 9) { var1 = var1 + 1 & 3; } - if (var2 == 10) { // L: 22 + if (var2 == 10) { var1 = var1 + 3 & 3; } - if (var2 == 11) { // L: 23 + if (var2 == 11) { var1 = var1 + 3 & 3; } - return var1; // L: 24 + return var1; } @ObfuscatedName("p") @@ -67,10 +67,10 @@ public class WorldMapScaleHandler { garbageValue = "-1710569700" ) int method4897(int var1) { - if (var1 != 9 && var1 != 10) { // L: 28 - return var1 == 11 ? 8 : var1; // L: 29 + if (var1 != 9 && var1 != 10) { + return var1 == 11 ? 8 : var1; } else { - return 1; // L: 30 + return 1; } } @@ -81,18 +81,18 @@ public class WorldMapScaleHandler { ) @Export("init") void init() { - if (this.tileTemplates == null) { // L: 34 - this.tileTemplates = new byte[8][4][]; // L: 37 - this.init0(); // L: 38 - this.init1(); // L: 39 - this.init2(); // L: 40 - this.init3(); // L: 41 - this.init4(); // L: 42 - this.init5(); // L: 43 - this.init6(); // L: 44 - this.init7(); // L: 45 + if (this.tileTemplates == null) { + this.tileTemplates = new byte[8][4][]; + this.init0(); + this.init1(); + this.init2(); + this.init3(); + this.init4(); + this.init5(); + this.init6(); + this.init7(); } - } // L: 35 46 + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -101,65 +101,65 @@ public class WorldMapScaleHandler { ) @Export("init0") void init0() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 49 - int var2 = 0; // L: 50 + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + int var2 = 0; int var3; int var4; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 51 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 52 - if (var4 <= var3) { // L: 53 - var1[var2] = -1; - } - - ++var2; // L: 54 - } - } - - this.tileTemplates[0][0] = var1; // L: 57 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 58 - var2 = 0; // L: 59 - - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 60 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 61 + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { if (var4 <= var3) { - var1[var2] = -1; // L: 62 - } - - ++var2; // L: 63 - } - } - - this.tileTemplates[0][1] = var1; // L: 66 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 67 - var2 = 0; // L: 68 - - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 69 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 70 - if (var4 >= var3) { // L: 71 var1[var2] = -1; } - ++var2; // L: 72 + ++var2; } } - this.tileTemplates[0][2] = var1; // L: 75 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 76 - var2 = 0; // L: 77 + this.tileTemplates[0][0] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 78 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 79 - if (var4 >= var3) { // L: 80 + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 <= var3) { var1[var2] = -1; } - ++var2; // L: 81 + ++var2; } } - this.tileTemplates[0][3] = var1; // L: 84 - } // L: 85 + this.tileTemplates[0][1] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; + + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 >= var3) { + var1[var2] = -1; + } + + ++var2; + } + } + + this.tileTemplates[0][2] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; + + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 >= var3) { + var1[var2] = -1; + } + + ++var2; + } + } + + this.tileTemplates[0][3] = var1; + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -168,69 +168,69 @@ public class WorldMapScaleHandler { ) @Export("init1") void init1() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 88 - int var2 = 0; // L: 89 + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + int var2 = 0; int var3; int var4; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 90 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 91 - if (var4 <= var3 >> 1) { // L: 92 + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 <= var3 >> 1) { var1[var2] = -1; } - ++var2; // L: 93 + ++var2; } } - this.tileTemplates[1][0] = var1; // L: 96 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 97 - var2 = 0; // L: 98 + this.tileTemplates[1][0] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 99 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 100 - if (var2 >= 0 && var2 < var1.length) { // L: 101 - if (var4 >= var3 << 1) { // L: 105 + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var2 >= 0 && var2 < var1.length) { + if (var4 >= var3 << 1) { var1[var2] = -1; } - ++var2; // L: 106 + ++var2; } else { - ++var2; // L: 102 + ++var2; } } } - this.tileTemplates[1][1] = var1; // L: 109 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 110 - var2 = 0; // L: 111 + this.tileTemplates[1][1] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 112 - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 113 - if (var4 <= var3 >> 1) { // L: 114 + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 <= var3 >> 1) { var1[var2] = -1; } - ++var2; // L: 115 + ++var2; } } - this.tileTemplates[1][2] = var1; // L: 118 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 119 - var2 = 0; // L: 120 + this.tileTemplates[1][2] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 121 - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 122 - if (var4 >= var3 << 1) { // L: 123 + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 >= var3 << 1) { var1[var2] = -1; } - ++var2; // L: 124 + ++var2; } } - this.tileTemplates[1][3] = var1; // L: 127 - } // L: 128 + this.tileTemplates[1][3] = var1; + } @ObfuscatedName("j") @ObfuscatedSignature( @@ -239,65 +239,65 @@ public class WorldMapScaleHandler { ) @Export("init2") void init2() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 131 - int var2 = 0; // L: 132 + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + int var2 = 0; int var3; int var4; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 133 - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 134 - if (var4 <= var3 >> 1) { // L: 135 + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 <= var3 >> 1) { var1[var2] = -1; } - ++var2; // L: 136 + ++var2; } } - this.tileTemplates[2][0] = var1; // L: 139 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 140 - var2 = 0; // L: 141 + this.tileTemplates[2][0] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 142 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 143 + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { if (var4 >= var3 << 1) { - var1[var2] = -1; // L: 144 - } - - ++var2; // L: 145 - } - } - - this.tileTemplates[2][1] = var1; // L: 148 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 149 - var2 = 0; // L: 150 - - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 151 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 152 - if (var4 <= var3 >> 1) { // L: 153 var1[var2] = -1; } - ++var2; // L: 154 + ++var2; } } - this.tileTemplates[2][2] = var1; // L: 157 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 158 - var2 = 0; // L: 159 + this.tileTemplates[2][1] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 160 - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 161 - if (var4 >= var3 << 1) { // L: 162 + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 <= var3 >> 1) { var1[var2] = -1; } - ++var2; // L: 163 + ++var2; } } - this.tileTemplates[2][3] = var1; // L: 166 - } // L: 167 + this.tileTemplates[2][2] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; + + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 >= var3 << 1) { + var1[var2] = -1; + } + + ++var2; + } + } + + this.tileTemplates[2][3] = var1; + } @ObfuscatedName("w") @ObfuscatedSignature( @@ -306,65 +306,65 @@ public class WorldMapScaleHandler { ) @Export("init3") void init3() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 170 - int var2 = 0; // L: 171 + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + int var2 = 0; int var3; int var4; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 172 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 173 - if (var4 >= var3 >> 1) { // L: 174 + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 >= var3 >> 1) { var1[var2] = -1; } - ++var2; // L: 175 + ++var2; } } - this.tileTemplates[3][0] = var1; // L: 178 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 179 - var2 = 0; // L: 180 + this.tileTemplates[3][0] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 181 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 182 - if (var4 <= var3 << 1) { // L: 183 + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 <= var3 << 1) { var1[var2] = -1; } - ++var2; // L: 184 + ++var2; } } - this.tileTemplates[3][1] = var1; // L: 187 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 188 - var2 = 0; // L: 189 + this.tileTemplates[3][1] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 190 - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 191 - if (var4 >= var3 >> 1) { // L: 192 + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 >= var3 >> 1) { var1[var2] = -1; } - ++var2; // L: 193 + ++var2; } } - this.tileTemplates[3][2] = var1; // L: 196 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 197 - var2 = 0; // L: 198 + this.tileTemplates[3][2] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 199 - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 200 - if (var4 <= var3 << 1) { // L: 201 + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 <= var3 << 1) { var1[var2] = -1; } - ++var2; // L: 202 + ++var2; } } - this.tileTemplates[3][3] = var1; // L: 205 - } // L: 206 + this.tileTemplates[3][3] = var1; + } @ObfuscatedName("n") @ObfuscatedSignature( @@ -373,65 +373,65 @@ public class WorldMapScaleHandler { ) @Export("init4") void init4() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 209 - int var2 = 0; // L: 210 + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + int var2 = 0; int var3; int var4; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 211 - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 212 - if (var4 >= var3 >> 1) { // L: 213 + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 >= var3 >> 1) { var1[var2] = -1; } - ++var2; // L: 214 + ++var2; } } - this.tileTemplates[4][0] = var1; // L: 217 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 218 - var2 = 0; // L: 219 + this.tileTemplates[4][0] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 220 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 221 - if (var4 <= var3 << 1) { // L: 222 + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 <= var3 << 1) { var1[var2] = -1; } - ++var2; // L: 223 + ++var2; } } - this.tileTemplates[4][1] = var1; // L: 226 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 227 - var2 = 0; // L: 228 + this.tileTemplates[4][1] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 229 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 230 - if (var4 >= var3 >> 1) { // L: 231 + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 >= var3 >> 1) { var1[var2] = -1; } - ++var2; // L: 232 + ++var2; } } - this.tileTemplates[4][2] = var1; // L: 235 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 236 - var2 = 0; // L: 237 + this.tileTemplates[4][2] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var2 = 0; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 238 - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 239 - if (var4 <= var3 << 1) { // L: 240 + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 <= var3 << 1) { var1[var2] = -1; } - ++var2; // L: 241 + ++var2; } } - this.tileTemplates[4][3] = var1; // L: 244 - } // L: 245 + this.tileTemplates[4][3] = var1; + } @ObfuscatedName("r") @ObfuscatedSignature( @@ -440,67 +440,67 @@ public class WorldMapScaleHandler { ) @Export("init5") void init5() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 248 - boolean var2 = false; // L: 249 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 250 - int var5 = 0; // L: 251 + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + boolean var2 = false; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + int var5 = 0; int var3; int var4; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 252 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 253 - if (var4 <= this.pixelsPerTile / 2) { // L: 254 + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 <= this.pixelsPerTile / 2) { var1[var5] = -1; } - ++var5; // L: 255 + ++var5; } } - this.tileTemplates[5][0] = var1; // L: 258 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 259 - var5 = 0; // L: 260 + this.tileTemplates[5][0] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var5 = 0; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 261 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 262 - if (var3 <= this.pixelsPerTile / 2) { // L: 263 + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var3 <= this.pixelsPerTile / 2) { var1[var5] = -1; } - ++var5; // L: 264 + ++var5; } } - this.tileTemplates[5][1] = var1; // L: 267 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 268 - var5 = 0; // L: 269 + this.tileTemplates[5][1] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var5 = 0; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 270 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 271 - if (var4 >= this.pixelsPerTile / 2) { // L: 272 + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 >= this.pixelsPerTile / 2) { var1[var5] = -1; } - ++var5; // L: 273 + ++var5; } } - this.tileTemplates[5][2] = var1; // L: 276 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 277 - var5 = 0; // L: 278 + this.tileTemplates[5][2] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var5 = 0; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 279 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 280 - if (var3 >= this.pixelsPerTile / 2) { // L: 281 + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var3 >= this.pixelsPerTile / 2) { var1[var5] = -1; } - ++var5; // L: 282 + ++var5; } } - this.tileTemplates[5][3] = var1; // L: 285 - } // L: 286 + this.tileTemplates[5][3] = var1; + } @ObfuscatedName("o") @ObfuscatedSignature( @@ -509,67 +509,67 @@ public class WorldMapScaleHandler { ) @Export("init6") void init6() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 289 - boolean var2 = false; // L: 290 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 291 - int var5 = 0; // L: 292 + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + boolean var2 = false; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + int var5 = 0; int var3; int var4; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 293 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 294 - if (var4 <= var3 - this.pixelsPerTile / 2) { // L: 295 + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 <= var3 - this.pixelsPerTile / 2) { var1[var5] = -1; } - ++var5; // L: 296 + ++var5; } } - this.tileTemplates[6][0] = var1; // L: 299 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 300 - var5 = 0; // L: 301 + this.tileTemplates[6][0] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var5 = 0; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 302 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 303 - if (var4 <= var3 - this.pixelsPerTile / 2) { // L: 304 + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 <= var3 - this.pixelsPerTile / 2) { var1[var5] = -1; } - ++var5; // L: 305 + ++var5; } } - this.tileTemplates[6][1] = var1; // L: 308 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 309 - var5 = 0; // L: 310 + this.tileTemplates[6][1] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var5 = 0; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 311 - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 312 - if (var4 <= var3 - this.pixelsPerTile / 2) { // L: 313 + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 <= var3 - this.pixelsPerTile / 2) { var1[var5] = -1; } - ++var5; // L: 314 + ++var5; } } - this.tileTemplates[6][2] = var1; // L: 317 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 318 - var5 = 0; // L: 319 + this.tileTemplates[6][2] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var5 = 0; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 320 - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 321 - if (var4 <= var3 - this.pixelsPerTile / 2) { // L: 322 + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 <= var3 - this.pixelsPerTile / 2) { var1[var5] = -1; } - ++var5; // L: 323 + ++var5; } } - this.tileTemplates[6][3] = var1; // L: 326 - } // L: 327 + this.tileTemplates[6][3] = var1; + } @ObfuscatedName("v") @ObfuscatedSignature( @@ -578,65 +578,65 @@ public class WorldMapScaleHandler { ) @Export("init7") void init7() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 330 - boolean var2 = false; // L: 331 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 332 - int var5 = 0; // L: 333 + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + boolean var2 = false; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + int var5 = 0; int var3; int var4; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 334 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 335 - if (var4 >= var3 - this.pixelsPerTile / 2) { // L: 336 + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 >= var3 - this.pixelsPerTile / 2) { var1[var5] = -1; } - ++var5; // L: 337 + ++var5; } } - this.tileTemplates[7][0] = var1; // L: 340 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 341 - var5 = 0; // L: 342 + this.tileTemplates[7][0] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var5 = 0; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 343 - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 344 - if (var4 >= var3 - this.pixelsPerTile / 2) { // L: 345 + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + if (var4 >= var3 - this.pixelsPerTile / 2) { var1[var5] = -1; } - ++var5; // L: 346 + ++var5; } } - this.tileTemplates[7][1] = var1; // L: 349 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 350 - var5 = 0; // L: 351 + this.tileTemplates[7][1] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var5 = 0; - 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) { // L: 354 + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 >= var3 - this.pixelsPerTile / 2) { var1[var5] = -1; } - ++var5; // L: 355 + ++var5; } } - this.tileTemplates[7][2] = var1; // L: 358 - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 359 - var5 = 0; // L: 360 + this.tileTemplates[7][2] = var1; + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; + var5 = 0; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 361 - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 362 - if (var4 >= var3 - this.pixelsPerTile / 2) { // L: 363 + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { + if (var4 >= var3 - this.pixelsPerTile / 2) { var1[var5] = -1; } - ++var5; // L: 364 + ++var5; } } - this.tileTemplates[7][3] = var1; // L: 367 - } // L: 368 + this.tileTemplates[7][3] = var1; + } } diff --git a/runescape-client/src/main/java/WorldMapSection0.java b/runescape-client/src/main/java/WorldMapSection0.java index 9a14df83d3..b309dc71a8 100644 --- a/runescape-client/src/main/java/WorldMapSection0.java +++ b/runescape-client/src/main/java/WorldMapSection0.java @@ -93,7 +93,7 @@ public class WorldMapSection0 implements WorldMapSection { int newChunkYHigh; WorldMapSection0() { - } // L: 22 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -102,23 +102,23 @@ public class WorldMapSection0 implements WorldMapSection { ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.newX) { // L: 26 + if (var1.regionLowX > this.newX) { var1.regionLowX = this.newX; } if (var1.regionHighX < this.newX) { - var1.regionHighX = this.newX; // L: 27 + var1.regionHighX = this.newX; } - if (var1.regionLowY > this.newY) { // L: 28 + if (var1.regionLowY > this.newY) { var1.regionLowY = this.newY; } - if (var1.regionHighY < this.newY) { // L: 29 + if (var1.regionHighY < this.newY) { var1.regionHighY = this.newY; } - } // L: 30 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -127,10 +127,10 @@ public class WorldMapSection0 implements WorldMapSection { ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.oldZ && var1 < this.newZ + this.oldZ) { // 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 + if (var1 >= this.oldZ && var1 < this.newZ + this.oldZ) { + return var2 >= (this.oldX << 6) + (this.oldChunkXLow << 3) && var2 <= (this.oldX << 6) + (this.oldChunkXHigh << 3) + 7 && var3 >= (this.oldY << 6) + (this.oldChunkYLow << 3) && var3 <= (this.oldY << 6) + (this.oldChunkYHigh << 3) + 7; } else { - return false; // L: 35 + return false; } } @@ -141,7 +141,7 @@ public class WorldMapSection0 implements WorldMapSection { ) @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: 42 + return var1 >= (this.newX << 6) + (this.newChunkXLow << 3) && var1 <= (this.newX << 6) + (this.newChunkXHigh << 3) + 7 && var2 >= (this.newY << 6) + (this.newChunkYLow << 3) && var2 <= (this.newY << 6) + (this.newChunkYHigh << 3) + 7; } @ObfuscatedName("m") @@ -151,11 +151,11 @@ public class WorldMapSection0 implements WorldMapSection { ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { - if (!this.containsCoord(var1, var2, var3)) { // L: 47 - return null; // L: 48 + if (!this.containsCoord(var1, var2, var3)) { + return null; } 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: 50 51 52 - return var4; // L: 53 + 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)}; + return var4; } } @@ -166,12 +166,12 @@ public class WorldMapSection0 implements WorldMapSection { ) @Export("coord") public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { // L: 58 - return null; // L: 59 + if (!this.containsPosition(var1, var2)) { + return null; } else { - 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 + int var3 = this.oldX * 64 - this.newX * 64 + (this.oldChunkXLow * 8 - this.newChunkXLow * 8) + var1; + int var4 = var2 + (this.oldY * 64 - this.newY * 64) + (this.oldChunkYLow * 8 - this.newChunkYLow * 8); + return new Coord(this.oldZ, var3, var4); } } @@ -182,22 +182,22 @@ public class WorldMapSection0 implements WorldMapSection { ) @Export("read") public void read(Buffer var1) { - 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 + this.oldZ = var1.readUnsignedByte(); + this.newZ = var1.readUnsignedByte(); + this.oldX = var1.readUnsignedShort(); + this.oldChunkXLow = var1.readUnsignedByte(); + this.oldChunkXHigh = var1.readUnsignedByte(); + this.oldY = var1.readUnsignedShort(); + this.oldChunkYLow = var1.readUnsignedByte(); + this.oldChunkYHigh = var1.readUnsignedByte(); + this.newX = var1.readUnsignedShort(); + this.newChunkXLow = var1.readUnsignedByte(); + this.newChunkXHigh = var1.readUnsignedByte(); + this.newY = var1.readUnsignedShort(); + this.newChunkYLow = var1.readUnsignedByte(); + this.newChunkYHigh = var1.readUnsignedByte(); + this.postRead(); + } @ObfuscatedName("j") @ObfuscatedSignature( @@ -206,7 +206,7 @@ public class WorldMapSection0 implements WorldMapSection { ) @Export("postRead") void postRead() { - } // L: 85 + } @ObfuscatedName("w") @ObfuscatedSignature( @@ -215,68 +215,68 @@ public class WorldMapSection0 implements WorldMapSection { ) @Export("SpriteBuffer_decode") static void SpriteBuffer_decode(byte[] var0) { - Buffer var1 = new Buffer(var0); // L: 102 - var1.offset = var0.length - 2; // L: 103 - class440.SpriteBuffer_spriteCount = var1.readUnsignedShort(); // L: 104 - class141.SpriteBuffer_xOffsets = new int[class440.SpriteBuffer_spriteCount]; // L: 105 - RouteStrategy.SpriteBuffer_yOffsets = new int[class440.SpriteBuffer_spriteCount]; // L: 106 - class432.SpriteBuffer_spriteWidths = new int[class440.SpriteBuffer_spriteCount]; // L: 107 - class330.SpriteBuffer_spriteHeights = new int[class440.SpriteBuffer_spriteCount]; // L: 108 - class369.SpriteBuffer_pixels = new byte[class440.SpriteBuffer_spriteCount][]; // L: 109 - var1.offset = var0.length - 7 - class440.SpriteBuffer_spriteCount * 8; // L: 110 - class432.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); // L: 111 - class432.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); // L: 112 - int var2 = (var1.readUnsignedByte() & 255) + 1; // L: 113 + Buffer var1 = new Buffer(var0); + var1.offset = var0.length - 2; + class440.SpriteBuffer_spriteCount = var1.readUnsignedShort(); + class141.SpriteBuffer_xOffsets = new int[class440.SpriteBuffer_spriteCount]; + RouteStrategy.SpriteBuffer_yOffsets = new int[class440.SpriteBuffer_spriteCount]; + class432.SpriteBuffer_spriteWidths = new int[class440.SpriteBuffer_spriteCount]; + class330.SpriteBuffer_spriteHeights = new int[class440.SpriteBuffer_spriteCount]; + class369.SpriteBuffer_pixels = new byte[class440.SpriteBuffer_spriteCount][]; + var1.offset = var0.length - 7 - class440.SpriteBuffer_spriteCount * 8; + class432.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); + class432.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); + int var2 = (var1.readUnsignedByte() & 255) + 1; int var3; - for (var3 = 0; var3 < class440.SpriteBuffer_spriteCount; ++var3) { // L: 114 + for (var3 = 0; var3 < class440.SpriteBuffer_spriteCount; ++var3) { class141.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); } - for (var3 = 0; var3 < class440.SpriteBuffer_spriteCount; ++var3) { // L: 115 + for (var3 = 0; var3 < class440.SpriteBuffer_spriteCount; ++var3) { RouteStrategy.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); } - for (var3 = 0; var3 < class440.SpriteBuffer_spriteCount; ++var3) { // L: 116 + for (var3 = 0; var3 < class440.SpriteBuffer_spriteCount; ++var3) { class432.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); } - for (var3 = 0; var3 < class440.SpriteBuffer_spriteCount; ++var3) { // L: 117 + for (var3 = 0; var3 < class440.SpriteBuffer_spriteCount; ++var3) { class330.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); } - var1.offset = var0.length - 7 - class440.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; // L: 118 - class432.SpriteBuffer_spritePalette = new int[var2]; // L: 119 + var1.offset = var0.length - 7 - class440.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; + class432.SpriteBuffer_spritePalette = new int[var2]; - for (var3 = 1; var3 < var2; ++var3) { // L: 120 - class432.SpriteBuffer_spritePalette[var3] = var1.readMedium(); // L: 121 - if (class432.SpriteBuffer_spritePalette[var3] == 0) { // L: 122 + for (var3 = 1; var3 < var2; ++var3) { + class432.SpriteBuffer_spritePalette[var3] = var1.readMedium(); + if (class432.SpriteBuffer_spritePalette[var3] == 0) { class432.SpriteBuffer_spritePalette[var3] = 1; } } - var1.offset = 0; // L: 124 + var1.offset = 0; - for (var3 = 0; var3 < class440.SpriteBuffer_spriteCount; ++var3) { // L: 125 - int var4 = class432.SpriteBuffer_spriteWidths[var3]; // L: 126 - int var5 = class330.SpriteBuffer_spriteHeights[var3]; // L: 127 - int var6 = var5 * var4; // L: 128 - byte[] var7 = new byte[var6]; // L: 129 - class369.SpriteBuffer_pixels[var3] = var7; // L: 130 - int var8 = var1.readUnsignedByte(); // L: 131 + for (var3 = 0; var3 < class440.SpriteBuffer_spriteCount; ++var3) { + int var4 = class432.SpriteBuffer_spriteWidths[var3]; + int var5 = class330.SpriteBuffer_spriteHeights[var3]; + int var6 = var5 * var4; + byte[] var7 = new byte[var6]; + class369.SpriteBuffer_pixels[var3] = var7; + int var8 = var1.readUnsignedByte(); int var9; - if (var8 == 0) { // L: 132 - for (var9 = 0; var9 < var6; ++var9) { // L: 133 + if (var8 == 0) { + for (var9 = 0; var9 < var6; ++var9) { var7[var9] = var1.readByte(); } - } else if (var8 == 1) { // L: 135 - for (var9 = 0; var9 < var4; ++var9) { // L: 136 - for (int var10 = 0; var10 < var5; ++var10) { // L: 137 - var7[var9 + var4 * var10] = var1.readByte(); // L: 138 + } else if (var8 == 1) { + for (var9 = 0; var9 < var4; ++var9) { + for (int var10 = 0; var10 < var5; ++var10) { + var7[var9 + var4 * var10] = var1.readByte(); } } } } - } // L: 143 + } } diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index fd2cb7c010..c4252f8423 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -51,7 +51,7 @@ public class WorldMapSection1 implements WorldMapSection { int regionEndY; WorldMapSection1() { - } // L: 14 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -60,23 +60,23 @@ public class WorldMapSection1 implements WorldMapSection { ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.regionEndX) { // L: 18 + if (var1.regionLowX > this.regionEndX) { var1.regionLowX = this.regionEndX; } if (var1.regionHighX < this.regionEndX) { - var1.regionHighX = this.regionEndX; // L: 19 + var1.regionHighX = this.regionEndX; } - if (var1.regionLowY > this.regionEndY) { // L: 20 + if (var1.regionLowY > this.regionEndY) { var1.regionLowY = this.regionEndY; } - if (var1.regionHighY < this.regionEndY) { // L: 21 + if (var1.regionHighY < this.regionEndY) { var1.regionHighY = this.regionEndY; } - } // L: 22 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -85,10 +85,10 @@ public class WorldMapSection1 implements WorldMapSection { ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.minPlane && var1 < this.planes + this.minPlane) { // L: 26 - return var2 >> 6 == this.regionStartX && var3 >> 6 == this.regionStartY; // L: 29 + if (var1 >= this.minPlane && var1 < this.planes + this.minPlane) { + return var2 >> 6 == this.regionStartX && var3 >> 6 == this.regionStartY; } else { - return false; // L: 27 + return false; } } @@ -99,7 +99,7 @@ public class WorldMapSection1 implements WorldMapSection { ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >> 6 == this.regionEndX && var2 >> 6 == this.regionEndY; // L: 34 + return var1 >> 6 == this.regionEndX && var2 >> 6 == this.regionEndY; } @ObfuscatedName("m") @@ -109,11 +109,11 @@ public class WorldMapSection1 implements WorldMapSection { ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { - if (!this.containsCoord(var1, var2, var3)) { // L: 39 - return null; // L: 40 + if (!this.containsCoord(var1, var2, var3)) { + return null; } else { - 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 + int[] var4 = new int[]{var2 + (this.regionEndX * 64 - this.regionStartX * 64), var3 + (this.regionEndY * 64 - this.regionStartY * 64)}; + return var4; } } @@ -124,12 +124,12 @@ public class WorldMapSection1 implements WorldMapSection { ) @Export("coord") public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { // L: 50 - return null; // L: 51 + if (!this.containsPosition(var1, var2)) { + return null; } else { - 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 + int var3 = this.regionStartX * 64 - this.regionEndX * 64 + var1; + int var4 = var2 + (this.regionStartY * 64 - this.regionEndY * 64); + return new Coord(this.minPlane, var3, var4); } } @@ -140,14 +140,14 @@ public class WorldMapSection1 implements WorldMapSection { ) @Export("read") public void read(Buffer var1) { - 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 + this.minPlane = var1.readUnsignedByte(); + this.planes = var1.readUnsignedByte(); + this.regionStartX = var1.readUnsignedShort(); + this.regionStartY = var1.readUnsignedShort(); + this.regionEndX = var1.readUnsignedShort(); + this.regionEndY = var1.readUnsignedShort(); + this.postRead(); + } @ObfuscatedName("j") @ObfuscatedSignature( @@ -156,7 +156,7 @@ public class WorldMapSection1 implements WorldMapSection { ) @Export("postRead") void postRead() { - } // L: 69 + } @ObfuscatedName("kb") @ObfuscatedSignature( @@ -164,21 +164,21 @@ public class WorldMapSection1 implements WorldMapSection { garbageValue = "349431240" ) static final void method4831() { - for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 12447 - Player var1 = Client.players[Players.Players_indices[var0]]; // L: 12448 - var1.clearIsFriend(); // L: 12449 + for (int var0 = 0; var0 < Players.Players_count; ++var0) { + Player var1 = Client.players[Players.Players_indices[var0]]; + var1.clearIsFriend(); } - Iterator var2 = Messages.Messages_hashTable.iterator(); // L: 12452 + Iterator var2 = Messages.Messages_hashTable.iterator(); while (var2.hasNext()) { - Message var3 = (Message)var2.next(); // L: 12453 - var3.clearIsFromFriend(); // L: 12455 + Message var3 = (Message)var2.next(); + var3.clearIsFromFriend(); } - if (Players.friendsChat != null) { // L: 12459 - Players.friendsChat.clearFriends(); // L: 12460 + if (Players.friendsChat != null) { + Players.friendsChat.clearFriends(); } - } // L: 12462 + } } diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index b4e3f1c8f1..a8cd423e52 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -70,7 +70,7 @@ public class WorldMapSection2 implements WorldMapSection { int field2599; WorldMapSection2() { - } // L: 18 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -79,23 +79,23 @@ public class WorldMapSection2 implements WorldMapSection { ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field2595) { // L: 22 + if (var1.regionLowX > this.field2595) { var1.regionLowX = this.field2595; } if (var1.regionHighX < this.field2600) { - var1.regionHighX = this.field2600; // L: 23 + var1.regionHighX = this.field2600; } - if (var1.regionLowY > this.field2597) { // L: 24 + if (var1.regionLowY > this.field2597) { var1.regionLowY = this.field2597; } - if (var1.regionHighY < this.field2599) { // L: 25 + if (var1.regionHighY < this.field2599) { var1.regionHighY = this.field2599; } - } // L: 26 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -104,10 +104,10 @@ public class WorldMapSection2 implements WorldMapSection { ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - 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 + if (var1 >= this.minPlane && var1 < this.minPlane + this.planes) { + return var2 >> 6 >= this.regionStartX && var2 >> 6 <= this.regionEndX && var3 >> 6 >= this.regionStartY && var3 >> 6 <= this.regionEndY; } else { - return false; // L: 31 + return false; } } @@ -118,7 +118,7 @@ public class WorldMapSection2 implements WorldMapSection { ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >> 6 >= this.field2595 && var1 >> 6 <= this.field2600 && var2 >> 6 >= this.field2597 && var2 >> 6 <= this.field2599; // L: 38 + return var1 >> 6 >= this.field2595 && var1 >> 6 <= this.field2600 && var2 >> 6 >= this.field2597 && var2 >> 6 <= this.field2599; } @ObfuscatedName("m") @@ -128,11 +128,11 @@ public class WorldMapSection2 implements WorldMapSection { ) @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)) { + return null; } else { - int[] var4 = new int[]{var2 + (this.field2595 * 64 - this.regionStartX * 64), var3 + (this.field2597 * 64 - this.regionStartY * 64)}; // L: 46 47 48 - return var4; // L: 49 + int[] var4 = new int[]{var2 + (this.field2595 * 64 - this.regionStartX * 64), var3 + (this.field2597 * 64 - this.regionStartY * 64)}; + return var4; } } @@ -143,12 +143,12 @@ public class WorldMapSection2 implements WorldMapSection { ) @Export("coord") public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { // L: 54 - return null; // L: 55 + if (!this.containsPosition(var1, var2)) { + return null; } else { - int var3 = this.regionStartX * 64 - this.field2595 * 64 + var1; // L: 57 - int var4 = var2 + (this.regionStartY * 64 - this.field2597 * 64); // L: 58 - return new Coord(this.minPlane, var3, var4); // L: 59 + int var3 = this.regionStartX * 64 - this.field2595 * 64 + var1; + int var4 = var2 + (this.regionStartY * 64 - this.field2597 * 64); + return new Coord(this.minPlane, var3, var4); } } @@ -159,18 +159,18 @@ public class WorldMapSection2 implements WorldMapSection { ) @Export("read") public void read(Buffer var1) { - 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.field2595 = var1.readUnsignedShort(); // L: 70 - this.field2597 = var1.readUnsignedShort(); // L: 71 - this.field2600 = var1.readUnsignedShort(); // L: 72 - this.field2599 = var1.readUnsignedShort(); // L: 73 - this.postRead(); // L: 74 - } // L: 75 + this.minPlane = var1.readUnsignedByte(); + this.planes = var1.readUnsignedByte(); + this.regionStartX = var1.readUnsignedShort(); + this.regionStartY = var1.readUnsignedShort(); + this.regionEndX = var1.readUnsignedShort(); + this.regionEndY = var1.readUnsignedShort(); + this.field2595 = var1.readUnsignedShort(); + this.field2597 = var1.readUnsignedShort(); + this.field2600 = var1.readUnsignedShort(); + this.field2599 = var1.readUnsignedShort(); + this.postRead(); + } @ObfuscatedName("j") @ObfuscatedSignature( @@ -179,7 +179,7 @@ public class WorldMapSection2 implements WorldMapSection { ) @Export("postRead") void postRead() { - } // L: 77 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -187,7 +187,7 @@ public class WorldMapSection2 implements WorldMapSection { garbageValue = "-494413761" ) public static int method4414(int var0, int var1) { - return (var0 << 8) + var1; // L: 13 + return (var0 << 8) + var1; } @ObfuscatedName("e") @@ -196,9 +196,9 @@ public class WorldMapSection2 implements WorldMapSection { garbageValue = "12387" ) public static void method4417() { - Widget.Widget_cachedModels.clear(); // L: 723 - Widget.Widget_cachedFonts.clear(); // L: 724 - Widget.Widget_cachedSpriteMasks.clear(); // L: 725 - Widget.field3222.clear(); // L: 726 - } // L: 727 + Widget.Widget_cachedModels.clear(); + Widget.Widget_cachedFonts.clear(); + Widget.Widget_cachedSpriteMasks.clear(); + Widget.field3222.clear(); + } } diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java index cae81fb115..3a98a962e7 100644 --- a/runescape-client/src/main/java/WorldMapSectionType.java +++ b/runescape-client/src/main/java/WorldMapSectionType.java @@ -44,9 +44,9 @@ public enum WorldMapSectionType implements MouseWheel { final byte id; WorldMapSectionType(int var3, byte var4) { - this.type = var3; // L: 21 - this.id = var4; // L: 22 - } // L: 23 + this.type = var3; + this.id = var4; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -55,7 +55,7 @@ public enum WorldMapSectionType implements MouseWheel { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 27 + return this.id; } @ObfuscatedName("c") @@ -64,7 +64,7 @@ public enum WorldMapSectionType implements MouseWheel { garbageValue = "-719396809" ) static WorldMapSectionType[] method4754() { - return new WorldMapSectionType[]{WORLDMAPSECTIONTYPE3, WORLDMAPSECTIONTYPE2, WORLDMAPSECTIONTYPE1, WORLDMAPSECTIONTYPE0}; // L: 17 + return new WorldMapSectionType[]{WORLDMAPSECTIONTYPE3, WORLDMAPSECTIONTYPE2, WORLDMAPSECTIONTYPE1, WORLDMAPSECTIONTYPE0}; } @ObfuscatedName("ac") @@ -73,19 +73,19 @@ public enum WorldMapSectionType implements MouseWheel { garbageValue = "4095" ) static int method4756(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.LOGOUT) { // L: 3611 - Client.logoutTimer = 250; // L: 3612 - return 1; // L: 3613 - } else if (var0 != 5631 && var0 != 5633) { // L: 3615 - if (var0 == 5632) { // L: 3619 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 26; // L: 3620 - return 1; // L: 3621 + if (var0 == ScriptOpcodes.LOGOUT) { + Client.logoutTimer = 250; + return 1; + } else if (var0 != 5631 && var0 != 5633) { + if (var0 == 5632) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 26; + return 1; } else { - return 2; // L: 3623 + return 2; } } else { - class13.Interpreter_stringStackSize -= 2; // L: 3616 - return 1; // L: 3617 + class13.Interpreter_stringStackSize -= 2; + return 1; } } } diff --git a/runescape-client/src/main/java/WorldMapSprite.java b/runescape-client/src/main/java/WorldMapSprite.java index af0f8218c5..b852f1c701 100644 --- a/runescape-client/src/main/java/WorldMapSprite.java +++ b/runescape-client/src/main/java/WorldMapSprite.java @@ -20,12 +20,12 @@ public final class WorldMapSprite { final int[] tileColors; WorldMapSprite() { - this.tileColors = new int[4096]; // L: 11 - } // L: 12 + this.tileColors = new int[4096]; + } WorldMapSprite(int[] var1) { - this.tileColors = var1; // L: 15 - } // L: 16 + this.tileColors = var1; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -34,7 +34,7 @@ public final class WorldMapSprite { ) @Export("getTileColor") final int getTileColor(int var1, int var2) { - return this.tileColors[var1 + var2 * 64]; // L: 19 + return this.tileColors[var1 + var2 * 64]; } @ObfuscatedName("c") @@ -44,24 +44,24 @@ public final class WorldMapSprite { ) @Export("openURL") public static void openURL(String var0, boolean var1, boolean var2) { - if (var1) { // L: 23 - if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { // L: 24 + if (var1) { + if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { try { - Desktop.getDesktop().browse(new URI(var0)); // L: 26 - return; // L: 53 - } catch (Exception var4) { // L: 29 + Desktop.getDesktop().browse(new URI(var0)); + return; + } catch (Exception var4) { } } - if (class29.field177.startsWith("win")) { // L: 31 - NPC.method2314(var0, 0, "openjs"); // L: 34 - } else if (class29.field177.startsWith("mac")) { // L: 39 - NPC.method2314(var0, 1, "openjs"); // L: 40 + if (class29.field177.startsWith("win")) { + NPC.method2314(var0, 0, "openjs"); + } else if (class29.field177.startsWith("mac")) { + NPC.method2314(var0, 1, "openjs"); } else { - NPC.method2314(var0, 2, "openjs"); // L: 44 + NPC.method2314(var0, 2, "openjs"); } } else { - NPC.method2314(var0, 3, "openjs"); // L: 49 + NPC.method2314(var0, 3, "openjs"); } } diff --git a/runescape-client/src/main/java/Wrapper.java b/runescape-client/src/main/java/Wrapper.java index d89247aed0..b075effae2 100644 --- a/runescape-client/src/main/java/Wrapper.java +++ b/runescape-client/src/main/java/Wrapper.java @@ -10,8 +10,8 @@ public abstract class Wrapper extends DualNode { final int size; Wrapper(int var1) { - this.size = var1; // L: 9 - } // L: 10 + this.size = var1; + } @ObfuscatedName("c") @Export("get") diff --git a/runescape-client/src/main/java/class0.java b/runescape-client/src/main/java/class0.java index cfe476555c..1eca3be941 100644 --- a/runescape-client/src/main/java/class0.java +++ b/runescape-client/src/main/java/class0.java @@ -4,16 +4,16 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("c") public class class0 implements class3 { class0() { - } // L: 8 + } @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Lpi;)Lpi;" ) public Buffer vmethod15(Buffer var1) { - Buffer var2 = new Buffer(100); // L: 12 - this.method2(var1, var2); // L: 13 - return var2; // L: 14 + Buffer var2 = new Buffer(100); + this.method2(var1, var2); + return var2; } @ObfuscatedName("b") @@ -21,13 +21,13 @@ public class class0 implements class3 { descriptor = "(Lpi;Lpi;)V" ) void method2(Buffer var1, Buffer var2) { - class8 var3 = new class8(var1); // L: 18 - class5 var4 = new class5(var3); // L: 19 + class8 var3 = new class8(var1); + class5 var4 = new class5(var3); long var5; - for (var5 = 0L; !var4.method32(var3.method78(), var3.method76(), var5); ++var5) { // L: 20 21 22 + for (var5 = 0L; !var4.method32(var3.method78(), var3.method76(), var5); ++var5) { } - var2.writeLong(var5); // L: 24 - } // L: 25 + var2.writeLong(var5); + } } diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java index 5937bdfc03..f7861353ab 100644 --- a/runescape-client/src/main/java/class1.java +++ b/runescape-client/src/main/java/class1.java @@ -38,13 +38,13 @@ public class class1 implements Callable { descriptor = "(Lw;Lpi;Lm;)V" ) class1(class7 var1, Buffer var2, class3 var3) { - this.this$0 = var1; // L: 47 - this.field2 = var2; // L: 48 - this.field1 = var3; // L: 49 - } // L: 50 + this.this$0 = var1; + this.field2 = var2; + this.field1 = var3; + } public Object call() { - return this.field1.vmethod15(this.field2); // L: 54 + return this.field1.vmethod15(this.field2); } @ObfuscatedName("p") @@ -53,8 +53,8 @@ public class class1 implements Callable { garbageValue = "42" ) public static void method8() { - VarbitComposition.VarbitDefinition_cached.clear(); // L: 43 - } // L: 44 + VarbitComposition.VarbitDefinition_cached.clear(); + } @ObfuscatedName("gw") @ObfuscatedSignature( @@ -62,49 +62,49 @@ public class class1 implements Callable { garbageValue = "2135260751" ) static final void method12(int var0, int var1, int var2) { - if (UserComparator7.cameraX < var0) { // L: 4548 - UserComparator7.cameraX = (var0 - UserComparator7.cameraX) * ItemComposition.field2012 / 1000 + UserComparator7.cameraX + Renderable.field2358; // L: 4549 - if (UserComparator7.cameraX > var0) { // L: 4550 + if (UserComparator7.cameraX < var0) { + UserComparator7.cameraX = (var0 - UserComparator7.cameraX) * ItemComposition.field2012 / 1000 + UserComparator7.cameraX + Renderable.field2358; + if (UserComparator7.cameraX > var0) { UserComparator7.cameraX = var0; } } - if (UserComparator7.cameraX > var0) { // L: 4552 - UserComparator7.cameraX -= (UserComparator7.cameraX - var0) * ItemComposition.field2012 / 1000 + Renderable.field2358; // L: 4553 - if (UserComparator7.cameraX < var0) { // L: 4554 + if (UserComparator7.cameraX > var0) { + UserComparator7.cameraX -= (UserComparator7.cameraX - var0) * ItemComposition.field2012 / 1000 + Renderable.field2358; + if (UserComparator7.cameraX < var0) { UserComparator7.cameraX = var0; } } - if (AbstractByteArrayCopier.cameraY < var1) { // L: 4556 - AbstractByteArrayCopier.cameraY = (var1 - AbstractByteArrayCopier.cameraY) * ItemComposition.field2012 / 1000 + AbstractByteArrayCopier.cameraY + Renderable.field2358; // L: 4557 - if (AbstractByteArrayCopier.cameraY > var1) { // L: 4558 + if (AbstractByteArrayCopier.cameraY < var1) { + AbstractByteArrayCopier.cameraY = (var1 - AbstractByteArrayCopier.cameraY) * ItemComposition.field2012 / 1000 + AbstractByteArrayCopier.cameraY + Renderable.field2358; + if (AbstractByteArrayCopier.cameraY > var1) { AbstractByteArrayCopier.cameraY = var1; } } - if (AbstractByteArrayCopier.cameraY > var1) { // L: 4560 - AbstractByteArrayCopier.cameraY -= (AbstractByteArrayCopier.cameraY - var1) * ItemComposition.field2012 / 1000 + Renderable.field2358; // L: 4561 - if (AbstractByteArrayCopier.cameraY < var1) { // L: 4562 + if (AbstractByteArrayCopier.cameraY > var1) { + AbstractByteArrayCopier.cameraY -= (AbstractByteArrayCopier.cameraY - var1) * ItemComposition.field2012 / 1000 + Renderable.field2358; + if (AbstractByteArrayCopier.cameraY < var1) { AbstractByteArrayCopier.cameraY = var1; } } - if (UserComparator10.cameraZ < var2) { // L: 4564 - UserComparator10.cameraZ = (var2 - UserComparator10.cameraZ) * ItemComposition.field2012 / 1000 + UserComparator10.cameraZ + Renderable.field2358; // L: 4565 - if (UserComparator10.cameraZ > var2) { // L: 4566 + if (UserComparator10.cameraZ < var2) { + UserComparator10.cameraZ = (var2 - UserComparator10.cameraZ) * ItemComposition.field2012 / 1000 + UserComparator10.cameraZ + Renderable.field2358; + if (UserComparator10.cameraZ > var2) { UserComparator10.cameraZ = var2; } } - if (UserComparator10.cameraZ > var2) { // L: 4568 - UserComparator10.cameraZ -= (UserComparator10.cameraZ - var2) * ItemComposition.field2012 / 1000 + Renderable.field2358; // L: 4569 - if (UserComparator10.cameraZ < var2) { // L: 4570 + if (UserComparator10.cameraZ > var2) { + UserComparator10.cameraZ -= (UserComparator10.cameraZ - var2) * ItemComposition.field2012 / 1000 + Renderable.field2358; + if (UserComparator10.cameraZ < var2) { UserComparator10.cameraZ = var2; } } - } // L: 4572 + } @ObfuscatedName("jg") @ObfuscatedSignature( @@ -112,6 +112,6 @@ public class class1 implements Callable { garbageValue = "-1424242195" ) static final String method11(int var0) { - return var0 < 999999999 ? Integer.toString(var0) : "*"; // L: 11040 11041 + return var0 < 999999999 ? Integer.toString(var0) : "*"; } } diff --git a/runescape-client/src/main/java/class10.java b/runescape-client/src/main/java/class10.java index 072a6e3920..211323be03 100644 --- a/runescape-client/src/main/java/class10.java +++ b/runescape-client/src/main/java/class10.java @@ -58,16 +58,16 @@ public class class10 { descriptor = "(Ljava/net/URL;Lr;)V" ) public class10(URL var1, class9 var2) throws IOException { - this.field51 = false; // L: 20 - this.field57 = false; // L: 21 - this.field55 = 300000; // L: 22 + this.field51 = false; + this.field57 = false; + this.field55 = 300000; if (!var2.method85()) { - throw new UnsupportedEncodingException("Unsupported request method used " + var2.method100()); // L: 25 + throw new UnsupportedEncodingException("Unsupported request method used " + var2.method100()); } else { - this.field53 = (HttpsURLConnection)var1.openConnection(); // L: 26 - this.field53.setSSLSocketFactory(new class15()); // L: 27 - this.field52 = var2; // L: 28 - this.field48 = new HashMap(); // L: 29 + this.field53 = (HttpsURLConnection)var1.openConnection(); + this.field53.setSSLSocketFactory(new class15()); + this.field52 = var2; + this.field48 = new HashMap(); this.field49 = new HashMap(); } } @@ -81,7 +81,7 @@ public class class10 { if (!this.field51) { this.field48.put(var1, var2); } - } // L: 36 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -91,24 +91,24 @@ public class class10 { String method109() { ArrayList var1 = new ArrayList(this.field49.entrySet()); Collections.sort(var1, new class18(this)); - StringBuilder var2 = new StringBuilder(); // L: 53 - Iterator var3 = var1.iterator(); // L: 54 + StringBuilder var2 = new StringBuilder(); + Iterator var3 = var1.iterator(); while (var3.hasNext()) { - Entry var4 = (Entry)var3.next(); // L: 55 - if (var2.length() > 0) { // L: 57 + Entry var4 = (Entry)var3.next(); + if (var2.length() > 0) { var2.append(","); } - var2.append(((class376)var4.getKey()).method6793()); // L: 58 - float var5 = (Float)var4.getValue(); // L: 59 - if (var5 < 1.0F) { // L: 60 - String var6 = Float.toString(var5).substring(0, 4); // L: 61 - var2.append(";q=" + var6); // L: 62 + var2.append(((class376)var4.getKey()).method6793()); + float var5 = (Float)var4.getValue(); + if (var5 < 1.0F) { + String var6 = Float.toString(var5).substring(0, 4); + var2.append(";q=" + var6); } } - return var2.toString(); // L: 66 + return var2.toString(); } @ObfuscatedName("p") @@ -117,32 +117,32 @@ public class class10 { garbageValue = "8" ) void method104() throws ProtocolException { - if (!this.field51) { // L: 70 - this.field53.setRequestMethod(this.field52.method100()); // L: 71 - if (!this.field49.isEmpty()) { // L: 72 + if (!this.field51) { + this.field53.setRequestMethod(this.field52.method100()); + if (!this.field49.isEmpty()) { this.field48.put("Accept", this.method109()); } - Iterator var1 = this.field48.entrySet().iterator(); // L: 73 + Iterator var1 = this.field48.entrySet().iterator(); while (var1.hasNext()) { - Entry var2 = (Entry)var1.next(); // L: 74 - this.field53.setRequestProperty((String)var2.getKey(), (String)var2.getValue()); // L: 76 + Entry var2 = (Entry)var1.next(); + this.field53.setRequestProperty((String)var2.getKey(), (String)var2.getValue()); } - if (this.field52.method86() && this.field50 != null) { // L: 79 - this.field53.setDoOutput(true); // L: 80 - ByteArrayOutputStream var13 = new ByteArrayOutputStream(); // L: 81 + if (this.field52.method86() && this.field50 != null) { + this.field53.setDoOutput(true); + ByteArrayOutputStream var13 = new ByteArrayOutputStream(); try { - var13.write(this.field50.method6796(-1647266432)); // L: 83 - var13.writeTo(this.field53.getOutputStream()); // L: 84 - } catch (IOException var11) { // L: 86 - var11.printStackTrace(); // L: 87 + var13.write(this.field50.method6796(-1647266432)); + var13.writeTo(this.field53.getOutputStream()); + } catch (IOException var11) { + var11.printStackTrace(); } finally { - if (var13 != null) { // L: 90 + if (var13 != null) { try { - var13.close(); // L: 92 + var13.close(); } catch (IOException var10) { var10.printStackTrace(); } @@ -163,11 +163,11 @@ public class class10 { garbageValue = "-378004067" ) boolean method105() throws IOException, SocketTimeoutException { - if (!this.field51) { // L: 106 + if (!this.field51) { this.method104(); } - this.field53.connect(); // L: 107 + this.field53.connect(); return this.field53.getResponseCode() == -1; } @@ -178,24 +178,24 @@ public class class10 { ) class21 method106() { try { - if (!this.field51 || this.field53.getResponseCode() == -1) { // L: 114 + if (!this.field51 || this.field53.getResponseCode() == -1) { return new class21("No REST response has been received yet."); } - } catch (IOException var10) { // L: 116 - this.field53.disconnect(); // L: 117 - return new class21("Error decoding REST response code: " + var10.getMessage()); // L: 118 + } catch (IOException var10) { + this.field53.disconnect(); + return new class21("Error decoding REST response code: " + var10.getMessage()); } - class21 var1 = null; // L: 120 + class21 var1 = null; class21 var3; try { - var1 = new class21(this.field53); // L: 122 - return var1; // L: 130 + var1 = new class21(this.field53); + return var1; } catch (IOException var8) { var3 = new class21("Error decoding REST response: " + var8.getMessage()); } finally { - this.field53.disconnect(); // L: 128 + this.field53.disconnect(); } return var3; @@ -207,23 +207,23 @@ public class class10 { garbageValue = "16" ) static void method122(int var0, ArchiveDisk var1, Archive var2) { - byte[] var3 = null; // L: 30 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 31 - for (ArchiveDiskAction var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var5 != null; var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { // L: 32 - if (var5.key == (long)var0 && var1 == var5.archiveDisk && var5.type == 0) { // L: 33 - var3 = var5.data; // L: 34 - break; // L: 35 + byte[] var3 = null; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + for (ArchiveDiskAction var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var5 != null; var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { + if (var5.key == (long)var0 && var1 == var5.archiveDisk && var5.type == 0) { + var3 = var5.data; + break; } } } - if (var3 != null) { // L: 39 - var2.load(var1, var0, var3, true); // L: 40 + if (var3 != null) { + var2.load(var1, var0, var3, true); } else { - byte[] var4 = var1.read(var0); // L: 43 - var2.load(var1, var0, var4, true); // L: 44 + byte[] var4 = var1.read(var0); + var2.load(var1, var0, var4, true); } - } // L: 41 45 + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -233,10 +233,10 @@ public class class10 { static final void method119(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 + for (int var6 = 0; var6 < 4; ++var6) { + for (var7 = 0; var7 < 64; ++var7) { + for (var8 = 0; var8 < 64; ++var8) { + if (var7 + var1 > 0 && var7 + var1 < 103 && var8 + var2 > 0 && var8 + var2 < 103) { int[] var10000 = var5[var6].flags[var7 + var1]; var10000[var8 + var2] &= -16777217; } @@ -244,17 +244,17 @@ public class class10 { } } - Buffer var10 = new Buffer(var0); // L: 100 + Buffer var10 = new Buffer(var0); - 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 - ScriptFrame.loadTerrain(var10, var7, var8 + var1, var9 + var2, var3, var4, 0); // L: 104 + for (var7 = 0; var7 < 4; ++var7) { + for (var8 = 0; var8 < 64; ++var8) { + for (int var9 = 0; var9 < 64; ++var9) { + ScriptFrame.loadTerrain(var10, var7, var8 + var1, var9 + var2, var3, var4, 0); } } } - } // L: 108 + } @ObfuscatedName("o") @ObfuscatedSignature( @@ -262,11 +262,11 @@ public class class10 { garbageValue = "1542275516" ) static final void method123(String var0) { - PacketBufferNode var1 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2895, Client.packetWriter.isaacCipher); // L: 123 - var1.packetBuffer.writeByte(class116.stringCp1252NullTerminatedByteSize(var0)); // L: 124 - var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 125 - Client.packetWriter.addNode(var1); // L: 126 - } // L: 127 + PacketBufferNode var1 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2895, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(class116.stringCp1252NullTerminatedByteSize(var0)); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); + } @ObfuscatedName("am") @ObfuscatedSignature( @@ -275,16 +275,16 @@ public class class10 { ) @Export("PcmStream_disable") static final void PcmStream_disable(PcmStream var0) { - var0.active = false; // L: 263 - if (var0.sound != null) { // L: 264 + var0.active = false; + if (var0.sound != null) { var0.sound.position = 0; } for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { - PcmStream_disable(var1); // L: 265 + PcmStream_disable(var1); } - } // L: 266 + } @ObfuscatedName("iv") @ObfuscatedSignature( @@ -292,13 +292,13 @@ public class class10 { garbageValue = "708882827" ) static final void method124(int var0, int var1, int var2, int var3) { - for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { // L: 8861 - 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: 8862 + for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { + if (Client.rootWidgetWidths[var4] + Client.rootWidgetXs[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetHeights[var4] + Client.rootWidgetYs[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { Client.field504[var4] = true; } } - } // L: 8864 + } @ObfuscatedName("kh") @ObfuscatedSignature( @@ -307,23 +307,23 @@ public class class10 { ) @Export("closeInterface") static final void closeInterface(InterfaceParent var0, boolean var1) { - int var2 = var0.group; // L: 12284 - int var3 = (int)var0.key; // L: 12285 - var0.remove(); // L: 12286 - if (var1) { // L: 12287 + int var2 = var0.group; + int var3 = (int)var0.key; + var0.remove(); + if (var1) { class273.method5333(var2); } - TextureProvider.method4185(var2); // L: 12288 - Widget var4 = ChatChannel.getWidget(var3); // L: 12289 - if (var4 != null) { // L: 12290 + TextureProvider.method4185(var2); + Widget var4 = ChatChannel.getWidget(var3); + if (var4 != null) { SecureRandomCallable.invalidateWidget(var4); } - FileSystem.method3084(); // L: 12291 - if (Client.rootInterface != -1) { // L: 12292 + FileSystem.method3084(); + if (Client.rootInterface != -1) { Message.runIntfCloseListeners(Client.rootInterface, 1); } - } // L: 12293 + } } diff --git a/runescape-client/src/main/java/class11.java b/runescape-client/src/main/java/class11.java index b4a4459365..a193463736 100644 --- a/runescape-client/src/main/java/class11.java +++ b/runescape-client/src/main/java/class11.java @@ -36,28 +36,28 @@ class class11 implements TlsAuthentication { descriptor = "(Lh;)V" ) class11(class13 var1) { - this.this$2 = var1; // L: 305 + this.this$2 = var1; } public void notifyServerCertificate(Certificate var1) throws IOException { try { - CertificateFactory var2 = CertificateFactory.getInstance("X.509"); // L: 309 - LinkedList var3 = new LinkedList(); // L: 310 - org.bouncycastle.asn1.x509.Certificate[] var4 = var1.getCertificateList(); // L: 312 + CertificateFactory var2 = CertificateFactory.getInstance("X.509"); + LinkedList var3 = new LinkedList(); + org.bouncycastle.asn1.x509.Certificate[] var4 = var1.getCertificateList(); - for (int var5 = 0; var5 < var4.length; ++var5) { // L: 313 - org.bouncycastle.asn1.x509.Certificate var6 = var4[var5]; // L: 314 - var3.add(var2.generateCertificate(new ByteArrayInputStream(var6.getEncoded()))); // L: 316 + for (int var5 = 0; var5 < var4.length; ++var5) { + org.bouncycastle.asn1.x509.Certificate var6 = var4[var5]; + var3.add(var2.generateCertificate(new ByteArrayInputStream(var6.getEncoded()))); } - this.this$2.this$1.field67 = (java.security.cert.Certificate[])((java.security.cert.Certificate[])var3.toArray(new java.security.cert.Certificate[0])); // L: 320 - } catch (CertificateException var7) { // L: 322 - throw new IOException(var7); // L: 323 + this.this$2.this$1.field67 = (java.security.cert.Certificate[])((java.security.cert.Certificate[])var3.toArray(new java.security.cert.Certificate[0])); + } catch (CertificateException var7) { + throw new IOException(var7); } - } // L: 325 + } public TlsCredentials getClientCredentials(CertificateRequest var1) throws IOException { - return null; // L: 329 + return null; } @ObfuscatedName("l") @@ -66,32 +66,32 @@ class class11 implements TlsAuthentication { garbageValue = "-1179058549" ) static int method125(int var0, Script var1, boolean var2) { - Widget var3 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 1388 - if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { // L: 1389 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class404.Widget_unpackTargetMask(class363.getWidgetFlags(var3)); // L: 1390 - return 1; // L: 1391 - } else if (var0 != ScriptOpcodes.IF_GETOP) { // L: 1393 - if (var0 == ScriptOpcodes.IF_GETOPBASE) { // L: 1400 - if (var3.dataText == null) { // L: 1401 + Widget var3 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); + if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class404.Widget_unpackTargetMask(class363.getWidgetFlags(var3)); + return 1; + } else if (var0 != ScriptOpcodes.IF_GETOP) { + if (var0 == ScriptOpcodes.IF_GETOPBASE) { + if (var3.dataText == null) { Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1402 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.dataText; } - return 1; // L: 1403 + return 1; } else { - return 2; // L: 1405 + return 2; } } else { - int var4 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1394 - --var4; // L: 1395 - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1396 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1397 + int var4 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + --var4; + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.actions[var4]; } else { Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; } - return 1; // L: 1398 + return 1; } } @@ -102,6 +102,6 @@ class class11 implements TlsAuthentication { ) @Export("insertMenuItemNoShift") public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { - class21.insertMenuItem(var0, var1, var2, var3, var4, var5, false); // L: 10041 - } // L: 10042 + class21.insertMenuItem(var0, var1, var2, var3, var4, var5, false); + } } diff --git a/runescape-client/src/main/java/class111.java b/runescape-client/src/main/java/class111.java index 38ea5cd7eb..fccad4a248 100644 --- a/runescape-client/src/main/java/class111.java +++ b/runescape-client/src/main/java/class111.java @@ -35,11 +35,11 @@ public class class111 { class111 field1354; class111() { - this.field1350 = Float.MAX_VALUE; // L: 8 - this.field1351 = Float.MAX_VALUE; // L: 9 - this.field1352 = Float.MAX_VALUE; // L: 10 - this.field1357 = Float.MAX_VALUE; // L: 11 - } // L: 14 + this.field1350 = Float.MAX_VALUE; + this.field1351 = Float.MAX_VALUE; + this.field1352 = Float.MAX_VALUE; + this.field1357 = Float.MAX_VALUE; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -47,11 +47,11 @@ public class class111 { garbageValue = "-972356321" ) void method2558(Buffer var1, int var2) { - this.field1359 = var1.readShort(); // L: 17 - this.field1349 = var1.method7369(); // L: 18 - this.field1350 = var1.method7369(); // L: 19 - this.field1351 = var1.method7369(); // L: 20 - this.field1352 = var1.method7369(); // L: 21 - this.field1357 = var1.method7369(); // L: 22 - } // L: 23 + this.field1359 = var1.readShort(); + this.field1349 = var1.method7369(); + this.field1350 = var1.method7369(); + this.field1351 = var1.method7369(); + this.field1352 = var1.method7369(); + this.field1357 = var1.method7369(); + } } diff --git a/runescape-client/src/main/java/class112.java b/runescape-client/src/main/java/class112.java index d564531442..2bfa41af4c 100644 --- a/runescape-client/src/main/java/class112.java +++ b/runescape-client/src/main/java/class112.java @@ -16,8 +16,8 @@ public class class112 { static IndexedSprite[] worldSelectStars; static { - field1361 = Math.ulp(1.0F); // L: 10 - field1362 = field1361 * 2.0F; // L: 11 + field1361 = Math.ulp(1.0F); + field1362 = field1361 * 2.0F; } @ObfuscatedName("c") @@ -27,7 +27,7 @@ public class class112 { ) public static class120 method2571(AbstractArchive var0, AbstractArchive var1, int var2, boolean var3) { boolean var4 = true; - byte[] var5 = var0.takeFile(var2 >> 16 & 65535, var2 & 65535); // L: 24 + byte[] var5 = var0.takeFile(var2 >> 16 & 65535, var2 & 65535); if (var5 == null) { var4 = false; return null; @@ -37,20 +37,20 @@ public class class112 { if (var3) { var7 = var1.getFile(0, var6); } else { - var7 = var1.getFile(var6, 0); // L: 32 + var7 = var1.getFile(var6, 0); } - if (var7 == null) { // L: 33 + if (var7 == null) { var4 = false; } - if (!var4) { // L: 34 + if (!var4) { return null; } else { try { - return new class120(var0, var1, var2, var3); // L: 36 - } catch (Exception var9) { // L: 38 - return null; // L: 39 + return new class120(var0, var1, var2, var3); + } catch (Exception var9) { + return null; } } } @@ -62,36 +62,36 @@ public class class112 { garbageValue = "-1374699895" ) public static String method2565(CharSequence[] var0, int var1, int var2) { - if (var2 == 0) { // L: 12 + if (var2 == 0) { return ""; - } else if (var2 == 1) { // L: 13 - CharSequence var10 = var0[var1]; // L: 14 - return var10 == null ? "null" : var10.toString(); // L: 15 16 + } else if (var2 == 1) { + CharSequence var10 = var0[var1]; + return var10 == null ? "null" : var10.toString(); } else { - int var3 = var2 + var1; // L: 18 - int var4 = 0; // L: 19 + int var3 = var2 + var1; + int var4 = 0; - for (int var5 = var1; var5 < var3; ++var5) { // L: 20 - CharSequence var9 = var0[var5]; // L: 21 - if (var9 == null) { // L: 22 + for (int var5 = var1; var5 < var3; ++var5) { + CharSequence var9 = var0[var5]; + if (var9 == null) { var4 += 4; } else { - var4 += var9.length(); // L: 23 + var4 += var9.length(); } } - StringBuilder var8 = new StringBuilder(var4); // L: 25 + StringBuilder var8 = new StringBuilder(var4); - for (int var6 = var1; var6 < var3; ++var6) { // L: 26 - CharSequence var7 = var0[var6]; // L: 27 - if (var7 == null) { // L: 28 + for (int var6 = var1; var6 < var3; ++var6) { + CharSequence var7 = var0[var6]; + if (var7 == null) { var8.append("null"); } else { - var8.append(var7); // L: 29 + var8.append(var7); } } - return var8.toString(); // L: 31 + return var8.toString(); } } @@ -101,100 +101,100 @@ public class class112 { garbageValue = "1143513856" ) static int method2560(int var0, Script var1, boolean var2) { - if (var0 < 1000) { // L: 429 + if (var0 < 1000) { return class273.method5332(var0, var1, var2); - } else if (var0 < 1100) { // L: 430 + } else if (var0 < 1100) { return class279.method5405(var0, var1, var2); - } else if (var0 < 1200) { // L: 431 + } else if (var0 < 1200) { return class143.method2959(var0, var1, var2); - } else if (var0 < 1300) { // L: 432 + } else if (var0 < 1300) { return Canvas.method404(var0, var1, var2); - } else if (var0 < 1400) { // L: 433 + } else if (var0 < 1400) { return class120.method2724(var0, var1, var2); - } else if (var0 < 1500) { // L: 434 + } else if (var0 < 1500) { return WorldMapID.method4804(var0, var1, var2); - } else if (var0 < 1600) { // L: 435 + } else if (var0 < 1600) { return NetFileRequest.method5588(var0, var1, var2); - } else if (var0 < 1700) { // L: 436 + } else if (var0 < 1700) { return BufferedSink.method6551(var0, var1, var2); - } else if (var0 < 1800) { // L: 437 + } else if (var0 < 1800) { return class6.method56(var0, var1, var2); - } else if (var0 < 1900) { // L: 438 + } else if (var0 < 1900) { return class148.method3019(var0, var1, var2); - } else if (var0 < 2000) { // L: 439 + } else if (var0 < 2000) { return Strings.method5510(var0, var1, var2); - } else if (var0 < 2100) { // L: 440 + } else if (var0 < 2100) { return class279.method5405(var0, var1, var2); - } else if (var0 < 2200) { // L: 441 + } else if (var0 < 2200) { return class143.method2959(var0, var1, var2); - } else if (var0 < 2300) { // L: 442 + } else if (var0 < 2300) { return Canvas.method404(var0, var1, var2); - } else if (var0 < 2400) { // L: 443 + } else if (var0 < 2400) { return class120.method2724(var0, var1, var2); - } else if (var0 < 2500) { // L: 444 + } else if (var0 < 2500) { return WorldMapID.method4804(var0, var1, var2); - } else if (var0 < 2600) { // L: 445 + } else if (var0 < 2600) { return class4.method20(var0, var1, var2); - } else if (var0 < 2700) { // L: 446 + } else if (var0 < 2700) { return UrlRequester.method2486(var0, var1, var2); - } else if (var0 < 2800) { // L: 447 + } else if (var0 < 2800) { return Projectile.method2010(var0, var1, var2); - } else if (var0 < 2900) { // L: 448 + } else if (var0 < 2900) { return class11.method125(var0, var1, var2); - } else if (var0 < 3000) { // L: 449 + } else if (var0 < 3000) { return Strings.method5510(var0, var1, var2); - } else if (var0 < 3200) { // L: 450 + } else if (var0 < 3200) { return ArchiveLoader.method2122(var0, var1, var2); - } else if (var0 < 3300) { // L: 451 + } else if (var0 < 3300) { return ParamComposition.method3397(var0, var1, var2); - } else if (var0 < 3400) { // L: 452 + } else if (var0 < 3400) { return class12.method190(var0, var1, var2); - } else if (var0 < 3500) { // L: 453 + } else if (var0 < 3500) { return ReflectionCheck.method663(var0, var1, var2); - } else if (var0 < 3600) { // L: 454 + } else if (var0 < 3600) { return class13.method201(var0, var1, var2); - } else if (var0 < 3700) { // L: 455 + } else if (var0 < 3700) { return SequenceDefinition.method3640(var0, var1, var2); - } else if (var0 < 3800) { // L: 456 + } else if (var0 < 3800) { return class167.method3269(var0, var1, var2); - } else if (var0 < 3900) { // L: 457 + } else if (var0 < 3900) { return class332.method6184(var0, var1, var2); - } else if (var0 < 4000) { // L: 458 + } else if (var0 < 4000) { return class28.method443(var0, var1, var2); } else if (var0 < 4100) { - return class341.method6258(var0, var1, var2); // L: 459 - } else if (var0 < 4200) { // L: 460 + return class341.method6258(var0, var1, var2); + } else if (var0 < 4200) { return StudioGame.method5500(var0, var1, var2); - } else if (var0 < 4300) { // L: 461 + } else if (var0 < 4300) { return TriBool.method6472(var0, var1, var2); - } else if (var0 < 5100) { // L: 462 + } else if (var0 < 5100) { return class167.method3270(var0, var1, var2); - } else if (var0 < 5400) { // L: 463 + } else if (var0 < 5400) { return class134.method2824(var0, var1, var2); - } else if (var0 < 5600) { // L: 464 + } else if (var0 < 5600) { return class141.method2950(var0, var1, var2); - } else if (var0 < 5700) { // L: 465 + } else if (var0 < 5700) { return WorldMapSectionType.method4756(var0, var1, var2); - } else if (var0 < 6300) { // L: 466 + } else if (var0 < 6300) { return Canvas.method405(var0, var1, var2); - } else if (var0 < 6600) { // L: 467 + } else if (var0 < 6600) { return ApproximateRouteStrategy.method1139(var0, var1, var2); - } else if (var0 < 6700) { // L: 468 + } else if (var0 < 6700) { return GameEngine.method581(var0, var1, var2); - } else if (var0 < 6800) { // L: 469 + } else if (var0 < 6800) { return GameObject.method4341(var0, var1, var2); - } else if (var0 < 6900) { // L: 470 + } else if (var0 < 6900) { return Client.method1667(var0, var1, var2); - } else if (var0 < 7000) { // L: 471 + } else if (var0 < 7000) { return class312.method5810(var0, var1, var2); - } else if (var0 < 7100) { // L: 472 + } else if (var0 < 7100) { return class4.method27(var0, var1, var2); - } else if (var0 < 7200) { // L: 473 + } else if (var0 < 7200) { return WorldMapLabelSize.method4359(var0, var1, var2); - } else if (var0 < 7300) { // L: 474 + } else if (var0 < 7300) { return ArchiveLoader.method2120(var0, var1, var2); } else { - return var0 < 7500 ? KitDefinition.method3237(var0, var1, var2) : 2; // L: 475 476 + return var0 < 7500 ? KitDefinition.method3237(var0, var1, var2) : 2; } } @@ -204,28 +204,28 @@ public class class112 { garbageValue = "-1450996658" ) static final void method2572(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 - SoundCache.field321[0][var5][var4] = 127; // L: 82 - if (var0 == var5 && var5 > 0) { // L: 83 + for (int var4 = var1; var4 <= var3 + var1; ++var4) { + for (int var5 = var0; var5 <= var0 + var2; ++var5) { + if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) { + SoundCache.field321[0][var5][var4] = 127; + if (var0 == var5 && var5 > 0) { Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; } - if (var5 == var0 + var2 && var5 < 103) { // L: 84 + if (var5 == var0 + var2 && var5 < 103) { Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; } - if (var4 == var1 && var4 > 0) { // L: 85 + if (var4 == var1 && var4 > 0) { Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1]; } - if (var4 == var3 + var1 && var4 < 103) { // L: 86 + if (var4 == var3 + var1 && var4 < 103) { Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; } } } } - } // L: 90 + } } diff --git a/runescape-client/src/main/java/class113.java b/runescape-client/src/main/java/class113.java index 6fb758a1e0..db49496fbe 100644 --- a/runescape-client/src/main/java/class113.java +++ b/runescape-client/src/main/java/class113.java @@ -65,26 +65,26 @@ public class class113 { descriptor = "(ILpi;Z)V" ) public class113(int var1, Buffer var2, boolean var3) { - this.field1371 = new class366(); // L: 13 - this.field1378 = true; // L: 14 - this.field1373 = new class366(); // L: 15 - this.field1374 = true; // L: 16 - this.field1372 = new class366(); // L: 17 - this.field1377 = var2.readShort(); // L: 23 - this.field1368 = new class366[var1]; // L: 24 - this.field1369 = new class366[this.field1368.length]; // L: 25 - this.field1365 = new class366[this.field1368.length]; // L: 26 - this.field1379 = new float[this.field1368.length][3]; // L: 27 + this.field1371 = new class366(); + this.field1378 = true; + this.field1373 = new class366(); + this.field1374 = true; + this.field1372 = new class366(); + this.field1377 = var2.readShort(); + this.field1368 = new class366[var1]; + this.field1369 = new class366[this.field1368.length]; + this.field1365 = new class366[this.field1368.length]; + this.field1379 = new float[this.field1368.length][3]; - for (int var4 = 0; var4 < this.field1368.length; ++var4) { // L: 28 - this.field1368[var4] = new class366(var2, var3); // L: 29 - this.field1379[var4][0] = var2.method7369(); // L: 30 - this.field1379[var4][1] = var2.method7369(); // L: 31 - this.field1379[var4][2] = var2.method7369(); // L: 32 + for (int var4 = 0; var4 < this.field1368.length; ++var4) { + this.field1368[var4] = new class366(var2, var3); + this.field1379[var4][0] = var2.method7369(); + this.field1379[var4][1] = var2.method7369(); + this.field1379[var4][2] = var2.method7369(); } - this.method2584(); // L: 34 - } // L: 35 + this.method2584(); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -92,34 +92,34 @@ public class class113 { garbageValue = "1" ) void method2584() { - this.field1376 = new float[this.field1368.length][3]; // L: 38 - this.field1367 = new float[this.field1368.length][3]; // L: 39 - this.field1375 = new float[this.field1368.length][3]; // L: 40 + this.field1376 = new float[this.field1368.length][3]; + this.field1367 = new float[this.field1368.length][3]; + this.field1375 = new float[this.field1368.length][3]; class366 var1; - synchronized(class366.field4191) { // L: 43 + synchronized(class366.field4191) { if (class149.field1663 == 0) { var1 = new class366(); } else { - class366.field4191[--class149.field1663].method6652(); // L: 46 - var1 = class366.field4191[class149.field1663]; // L: 47 + class366.field4191[--class149.field1663].method6652(); + var1 = class366.field4191[class149.field1663]; } } - class366 var2 = var1; // L: 51 + class366 var2 = var1; - for (int var5 = 0; var5 < this.field1368.length; ++var5) { // L: 52 - class366 var4 = this.method2600(var5); // L: 53 - var2.method6654(var4); // L: 54 - var2.method6678(); // L: 55 - this.field1376[var5] = var2.method6651(); // L: 56 - this.field1367[var5][0] = var4.field4196[12]; // L: 57 - this.field1367[var5][1] = var4.field4196[13]; // L: 58 - this.field1367[var5][2] = var4.field4196[14]; // L: 59 - this.field1375[var5] = var4.method6663(); // L: 60 + for (int var5 = 0; var5 < this.field1368.length; ++var5) { + class366 var4 = this.method2600(var5); + var2.method6654(var4); + var2.method6678(); + this.field1376[var5] = var2.method6651(); + this.field1367[var5][0] = var4.field4196[12]; + this.field1367[var5][1] = var4.field4196[13]; + this.field1367[var5][2] = var4.field4196[14]; + this.field1375[var5] = var4.method6663(); } - var2.method6656(); // L: 62 - } // L: 63 + var2.method6656(); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -127,7 +127,7 @@ public class class113 { garbageValue = "0" ) class366 method2600(int var1) { - return this.field1368[var1]; // L: 66 + return this.field1368[var1]; } @ObfuscatedName("p") @@ -136,16 +136,16 @@ public class class113 { garbageValue = "351" ) class366 method2587(int var1) { - if (this.field1369[var1] == null) { // L: 70 - this.field1369[var1] = new class366(this.method2600(var1)); // L: 71 - if (this.field1366 != null) { // L: 72 - this.field1369[var1].method6670(this.field1366.method2587(var1)); // L: 73 + if (this.field1369[var1] == null) { + this.field1369[var1] = new class366(this.method2600(var1)); + if (this.field1366 != null) { + this.field1369[var1].method6670(this.field1366.method2587(var1)); } else { - this.field1369[var1].method6670(class366.field4194); // L: 76 + this.field1369[var1].method6670(class366.field4194); } } - return this.field1369[var1]; // L: 79 + return this.field1369[var1]; } @ObfuscatedName("m") @@ -154,12 +154,12 @@ public class class113 { garbageValue = "1855658248" ) class366 method2586(int var1) { - if (this.field1365[var1] == null) { // L: 83 - this.field1365[var1] = new class366(this.method2587(var1)); // L: 84 - this.field1365[var1].method6678(); // L: 85 + if (this.field1365[var1] == null) { + this.field1365[var1] = new class366(this.method2587(var1)); + this.field1365[var1].method6678(); } - return this.field1365[var1]; // L: 87 + return this.field1365[var1]; } @ObfuscatedName("t") @@ -168,10 +168,10 @@ public class class113 { garbageValue = "275218241" ) void method2576(class366 var1) { - this.field1371.method6654(var1); // L: 91 - this.field1378 = true; // L: 92 - this.field1374 = true; // L: 93 - } // L: 94 + this.field1371.method6654(var1); + this.field1378 = true; + this.field1374 = true; + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -179,7 +179,7 @@ public class class113 { garbageValue = "-1259649016" ) class366 method2604() { - return this.field1371; // L: 97 + return this.field1371; } @ObfuscatedName("j") @@ -188,16 +188,16 @@ public class class113 { garbageValue = "17" ) class366 method2581() { - if (this.field1378) { // L: 101 - this.field1373.method6654(this.method2604()); // L: 102 - if (this.field1366 != null) { // L: 103 - this.field1373.method6670(this.field1366.method2581()); // L: 104 + if (this.field1378) { + this.field1373.method6654(this.method2604()); + if (this.field1366 != null) { + this.field1373.method6670(this.field1366.method2581()); } - this.field1378 = false; // L: 106 + this.field1378 = false; } - return this.field1373; // L: 108 + return this.field1373; } @ObfuscatedName("w") @@ -206,13 +206,13 @@ public class class113 { garbageValue = "1902946548" ) public class366 method2582(int var1) { - if (this.field1374) { // L: 112 - this.field1372.method6654(this.method2586(var1)); // L: 113 - this.field1372.method6670(this.method2581()); // L: 114 - this.field1374 = false; // L: 115 + if (this.field1374) { + this.field1372.method6654(this.method2586(var1)); + this.field1372.method6670(this.method2581()); + this.field1374 = false; } - return this.field1372; // L: 117 + return this.field1372; } @ObfuscatedName("n") @@ -221,7 +221,7 @@ public class class113 { garbageValue = "-849855317" ) float[] method2583(int var1) { - return this.field1376[var1]; // L: 121 + return this.field1376[var1]; } @ObfuscatedName("r") @@ -230,7 +230,7 @@ public class class113 { garbageValue = "-117" ) float[] method2577(int var1) { - return this.field1367[var1]; // L: 125 + return this.field1367[var1]; } @ObfuscatedName("o") @@ -239,7 +239,7 @@ public class class113 { garbageValue = "-177348293" ) float[] method2585(int var1) { - return this.field1375[var1]; // L: 129 + return this.field1375[var1]; } @ObfuscatedName("c") @@ -248,7 +248,7 @@ public class class113 { garbageValue = "-1994620885" ) public static int method2616() { - return ViewportMouse.ViewportMouse_entityCount; // L: 44 + return ViewportMouse.ViewportMouse_entityCount; } @ObfuscatedName("k") @@ -257,12 +257,12 @@ public class class113 { garbageValue = "13" ) static final void method2618(String var0, int var1) { - PacketBufferNode var2 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2878, Client.packetWriter.isaacCipher); // L: 228 - var2.packetBuffer.writeByte(class116.stringCp1252NullTerminatedByteSize(var0) + 1); // L: 229 - var2.packetBuffer.method7343(var1); // L: 230 - var2.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 231 - Client.packetWriter.addNode(var2); // L: 232 - } // L: 233 + PacketBufferNode var2 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2878, Client.packetWriter.isaacCipher); + var2.packetBuffer.writeByte(class116.stringCp1252NullTerminatedByteSize(var0) + 1); + var2.packetBuffer.method7343(var1); + var2.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var2); + } @ObfuscatedName("la") @ObfuscatedSignature( @@ -270,19 +270,19 @@ public class class113 { garbageValue = "0" ) static final void method2617(int var0, int var1) { - if (Client.currentClanChannels[var0] != null) { // L: 12525 - if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method2990()) { // L: 12526 - ClanChannelMember var2 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); // L: 12527 - if (var2.rank == -1) { // L: 12528 - PacketWriter var3 = Client.packetWriter; // L: 12529 - PacketBufferNode var4 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2888, var3.isaacCipher); // L: 12530 - var4.packetBuffer.writeByte(3 + class116.stringCp1252NullTerminatedByteSize(var2.username.getName())); // L: 12531 - var4.packetBuffer.writeByte(var0); // L: 12532 - var4.packetBuffer.writeShort(var1); // L: 12533 - var4.packetBuffer.writeStringCp1252NullTerminated(var2.username.getName()); // L: 12534 - var3.addNode(var4); // L: 12535 + if (Client.currentClanChannels[var0] != null) { + if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method2990()) { + ClanChannelMember var2 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); + if (var2.rank == -1) { + PacketWriter var3 = Client.packetWriter; + PacketBufferNode var4 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2888, var3.isaacCipher); + var4.packetBuffer.writeByte(3 + class116.stringCp1252NullTerminatedByteSize(var2.username.getName())); + var4.packetBuffer.writeByte(var0); + var4.packetBuffer.writeShort(var1); + var4.packetBuffer.writeStringCp1252NullTerminated(var2.username.getName()); + var3.addNode(var4); } } } - } // L: 12536 + } } diff --git a/runescape-client/src/main/java/class114.java b/runescape-client/src/main/java/class114.java index 87503d3d3b..7ce3331f24 100644 --- a/runescape-client/src/main/java/class114.java +++ b/runescape-client/src/main/java/class114.java @@ -55,9 +55,9 @@ public enum class114 implements MouseWheel { final int field1388; class114(int var3, int var4) { - this.field1387 = var3; // L: 129 - this.field1388 = var4; // L: 130 - } // L: 131 + this.field1387 = var3; + this.field1388 = var4; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -66,7 +66,7 @@ public enum class114 implements MouseWheel { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field1388; // L: 134 + return this.field1388; } @ObfuscatedName("j") @@ -75,8 +75,8 @@ public enum class114 implements MouseWheel { garbageValue = "1912506868" ) public static int method2629(int var0) { - long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; // L: 73 - int var1 = (int)(var2 >>> 14 & 3L); // L: 75 - return var1; // L: 77 + long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; + int var1 = (int)(var2 >>> 14 & 3L); + return var1; } } diff --git a/runescape-client/src/main/java/class115.java b/runescape-client/src/main/java/class115.java index 5d7bf1005c..b3a5af7eac 100644 --- a/runescape-client/src/main/java/class115.java +++ b/runescape-client/src/main/java/class115.java @@ -71,11 +71,11 @@ public class class115 { float field1409; class115() { - this.field1401 = new float[4]; // L: 16 - this.field1402 = new float[4]; // L: 17 - this.field1403 = true; // L: 18 - this.field1404 = 0; // L: 19 - } // L: 26 + this.field1401 = new float[4]; + this.field1402 = new float[4]; + this.field1403 = true; + this.field1404 = 0; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -83,43 +83,43 @@ public class class115 { garbageValue = "13750737" ) int method2638(Buffer var1, int var2) { - int var3 = var1.readUnsignedShort(); // L: 29 - int var4 = var1.readUnsignedByte(); // L: 30 - class121 var5 = (class121)class130.findEnumerated(class87.method2281(), var4); // L: 32 - if (var5 == null) { // L: 33 + int var3 = var1.readUnsignedShort(); + int var4 = var1.readUnsignedByte(); + class121 var5 = (class121)class130.findEnumerated(class87.method2281(), var4); + if (var5 == null) { var5 = class121.field1467; } - this.field1410 = ScriptEvent.method2154(var1.readUnsignedByte()); // L: 35 - this.field1396 = ScriptEvent.method2154(var1.readUnsignedByte()); // L: 36 - this.field1397 = var1.readUnsignedByte() != 0; // L: 37 - this.field1393 = new class111[var3]; // L: 38 - class111 var8 = null; // L: 39 + this.field1410 = ScriptEvent.method2154(var1.readUnsignedByte()); + this.field1396 = ScriptEvent.method2154(var1.readUnsignedByte()); + this.field1397 = var1.readUnsignedByte() != 0; + this.field1393 = new class111[var3]; + class111 var8 = null; int var6; - for (var6 = 0; var6 < var3; ++var6) { // L: 40 - class111 var7 = new class111(); // L: 41 - var7.method2558(var1, var2); // L: 42 - this.field1393[var6] = var7; // L: 43 - if (var8 != null) { // L: 44 - var8.field1354 = var7; // L: 45 + for (var6 = 0; var6 < var3; ++var6) { + class111 var7 = new class111(); + var7.method2558(var1, var2); + this.field1393[var6] = var7; + if (var8 != null) { + var8.field1354 = var7; } - var8 = var7; // L: 47 + var8 = var7; } - this.field1395 = this.field1393[0].field1359; // L: 49 - this.field1407 = this.field1393[this.method2637() - 1].field1359; // L: 50 - this.field1405 = new float[this.method2642() + 1]; // L: 52 + this.field1395 = this.field1393[0].field1359; + this.field1407 = this.field1393[this.method2637() - 1].field1359; + this.field1405 = new float[this.method2642() + 1]; - for (var6 = this.method2633(); var6 <= this.method2658(); ++var6) { // L: 53 - this.field1405[var6 - this.method2633()] = class14.method210(this, (float)var6); // L: 54 + for (var6 = this.method2633(); var6 <= this.method2658(); ++var6) { + this.field1405[var6 - this.method2633()] = class14.method210(this, (float)var6); } - this.field1393 = null; // L: 56 - this.field1399 = class14.method210(this, (float)(this.method2633() - 1)); // L: 58 - this.field1409 = class14.method210(this, (float)(this.method2658() + 1)); // L: 59 - return var3; // L: 60 + this.field1393 = null; + this.field1399 = class14.method210(this, (float)(this.method2633() - 1)); + this.field1409 = class14.method210(this, (float)(this.method2658() + 1)); + return var3; } @ObfuscatedName("b") @@ -128,10 +128,10 @@ public class class115 { garbageValue = "1379613338" ) public float method2632(int var1) { - if (var1 < this.method2633()) { // L: 65 - return this.field1399; // L: 66 + if (var1 < this.method2633()) { + return this.field1399; } else { - return var1 > this.method2658() ? this.field1409 : this.field1405[var1 - this.method2633()]; // L: 68 69 71 + return var1 > this.method2658() ? this.field1409 : this.field1405[var1 - this.method2633()]; } } @@ -141,7 +141,7 @@ public class class115 { garbageValue = "648165543" ) int method2633() { - return this.field1395; // L: 76 + return this.field1395; } @ObfuscatedName("m") @@ -150,7 +150,7 @@ public class class115 { garbageValue = "654538685" ) int method2658() { - return this.field1407; // L: 80 + return this.field1407; } @ObfuscatedName("t") @@ -159,7 +159,7 @@ public class class115 { garbageValue = "118" ) int method2642() { - return this.method2658() - this.method2633(); // L: 84 + return this.method2658() - this.method2633(); } @ObfuscatedName("s") @@ -168,50 +168,50 @@ public class class115 { garbageValue = "111" ) int method2630(float var1) { - if (this.field1404 < 0 || (float)this.field1393[this.field1404].field1359 > var1 || this.field1393[this.field1404].field1354 != null && (float)this.field1393[this.field1404].field1354.field1359 <= var1) { // L: 88 - if (var1 >= (float)this.method2633() && var1 <= (float)this.method2658()) { // L: 91 - int var2 = this.method2637(); // L: 94 - int var3 = this.field1404; // L: 95 - if (var2 > 0) { // L: 96 - int var4 = 0; // L: 97 - int var5 = var2 - 1; // L: 98 + if (this.field1404 < 0 || (float)this.field1393[this.field1404].field1359 > var1 || this.field1393[this.field1404].field1354 != null && (float)this.field1393[this.field1404].field1354.field1359 <= var1) { + if (var1 >= (float)this.method2633() && var1 <= (float)this.method2658()) { + int var2 = this.method2637(); + int var3 = this.field1404; + if (var2 > 0) { + int var4 = 0; + int var5 = var2 - 1; do { - int var6 = var5 + var4 >> 1; // L: 100 - if (var1 < (float)this.field1393[var6].field1359) { // L: 101 - if (var1 > (float)this.field1393[var6 - 1].field1359) { // L: 102 - var3 = var6 - 1; // L: 103 + int var6 = var5 + var4 >> 1; + if (var1 < (float)this.field1393[var6].field1359) { + if (var1 > (float)this.field1393[var6 - 1].field1359) { + var3 = var6 - 1; break; } - var5 = var6 - 1; // L: 107 + var5 = var6 - 1; } else { - if (var1 <= (float)this.field1393[var6].field1359) { // L: 110 - var3 = var6; // L: 120 - break; // L: 121 + if (var1 <= (float)this.field1393[var6].field1359) { + var3 = var6; + break; } - if (var1 < (float)this.field1393[var6 + 1].field1359) { // L: 111 - var3 = var6; // L: 112 - break; // L: 113 + if (var1 < (float)this.field1393[var6 + 1].field1359) { + var3 = var6; + break; } - var4 = var6 + 1; // L: 116 + var4 = var6 + 1; } - } while(var4 <= var5); // L: 123 + } while(var4 <= var5); } - if (var3 != this.field1404) { // L: 125 - this.field1404 = var3; // L: 126 - this.field1403 = true; // L: 127 + if (var3 != this.field1404) { + this.field1404 = var3; + this.field1403 = true; } - return this.field1404; // L: 129 + return this.field1404; } else { - return -1; // L: 92 + return -1; } } else { - return this.field1404; // L: 89 + return this.field1404; } } @@ -221,8 +221,8 @@ public class class115 { garbageValue = "80" ) class111 method2631(float var1) { - int var2 = this.method2630(var1); // L: 133 - return var2 >= 0 && var2 < this.field1393.length ? this.field1393[var2] : null; // L: 134 135 138 + int var2 = this.method2630(var1); + return var2 >= 0 && var2 < this.field1393.length ? this.field1393[var2] : null; } @ObfuscatedName("w") @@ -231,7 +231,7 @@ public class class115 { garbageValue = "1810339438" ) int method2637() { - return this.field1393 == null ? 0 : this.field1393.length; // L: 143 144 + return this.field1393 == null ? 0 : this.field1393.length; } @ObfuscatedName("jv") @@ -241,20 +241,20 @@ public class class115 { ) @Export("revalidateWidgetScroll") static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { - int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * -362959503 * 351761297 : var1.width * -559707675 * 137530349; // L: 10925 - int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * 991543577 * -390853847 : var1.height * 147077041 * -113659567; // L: 10926 - class92.resizeInterface(var0, var1.id, var3, var4, var2); // L: 10927 - if (var1.children != null) { // L: 10928 + int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * -362959503 * 351761297 : var1.width * -559707675 * 137530349; + int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * 991543577 * -390853847 : var1.height * 147077041 * -113659567; + class92.resizeInterface(var0, var1.id, var3, var4, var2); + if (var1.children != null) { class92.resizeInterface(var1.children, var1.id, var3, var4, var2); } - InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); // L: 10929 + InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); if (var5 != null) { - class18.method297(var5.group, var3, var4, var2); // L: 10930 + class18.method297(var5.group, var3, var4, var2); } - if (var1.contentType == 1337) { // L: 10931 + if (var1.contentType == 1337) { } - } // L: 10932 + } } diff --git a/runescape-client/src/main/java/class116.java b/runescape-client/src/main/java/class116.java index 03d9b428d1..3e8abf2db6 100644 --- a/runescape-client/src/main/java/class116.java +++ b/runescape-client/src/main/java/class116.java @@ -52,19 +52,19 @@ public class class116 implements MouseWheel { final int field1422; static { - field1421 = new class116(0, 0, (String)null, 0); // L: 14 - field1415 = new class116(1, 1, (String)null, 9); // L: 15 - field1416 = new class116(2, 2, (String)null, 3); // L: 16 - field1423 = new class116(3, 3, (String)null, 6); // L: 17 - field1418 = new class116(4, 4, (String)null, 1); // L: 18 - field1419 = new class116(5, 5, (String)null, 3); // L: 19 + field1421 = new class116(0, 0, (String)null, 0); + field1415 = new class116(1, 1, (String)null, 9); + field1416 = new class116(2, 2, (String)null, 3); + field1423 = new class116(3, 3, (String)null, 6); + field1418 = new class116(4, 4, (String)null, 1); + field1419 = new class116(5, 5, (String)null, 3); } class116(int var1, int var2, String var3, int var4) { - this.field1420 = var1; // L: 29 - this.field1417 = var2; // L: 30 - this.field1422 = var4; // L: 31 - } // L: 32 + this.field1420 = var1; + this.field1417 = var2; + this.field1422 = var4; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -73,7 +73,7 @@ public class class116 implements MouseWheel { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field1417; // L: 40 + return this.field1417; } @ObfuscatedName("p") @@ -82,12 +82,12 @@ public class class116 implements MouseWheel { garbageValue = "94" ) int method2669() { - return this.field1422; // L: 35 + return this.field1422; } @ObfuscatedName("p") public static boolean method2671(long var0) { - return 0L != var0 && !class12.method188(var0); // L: 56 + return 0L != var0 && !class12.method188(var0); } @ObfuscatedName("ai") @@ -97,7 +97,7 @@ public class class116 implements MouseWheel { ) @Export("stringCp1252NullTerminatedByteSize") public static int stringCp1252NullTerminatedByteSize(String var0) { - return var0.length() + 1; // L: 117 + return var0.length() + 1; } @ObfuscatedName("fh") @@ -106,45 +106,45 @@ public class class116 implements MouseWheel { garbageValue = "55" ) static void method2662() { - Client.packetWriter.clearBuffer(); // L: 3417 - Client.packetWriter.packetBuffer.offset = 0; // L: 3418 - Client.packetWriter.serverPacket = null; // L: 3419 - Client.packetWriter.field1289 = null; // L: 3420 - Client.packetWriter.field1290 = null; // L: 3421 - Client.packetWriter.field1291 = null; // L: 3422 - Client.packetWriter.serverPacketLength = 0; // L: 3423 - Client.packetWriter.field1287 = 0; // L: 3424 - Client.rebootTimer = 0; // L: 3425 - UrlRequest.method2489(); // L: 3426 - Client.minimapState = 0; // L: 3427 - Client.destinationX = 0; // L: 3428 + Client.packetWriter.clearBuffer(); + Client.packetWriter.packetBuffer.offset = 0; + Client.packetWriter.serverPacket = null; + Client.packetWriter.field1289 = null; + Client.packetWriter.field1290 = null; + Client.packetWriter.field1291 = null; + Client.packetWriter.serverPacketLength = 0; + Client.packetWriter.field1287 = 0; + Client.rebootTimer = 0; + UrlRequest.method2489(); + Client.minimapState = 0; + Client.destinationX = 0; int var0; - for (var0 = 0; var0 < 2048; ++var0) { // L: 3429 + for (var0 = 0; var0 < 2048; ++var0) { Client.players[var0] = null; } - class340.localPlayer = null; // L: 3430 + class340.localPlayer = null; - for (var0 = 0; var0 < Client.npcs.length; ++var0) { // L: 3431 - NPC var1 = Client.npcs[var0]; // L: 3432 - if (var1 != null) { // L: 3433 - var1.targetIndex = -1; // L: 3434 - var1.false0 = false; // L: 3435 + for (var0 = 0; var0 < Client.npcs.length; ++var0) { + NPC var1 = Client.npcs[var0]; + if (var1 != null) { + var1.targetIndex = -1; + var1.false0 = false; } } - ItemContainer.itemContainers = new NodeHashTable(32); // L: 3439 - VertexNormal.updateGameState(30); // L: 3441 + ItemContainer.itemContainers = new NodeHashTable(32); + VertexNormal.updateGameState(30); - for (var0 = 0; var0 < 100; ++var0) { // L: 3442 + for (var0 = 0; var0 < 100; ++var0) { Client.field504[var0] = true; } - PacketBufferNode var2 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2824, Client.packetWriter.isaacCipher); // L: 3445 - var2.packetBuffer.writeByte(class143.getWindowedMode()); // L: 3446 - var2.packetBuffer.writeShort(class186.canvasWidth); // L: 3447 - var2.packetBuffer.writeShort(BoundaryObject.canvasHeight); // L: 3448 - Client.packetWriter.addNode(var2); // L: 3449 - } // L: 3451 + PacketBufferNode var2 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2824, Client.packetWriter.isaacCipher); + var2.packetBuffer.writeByte(class143.getWindowedMode()); + var2.packetBuffer.writeShort(class186.canvasWidth); + var2.packetBuffer.writeShort(BoundaryObject.canvasHeight); + Client.packetWriter.addNode(var2); + } } diff --git a/runescape-client/src/main/java/class117.java b/runescape-client/src/main/java/class117.java index 1c22f99a31..68b44f090c 100644 --- a/runescape-client/src/main/java/class117.java +++ b/runescape-client/src/main/java/class117.java @@ -112,23 +112,23 @@ public class class117 implements MouseWheel { final int field1443; static { - field1425 = new class117(0, 0, (String)null, -1, -1); // L: 46 - field1444 = new class117(1, 1, (String)null, 0, 2); // L: 47 - field1430 = new class117(2, 2, (String)null, 1, 2); // L: 48 - field1427 = new class117(3, 3, (String)null, 2, 2); // L: 49 - field1428 = new class117(4, 4, (String)null, 3, 1); // L: 50 - field1429 = new class117(5, 5, (String)null, 4, 1); // L: 51 - field1442 = new class117(6, 6, (String)null, 5, 1); // L: 52 - field1431 = new class117(7, 7, (String)null, 6, 3); // L: 53 - field1432 = new class117(8, 8, (String)null, 7, 3); // L: 54 - field1424 = new class117(9, 9, (String)null, 8, 3); // L: 55 - field1434 = new class117(10, 10, (String)null, 0, 7); // L: 56 - field1435 = new class117(11, 11, (String)null, 1, 7); // L: 57 - field1436 = new class117(12, 12, (String)null, 2, 7); // L: 58 - field1437 = new class117(13, 13, (String)null, 3, 7); // L: 59 - field1438 = new class117(14, 14, (String)null, 4, 7); // L: 60 - field1439 = new class117(15, 15, (String)null, 5, 7); // L: 61 - field1440 = new class117(16, 16, (String)null, 0, 5); // L: 62 + field1425 = new class117(0, 0, (String)null, -1, -1); + field1444 = new class117(1, 1, (String)null, 0, 2); + field1430 = new class117(2, 2, (String)null, 1, 2); + field1427 = new class117(3, 3, (String)null, 2, 2); + field1428 = new class117(4, 4, (String)null, 3, 1); + field1429 = new class117(5, 5, (String)null, 4, 1); + field1442 = new class117(6, 6, (String)null, 5, 1); + field1431 = new class117(7, 7, (String)null, 6, 3); + field1432 = new class117(8, 8, (String)null, 7, 3); + field1424 = new class117(9, 9, (String)null, 8, 3); + field1434 = new class117(10, 10, (String)null, 0, 7); + field1435 = new class117(11, 11, (String)null, 1, 7); + field1436 = new class117(12, 12, (String)null, 2, 7); + field1437 = new class117(13, 13, (String)null, 3, 7); + field1438 = new class117(14, 14, (String)null, 4, 7); + field1439 = new class117(15, 15, (String)null, 5, 7); + field1440 = new class117(16, 16, (String)null, 0, 5); } @ObfuscatedSignature( @@ -136,10 +136,10 @@ public class class117 implements MouseWheel { garbageValue = "-1" ) class117(int var1, int var2, String var3, int var4, int var5) { - this.field1441 = var1; // L: 72 - this.field1426 = var2; // L: 73 - this.field1443 = var4; // L: 74 - } // L: 75 + this.field1441 = var1; + this.field1426 = var2; + this.field1443 = var4; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -148,7 +148,7 @@ public class class117 implements MouseWheel { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field1426; // L: 78 + return this.field1426; } @ObfuscatedName("p") @@ -157,7 +157,7 @@ public class class117 implements MouseWheel { garbageValue = "-202233185" ) int method2674() { - return this.field1443; // L: 82 + return this.field1443; } @ObfuscatedName("j") @@ -166,7 +166,7 @@ public class class117 implements MouseWheel { garbageValue = "8" ) public static boolean method2676(int var0) { - return var0 >= 0 && var0 < 112 ? KeyHandler.field130[var0] : false; // L: 246 247 + return var0 >= 0 && var0 < 112 ? KeyHandler.field130[var0] : false; } @ObfuscatedName("fw") @@ -175,14 +175,14 @@ public class class117 implements MouseWheel { garbageValue = "0" ) static final void method2682() { - if (class121.field1470) { // L: 4383 - for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 4385 - Player var1 = Client.players[Players.Players_indices[var0]]; // L: 4386 - var1.method2186(); // L: 4387 + if (class121.field1470) { + for (int var0 = 0; var0 < Players.Players_count; ++var0) { + Player var1 = Client.players[Players.Players_indices[var0]]; + var1.method2186(); } - class121.field1470 = false; // L: 4390 + class121.field1470 = false; } - } // L: 4392 + } } diff --git a/runescape-client/src/main/java/class118.java b/runescape-client/src/main/java/class118.java index 525a42d90c..03fd1b69e2 100644 --- a/runescape-client/src/main/java/class118.java +++ b/runescape-client/src/main/java/class118.java @@ -18,20 +18,20 @@ public class class118 implements class110 { garbageValue = "1101501436" ) static void method2686() { - 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 - WorldMapLabelSize.field2580 = new byte[4][104][104]; // L: 52 - ClanChannelMember.field1504 = new int[4][105][105]; // L: 53 - SoundCache.field321 = new byte[4][105][105]; // L: 54 - class194.field2280 = new int[105][105]; // L: 55 - Tiles.Tiles_hue = new int[104]; // L: 56 - User.Tiles_saturation = new int[104]; // L: 57 - Tiles.Tiles_lightness = new int[104]; // L: 58 - UserComparator5.Tiles_hueMultiplier = new int[104]; // L: 59 - VerticalAlignment.field1874 = new int[104]; // L: 60 - } // L: 61 + Tiles.Tiles_minPlane = 99; + Tiles.Tiles_underlays = new byte[4][104][104]; + Tiles.Tiles_overlays = new byte[4][104][104]; + Tiles.Tiles_shapes = new byte[4][104][104]; + WorldMapLabelSize.field2580 = new byte[4][104][104]; + ClanChannelMember.field1504 = new int[4][105][105]; + SoundCache.field321 = new byte[4][105][105]; + class194.field2280 = new int[105][105]; + Tiles.Tiles_hue = new int[104]; + User.Tiles_saturation = new int[104]; + Tiles.Tiles_lightness = new int[104]; + UserComparator5.Tiles_hueMultiplier = new int[104]; + VerticalAlignment.field1874 = new int[104]; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -39,18 +39,18 @@ public class class118 implements class110 { garbageValue = "21" ) public static HealthBarDefinition method2683(int var0) { - HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cachedSprites.get((long)var0); // L: 37 - if (var1 != null) { // L: 38 + HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cachedSprites.get((long)var0); + if (var1 != null) { return var1; } else { - byte[] var2 = GrandExchangeOfferAgeComparator.HealthBarDefinition_archive.takeFile(33, var0); // L: 39 - var1 = new HealthBarDefinition(); // L: 40 - if (var2 != null) { // L: 41 + byte[] var2 = GrandExchangeOfferAgeComparator.HealthBarDefinition_archive.takeFile(33, var0); + var1 = new HealthBarDefinition(); + if (var2 != null) { var1.decode(new Buffer(var2)); } - HealthBarDefinition.HealthBarDefinition_cachedSprites.put(var1, (long)var0); // L: 42 - return var1; // L: 43 + HealthBarDefinition.HealthBarDefinition_cachedSprites.put(var1, (long)var0); + return var1; } } @@ -61,11 +61,11 @@ public class class118 implements class110 { ) @Export("sortWorldList") static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { - if (class334.World_worlds != null) { // L: 171 - class286.doWorldSorting(0, class334.World_worlds.length - 1, var0, var1, var2, var3); // L: 172 + if (class334.World_worlds != null) { + class286.doWorldSorting(0, class334.World_worlds.length - 1, var0, var1, var2, var3); } - } // L: 174 + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -73,26 +73,26 @@ public class class118 implements class110 { garbageValue = "28" ) public static byte[] method2684() { - byte[] var0 = new byte[24]; // L: 131 + byte[] var0 = new byte[24]; try { - JagexCache.JagexCache_randomDat.seek(0L); // L: 133 - JagexCache.JagexCache_randomDat.readFully(var0); // L: 134 + JagexCache.JagexCache_randomDat.seek(0L); + JagexCache.JagexCache_randomDat.readFully(var0); int var1; - for (var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) { // L: 135 136 137 + for (var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) { } if (var1 >= 24) { - throw new IOException(); // L: 139 + throw new IOException(); } } catch (Exception var4) { - for (int var2 = 0; var2 < 24; ++var2) { // L: 142 + for (int var2 = 0; var2 < 24; ++var2) { var0[var2] = -1; } } - return var0; // L: 144 + return var0; } @ObfuscatedName("jl") @@ -102,69 +102,69 @@ public class class118 implements class110 { ) @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: 10389 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 10390 + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - for (int var9 = 0; var9 < var0.length; ++var9) { // L: 10391 - Widget var10 = var0[var9]; // L: 10392 - if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { // L: 10393 10394 + for (int var9 = 0; var9 < var0.length; ++var9) { + Widget var10 = var0[var9]; + if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { int var11; - if (var8 == -1) { // L: 10396 - Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; // L: 10397 - Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; // L: 10398 - Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; // L: 10399 - Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; // L: 10400 - var11 = ++Client.rootWidgetCount - 1; // L: 10401 + if (var8 == -1) { + Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; + Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; + Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; + Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; + var11 = ++Client.rootWidgetCount - 1; } else { - var11 = var8; // L: 10403 + var11 = var8; } - var10.rootIndex = var11; // L: 10404 - var10.cycle = Client.cycle; // L: 10405 - if (!var10.isIf3 || !StudioGame.isComponentHidden(var10)) { // L: 10406 - if (var10.contentType > 0) { // L: 10407 + var10.rootIndex = var11; + var10.cycle = Client.cycle; + if (!var10.isIf3 || !StudioGame.isComponentHidden(var10)) { + if (var10.contentType > 0) { AbstractWorldMapData.method4787(var10); } - int var12 = var10.x + var6; // L: 10408 - int var13 = var7 + var10.y; // L: 10409 - int var14 = var10.transparencyTop; // L: 10410 + int var12 = var10.x + var6; + int var13 = var7 + var10.y; + int var14 = var10.transparencyTop; int var15; int var16; - if (var10 == Client.clickedWidget) { // L: 10411 - if (var1 != -1412584499 && !var10.isScrollBar) { // L: 10412 - BufferedFile.field4430 = var0; // L: 10413 - HitSplatDefinition.field1945 = var6; // L: 10414 - class78.field1000 = var7; // L: 10415 - continue; // L: 10416 + if (var10 == Client.clickedWidget) { + if (var1 != -1412584499 && !var10.isScrollBar) { + BufferedFile.field4430 = var0; + HitSplatDefinition.field1945 = var6; + class78.field1000 = var7; + continue; } - if (Client.isDraggingWidget && Client.field531) { // L: 10418 - var15 = MouseHandler.MouseHandler_x; // L: 10419 - var16 = MouseHandler.MouseHandler_y; // L: 10420 - var15 -= Client.widgetClickX; // L: 10421 - var16 -= Client.widgetClickY; // L: 10422 - if (var15 < Client.field681) { // L: 10423 + if (Client.isDraggingWidget && Client.field531) { + var15 = MouseHandler.MouseHandler_x; + var16 = MouseHandler.MouseHandler_y; + var15 -= Client.widgetClickX; + var16 -= Client.widgetClickY; + if (var15 < Client.field681) { var15 = Client.field681; } - if (var15 + var10.width > Client.field681 + Client.clickedWidgetParent.width) { // L: 10424 + if (var15 + var10.width > Client.field681 + Client.clickedWidgetParent.width) { var15 = Client.field681 + Client.clickedWidgetParent.width - var10.width; } - if (var16 < Client.field659) { // L: 10425 + if (var16 < Client.field659) { var16 = Client.field659; } - if (var16 + var10.height > Client.field659 + Client.clickedWidgetParent.height) { // L: 10426 + if (var16 + var10.height > Client.field659 + Client.clickedWidgetParent.height) { var16 = Client.field659 + Client.clickedWidgetParent.height - var10.height; } - var12 = var15; // L: 10427 - var13 = var16; // L: 10428 + var12 = var15; + var13 = var16; } - if (!var10.isScrollBar) { // L: 10430 + if (!var10.isScrollBar) { var14 = 128; } } @@ -175,543 +175,543 @@ public class class118 implements class110 { int var20; int var21; int var22; - if (var10.type == 2) { // L: 10436 - var15 = var2; // L: 10437 - var16 = var3; // L: 10438 - var17 = var4; // L: 10439 - var18 = var5; // L: 10440 - } else if (var10.type == 9) { // L: 10442 - var19 = var12; // L: 10443 - var20 = var13; // L: 10444 - var21 = var12 + var10.width; // L: 10445 - var22 = var13 + var10.height; // L: 10446 - if (var21 < var12) { // L: 10447 - var19 = var21; // L: 10449 - var21 = var12; // L: 10450 + if (var10.type == 2) { + var15 = var2; + var16 = var3; + var17 = var4; + var18 = var5; + } else if (var10.type == 9) { + var19 = var12; + var20 = var13; + var21 = var12 + var10.width; + var22 = var13 + var10.height; + if (var21 < var12) { + var19 = var21; + var21 = var12; } - if (var22 < var13) { // L: 10452 - var20 = var22; // L: 10454 - var22 = var13; // L: 10455 + if (var22 < var13) { + var20 = var22; + var22 = var13; } - ++var21; // L: 10457 - ++var22; // L: 10458 - var15 = var19 > var2 ? var19 : var2; // L: 10459 - var16 = var20 > var3 ? var20 : var3; // L: 10460 - var17 = var21 < var4 ? var21 : var4; // L: 10461 - var18 = var22 < var5 ? var22 : var5; // L: 10462 + ++var21; + ++var22; + var15 = var19 > var2 ? var19 : var2; + var16 = var20 > var3 ? var20 : var3; + var17 = var21 < var4 ? var21 : var4; + var18 = var22 < var5 ? var22 : var5; } else { - var19 = var12 + var10.width; // L: 10465 - var20 = var13 + var10.height; // L: 10466 - var15 = var12 > var2 ? var12 : var2; // L: 10467 - var16 = var13 > var3 ? var13 : var3; // L: 10468 - var17 = var19 < var4 ? var19 : var4; // L: 10469 - var18 = var20 < var5 ? var20 : var5; // L: 10470 + var19 = var12 + var10.width; + var20 = var13 + var10.height; + var15 = var12 > var2 ? var12 : var2; + var16 = var13 > var3 ? var13 : var3; + var17 = var19 < var4 ? var19 : var4; + var18 = var20 < var5 ? var20 : var5; } - if (!var10.isIf3 || var15 < var17 && var16 < var18) { // L: 10472 - if (var10.contentType != 0) { // L: 10473 - if (var10.contentType == 1336) { // L: 10474 - if (Client.displayFps) { // L: 10475 - var13 += 15; // L: 10476 - class114.fontPlain12.drawRightAligned("Fps:" + GameEngine.fps, var12 + var10.width, var13, 16776960, -1); // L: 10477 - var13 += 15; // L: 10478 - Runtime var42 = Runtime.getRuntime(); // L: 10479 - var20 = (int)((var42.totalMemory() - var42.freeMemory()) / 1024L); // L: 10480 - var21 = 16776960; // L: 10481 - if (var20 > 327680 && !Client.isLowDetail) { // L: 10482 + if (!var10.isIf3 || var15 < var17 && var16 < var18) { + if (var10.contentType != 0) { + if (var10.contentType == 1336) { + if (Client.displayFps) { + var13 += 15; + class114.fontPlain12.drawRightAligned("Fps:" + GameEngine.fps, var12 + var10.width, var13, 16776960, -1); + var13 += 15; + Runtime var42 = Runtime.getRuntime(); + var20 = (int)((var42.totalMemory() - var42.freeMemory()) / 1024L); + var21 = 16776960; + if (var20 > 327680 && !Client.isLowDetail) { var21 = 16711680; } - class114.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); // L: 10483 - var13 += 15; // L: 10484 + class114.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); + var13 += 15; } continue; } - if (var10.contentType == 1337) { // L: 10488 - Client.viewportX = var12; // L: 10489 - Client.viewportY = var13; // L: 10490 - class291.drawEntities(var12, var13, var10.width, var10.height); // L: 10491 - Client.field504[var10.rootIndex] = true; // L: 10492 - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10493 - continue; // L: 10494 + if (var10.contentType == 1337) { + Client.viewportX = var12; + Client.viewportY = var13; + class291.drawEntities(var12, var13, var10.width, var10.height); + Client.field504[var10.rootIndex] = true; + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + continue; } - if (var10.contentType == 1338) { // L: 10496 - class148.drawMinimap(var10, var12, var13, var11); // L: 10497 - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10498 - continue; // L: 10499 + if (var10.contentType == 1338) { + class148.drawMinimap(var10, var12, var13, var11); + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + continue; } - if (var10.contentType == 1339) { // L: 10501 - User.drawCompass(var10, var12, var13, var11); // L: 10502 - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10503 - continue; // L: 10504 + if (var10.contentType == 1339) { + User.drawCompass(var10, var12, var13, var11); + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + continue; } - if (var10.contentType == 1400) { // L: 10506 - Varcs.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); // L: 10507 + if (var10.contentType == 1400) { + Varcs.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); } - if (var10.contentType == 1401) { // L: 10509 - Varcs.worldMap.drawOverview(var12, var13, var10.width, var10.height); // L: 10510 + if (var10.contentType == 1401) { + Varcs.worldMap.drawOverview(var12, var13, var10.width, var10.height); } - if (var10.contentType == 1402) { // L: 10512 - Client.loginScreenRunesAnimation.draw(var12, Client.cycle); // L: 10513 + if (var10.contentType == 1402) { + Client.loginScreenRunesAnimation.draw(var12, Client.cycle); } } - if (var10.type == 0) { // L: 10516 - if (!var10.isIf3 && StudioGame.isComponentHidden(var10) && var10 != class4.mousedOverWidgetIf1) { // L: 10517 + if (var10.type == 0) { + if (!var10.isIf3 && StudioGame.isComponentHidden(var10) && var10 != class4.mousedOverWidgetIf1) { continue; } - if (!var10.isIf3) { // L: 10518 - if (var10.scrollY > var10.scrollHeight - var10.height) { // L: 10519 + if (!var10.isIf3) { + if (var10.scrollY > var10.scrollHeight - var10.height) { var10.scrollY = var10.scrollHeight - var10.height; } - if (var10.scrollY < 0) { // L: 10520 + if (var10.scrollY < 0) { var10.scrollY = 0; } } - drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); // L: 10522 - if (var10.children != null) { // L: 10523 + drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); + if (var10.children != null) { drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); } - InterfaceParent var30 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); // L: 10524 - if (var30 != null) { // L: 10525 - class12.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); // L: 10526 + InterfaceParent var30 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); + if (var30 != null) { + class12.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); } - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10528 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 10529 + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); } - if (Client.isResizable || Client.field687[var11] || Client.gameDrawingMode > 1) { // L: 10531 - if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { // L: 10532 10533 + if (Client.isResizable || Client.field687[var11] || Client.gameDrawingMode > 1) { + if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { class129.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); } - if (var10.type != 1) { // L: 10535 + if (var10.type != 1) { int var23; int var24; int var25; int var26; - if (var10.type == 2) { // L: 10538 - var19 = 0; // L: 10539 + if (var10.type == 2) { + var19 = 0; - for (var20 = 0; var20 < var10.rawHeight; ++var20) { // L: 10540 - for (var21 = 0; var21 < var10.rawWidth; ++var21) { // L: 10541 - var22 = var12 + var21 * (var10.paddingX + 32); // L: 10542 - var23 = var20 * (var10.paddingY + 32) + var13; // L: 10543 - if (var19 < 20) { // L: 10544 - var22 += var10.inventoryXOffsets[var19]; // L: 10545 - var23 += var10.inventoryYOffsets[var19]; // L: 10546 + for (var20 = 0; var20 < var10.rawHeight; ++var20) { + for (var21 = 0; var21 < var10.rawWidth; ++var21) { + var22 = var12 + var21 * (var10.paddingX + 32); + var23 = var20 * (var10.paddingY + 32) + var13; + if (var19 < 20) { + var22 += var10.inventoryXOffsets[var19]; + var23 += var10.inventoryYOffsets[var19]; } - if (var10.itemIds[var19] <= 0) { // L: 10548 - if (var10.inventorySprites != null && var19 < 20) { // L: 10593 - SpritePixels var46 = var10.getInventorySprite(var19); // L: 10594 - if (var46 != null) { // L: 10595 + if (var10.itemIds[var19] <= 0) { + if (var10.inventorySprites != null && var19 < 20) { + SpritePixels var46 = var10.getInventorySprite(var19); + if (var46 != null) { var46.drawTransBgAt(var22, var23); - } else if (Widget.field3223) { // L: 10596 + } else if (Widget.field3223) { SecureRandomCallable.invalidateWidget(var10); } } } else { - boolean var37 = false; // L: 10549 - boolean var38 = false; // L: 10550 - var26 = var10.itemIds[var19] - 1; // L: 10551 - if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == class143.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 10552 + boolean var37 = false; + boolean var38 = false; + var26 = var10.itemIds[var19] - 1; + if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == class143.dragInventoryWidget && var19 == Client.dragItemSlotSource) { SpritePixels var35; - if (Client.isItemSelected == 1 && var19 == Calendar.selectedItemSlot && var10.id == MidiPcmStream.selectedItemWidget) { // L: 10554 + if (Client.isItemSelected == 1 && var19 == Calendar.selectedItemSlot && var10.id == MidiPcmStream.selectedItemWidget) { var35 = EnumComposition.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false); } else { - var35 = EnumComposition.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); // L: 10555 + var35 = EnumComposition.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); } - if (var35 != null) { // L: 10556 - if (var10 == class143.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 10557 - var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX; // L: 10558 - var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY; // L: 10559 - if (var24 < 5 && var24 > -5) { // L: 10560 + if (var35 != null) { + if (var10 == class143.dragInventoryWidget && var19 == Client.dragItemSlotSource) { + var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX; + var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY; + if (var24 < 5 && var24 > -5) { var24 = 0; } - if (var25 < 5 && var25 > -5) { // L: 10561 + if (var25 < 5 && var25 > -5) { var25 = 0; } - if (Client.itemDragDuration < 5) { // L: 10562 - var24 = 0; // L: 10563 - var25 = 0; // L: 10564 + if (Client.itemDragDuration < 5) { + var24 = 0; + var25 = 0; } - var35.drawTransAt(var22 + var24, var23 + var25, 128); // L: 10566 - if (var1 != -1) { // L: 10567 - Widget var28 = var0[var1 & 65535]; // L: 10568 + var35.drawTransAt(var22 + var24, var23 + var25, 128); + if (var1 != -1) { + Widget var28 = var0[var1 & 65535]; int var29; - if (var25 + var23 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { // L: 10569 - var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field538 / 3; // L: 10570 - if (var29 > Client.field538 * 10) { // L: 10571 + if (var25 + var23 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { + var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field538 / 3; + if (var29 > Client.field538 * 10) { var29 = Client.field538 * 10; } - if (var29 > var28.scrollY) { // L: 10572 + if (var29 > var28.scrollY) { var29 = var28.scrollY; } - var28.scrollY -= var29; // L: 10573 - Client.draggedWidgetY += var29; // L: 10574 - SecureRandomCallable.invalidateWidget(var28); // L: 10575 + var28.scrollY -= var29; + Client.draggedWidgetY += var29; + SecureRandomCallable.invalidateWidget(var28); } - if (var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { // L: 10577 - var29 = (var25 + var23 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field538 / 3; // L: 10578 - if (var29 > Client.field538 * 10) { // L: 10579 + if (var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { + var29 = (var25 + var23 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field538 / 3; + if (var29 > Client.field538 * 10) { var29 = Client.field538 * 10; } - if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { // L: 10580 + if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { var29 = var28.scrollHeight - var28.height - var28.scrollY; } - var28.scrollY += var29; // L: 10581 - Client.draggedWidgetY -= var29; // L: 10582 - SecureRandomCallable.invalidateWidget(var28); // L: 10583 + var28.scrollY += var29; + Client.draggedWidgetY -= var29; + SecureRandomCallable.invalidateWidget(var28); } } - } else if (var10 == WorldMapDecoration.field2722 && var19 == Client.field599) { // L: 10587 + } else if (var10 == WorldMapDecoration.field2722 && var19 == Client.field599) { var35.drawTransAt(var22, var23, 128); } else { - var35.drawTransBgAt(var22, var23); // L: 10588 + var35.drawTransBgAt(var22, var23); } } else { - SecureRandomCallable.invalidateWidget(var10); // L: 10590 + SecureRandomCallable.invalidateWidget(var10); } } } - ++var19; // L: 10598 + ++var19; } } - } else if (var10.type == 3) { // L: 10603 - if (class28.runCs1(var10)) { // L: 10605 - var19 = var10.color2; // L: 10606 - if (var10 == class4.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 10607 + } else if (var10.type == 3) { + if (class28.runCs1(var10)) { + var19 = var10.color2; + if (var10 == class4.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { var19 = var10.mouseOverColor2; } } else { - var19 = var10.color; // L: 10610 - if (var10 == class4.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 10611 + var19 = var10.color; + if (var10 == class4.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { var19 = var10.mouseOverColor; } } - if (var10.fill) { // L: 10613 - switch(var10.fillMode.field4554) { // L: 10614 + if (var10.fill) { + switch(var10.fillMode.field4554) { case 1: - Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); // L: 10616 - break; // L: 10617 + Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); + break; case 2: - Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); // L: 10623 - break; // L: 10624 + Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); + break; default: - if (var14 == 0) { // L: 10619 + if (var14 == 0) { Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var19); } else { - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); // L: 10620 + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); } } - } else if (var14 == 0) { // L: 10628 + } else if (var14 == 0) { Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var19); } else { - Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); // L: 10629 + Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); } } else { Font var39; - if (var10.type == 4) { // L: 10633 - var39 = var10.getFont(); // L: 10634 - if (var39 == null) { // L: 10635 - if (Widget.field3223) { // L: 10636 + if (var10.type == 4) { + var39 = var10.getFont(); + if (var39 == null) { + if (Widget.field3223) { SecureRandomCallable.invalidateWidget(var10); } } else { - String var44 = var10.text; // L: 10640 - if (class28.runCs1(var10)) { // L: 10641 - var20 = var10.color2; // L: 10642 - if (var10 == class4.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 10643 + String var44 = var10.text; + if (class28.runCs1(var10)) { + var20 = var10.color2; + if (var10 == class4.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { var20 = var10.mouseOverColor2; } - if (var10.text2.length() > 0) { // L: 10644 + if (var10.text2.length() > 0) { var44 = var10.text2; } } else { - var20 = var10.color; // L: 10647 - if (var10 == class4.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 10648 + var20 = var10.color; + if (var10 == class4.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { var20 = var10.mouseOverColor; } } - if (var10.isIf3 && var10.itemId != -1) { // L: 10650 - ItemComposition var45 = UserComparator6.ItemDefinition_get(var10.itemId); // L: 10651 - var44 = var45.name; // L: 10652 - if (var44 == null) { // L: 10653 + if (var10.isIf3 && var10.itemId != -1) { + ItemComposition var45 = UserComparator6.ItemDefinition_get(var10.itemId); + var44 = var45.name; + if (var44 == null) { var44 = "null"; } - if ((var45.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { // L: 10654 + if ((var45.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { var44 = UserComparator5.colorStartTag(16748608) + var44 + "" + " " + 'x' + FriendSystem.formatItemStacks(var10.itemQuantity); } } - if (var10 == Client.meslayerContinueWidget) { // L: 10656 - var44 = "Please wait..."; // L: 10657 - var20 = var10.color; // L: 10658 + if (var10 == Client.meslayerContinueWidget) { + var44 = "Please wait..."; + var20 = var10.color; } - if (!var10.isIf3) { // L: 10660 + if (!var10.isIf3) { var44 = class7.method60(var44, var10); } - var39.drawLines(var44, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); // L: 10661 + var39.drawLines(var44, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); } - } else if (var10.type == 5) { // L: 10664 + } else if (var10.type == 5) { SpritePixels var40; - if (!var10.isIf3) { // L: 10665 - var40 = var10.getSprite(class28.runCs1(var10)); // L: 10666 - if (var40 != null) { // L: 10667 + if (!var10.isIf3) { + var40 = var10.getSprite(class28.runCs1(var10)); + if (var40 != null) { var40.drawTransBgAt(var12, var13); - } else if (Widget.field3223) { // L: 10668 + } else if (Widget.field3223) { SecureRandomCallable.invalidateWidget(var10); } } else { - if (var10.itemId != -1) { // L: 10672 + if (var10.itemId != -1) { var40 = EnumComposition.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); } else { - var40 = var10.getSprite(false); // L: 10673 + var40 = var10.getSprite(false); } - if (var40 == null) { // L: 10674 - if (Widget.field3223) { // L: 10698 + if (var40 == null) { + if (Widget.field3223) { SecureRandomCallable.invalidateWidget(var10); } } else { - var20 = var40.width; // L: 10675 - var21 = var40.height; // L: 10676 - if (!var10.spriteTiling) { // L: 10677 - var22 = var10.width * 4096 / var20; // L: 10691 - if (var10.spriteAngle != 0) { // L: 10692 + var20 = var40.width; + var21 = var40.height; + if (!var10.spriteTiling) { + var22 = var10.width * 4096 / var20; + if (var10.spriteAngle != 0) { var40.method7781(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); - } else if (var14 != 0) { // L: 10693 + } else if (var14 != 0) { var40.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); - } else if (var20 == var10.width && var21 == var10.height) { // L: 10694 - var40.drawTransBgAt(var12, var13); // L: 10695 + } else if (var20 == var10.width && var21 == var10.height) { + var40.drawTransBgAt(var12, var13); } else { var40.drawScaledAt(var12, var13, var10.width, var10.height); } } else { - Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); // L: 10678 - var22 = (var20 - 1 + var10.width) / var20; // L: 10679 - var23 = (var21 - 1 + var10.height) / var21; // L: 10680 + Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); + var22 = (var20 - 1 + var10.width) / var20; + var23 = (var21 - 1 + var10.height) / var21; - for (var24 = 0; var24 < var22; ++var24) { // L: 10681 - for (var25 = 0; var25 < var23; ++var25) { // L: 10682 - if (var10.spriteAngle != 0) { // L: 10683 + for (var24 = 0; var24 < var22; ++var24) { + for (var25 = 0; var25 < var23; ++var25) { + if (var10.spriteAngle != 0) { var40.method7781(var20 / 2 + var12 + var20 * var24, var21 / 2 + var13 + var25 * var21, var10.spriteAngle, 4096); - } else if (var14 != 0) { // L: 10684 + } else if (var14 != 0) { var40.drawTransAt(var12 + var20 * var24, var13 + var25 * var21, 256 - (var14 & 255)); } else { - var40.drawTransBgAt(var12 + var24 * var20, var13 + var21 * var25); // L: 10685 + var40.drawTransBgAt(var12 + var24 * var20, var13 + var21 * var25); } } } - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10688 + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); } } } } else { ItemComposition var33; - if (var10.type == 6) { // L: 10702 - boolean var36 = class28.runCs1(var10); // L: 10703 - if (var36) { // L: 10705 + if (var10.type == 6) { + boolean var36 = class28.runCs1(var10); + if (var36) { var20 = var10.sequenceId2; } else { - var20 = var10.sequenceId; // L: 10706 + var20 = var10.sequenceId; } - Model var41 = null; // L: 10707 - var22 = 0; // L: 10708 - if (var10.itemId != -1) { // L: 10709 - var33 = UserComparator6.ItemDefinition_get(var10.itemId); // L: 10710 - if (var33 != null) { // L: 10711 - var33 = var33.getCountObj(var10.itemQuantity); // L: 10712 - var41 = var33.getModel(1); // L: 10713 - if (var41 != null) { // L: 10714 - var41.calculateBoundsCylinder(); // L: 10715 - var22 = var41.height / 2; // L: 10716 + Model var41 = null; + var22 = 0; + if (var10.itemId != -1) { + var33 = UserComparator6.ItemDefinition_get(var10.itemId); + if (var33 != null) { + var33 = var33.getCountObj(var10.itemQuantity); + var41 = var33.getModel(1); + if (var41 != null) { + var41.calculateBoundsCylinder(); + var22 = var41.height / 2; } else { - SecureRandomCallable.invalidateWidget(var10); // L: 10718 + SecureRandomCallable.invalidateWidget(var10); } } - } else if (var10.modelType == 5) { // L: 10721 - if (var10.modelId == 0) { // L: 10722 + } else if (var10.modelType == 5) { + if (var10.modelId == 0) { var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); } else { - var41 = class340.localPlayer.getModel(); // L: 10723 + var41 = class340.localPlayer.getModel(); } - } else if (var20 == -1) { // L: 10725 - var41 = var10.getModel((SequenceDefinition)null, -1, var36, class340.localPlayer.appearance); // L: 10726 - if (var41 == null && Widget.field3223) { // L: 10727 + } else if (var20 == -1) { + var41 = var10.getModel((SequenceDefinition)null, -1, var36, class340.localPlayer.appearance); + if (var41 == null && Widget.field3223) { SecureRandomCallable.invalidateWidget(var10); } } else { - SequenceDefinition var47 = UserComparator5.SequenceDefinition_get(var20); // L: 10730 - var41 = var10.getModel(var47, var10.modelFrame, var36, class340.localPlayer.appearance); // L: 10731 - if (var41 == null && Widget.field3223) { // L: 10732 + SequenceDefinition var47 = UserComparator5.SequenceDefinition_get(var20); + var41 = var10.getModel(var47, var10.modelFrame, var36, class340.localPlayer.appearance); + if (var41 == null && Widget.field3223) { SecureRandomCallable.invalidateWidget(var10); } } - Rasterizer3D.method3913(var10.width / 2 + var12, var10.height / 2 + var13); // L: 10734 - var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 10735 - var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 10736 - if (var41 != null) { // L: 10737 - if (!var10.isIf3) { // L: 10738 + Rasterizer3D.method3913(var10.width / 2 + var12, var10.height / 2 + var13); + var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; + var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; + if (var41 != null) { + if (!var10.isIf3) { var41.method4241(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); } else { - var41.calculateBoundsCylinder(); // L: 10740 - if (var10.modelOrthog) { // L: 10741 + var41.calculateBoundsCylinder(); + if (var10.modelOrthog) { var41.method4211(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); } else { - var41.method4241(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY); // L: 10742 + var41.method4241(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY); } } } - Rasterizer3D.Rasterizer3D_method3(); // L: 10745 + Rasterizer3D.Rasterizer3D_method3(); } else { - if (var10.type == 7) { // L: 10748 - var39 = var10.getFont(); // L: 10749 - if (var39 == null) { // L: 10750 - if (Widget.field3223) { // L: 10751 + if (var10.type == 7) { + var39 = var10.getFont(); + if (var39 == null) { + if (Widget.field3223) { SecureRandomCallable.invalidateWidget(var10); } continue; } - var20 = 0; // L: 10754 + var20 = 0; - for (var21 = 0; var21 < var10.rawHeight; ++var21) { // L: 10755 - for (var22 = 0; var22 < var10.rawWidth; ++var22) { // L: 10756 - if (var10.itemIds[var20] > 0) { // L: 10757 - var33 = UserComparator6.ItemDefinition_get(var10.itemIds[var20] - 1); // L: 10758 + for (var21 = 0; var21 < var10.rawHeight; ++var21) { + for (var22 = 0; var22 < var10.rawWidth; ++var22) { + if (var10.itemIds[var20] > 0) { + var33 = UserComparator6.ItemDefinition_get(var10.itemIds[var20] - 1); String var34; - if (var33.isStackable != 1 && var10.itemQuantities[var20] == 1) { // L: 10760 + if (var33.isStackable != 1 && var10.itemQuantities[var20] == 1) { var34 = UserComparator5.colorStartTag(16748608) + var33.name + ""; } else { - var34 = UserComparator5.colorStartTag(16748608) + var33.name + "" + " " + 'x' + FriendSystem.formatItemStacks(var10.itemQuantities[var20]); // L: 10761 + var34 = UserComparator5.colorStartTag(16748608) + var33.name + "" + " " + 'x' + FriendSystem.formatItemStacks(var10.itemQuantities[var20]); } - var25 = var12 + var22 * (var10.paddingX + 115); // L: 10762 - var26 = var21 * (var10.paddingY + 12) + var13; // L: 10763 - if (var10.textXAlignment == 0) { // L: 10764 + var25 = var12 + var22 * (var10.paddingX + 115); + var26 = var21 * (var10.paddingY + 12) + var13; + if (var10.textXAlignment == 0) { var39.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1); - } else if (var10.textXAlignment == 1) { // L: 10765 + } else if (var10.textXAlignment == 1) { var39.drawCentered(var34, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1); } else { - var39.drawRightAligned(var34, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1); // L: 10766 + var39.drawRightAligned(var34, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1); } } - ++var20; // L: 10768 + ++var20; } } } - if (var10.type == 8 && var10 == class281.field3375 && Client.field628 == Client.field714) { // L: 10772 10773 - var19 = 0; // L: 10774 - var20 = 0; // L: 10775 - Font var31 = class114.fontPlain12; // L: 10776 - String var32 = var10.text; // L: 10777 + if (var10.type == 8 && var10 == class281.field3375 && Client.field628 == Client.field714) { + var19 = 0; + var20 = 0; + Font var31 = class114.fontPlain12; + String var32 = var10.text; String var43; - for (var32 = class7.method60(var32, var10); var32.length() > 0; var20 = var20 + var31.ascent + 1) { // L: 10779 10780 10792 - var24 = var32.indexOf("
"); // L: 10781 - if (var24 != -1) { // L: 10782 - var43 = var32.substring(0, var24); // L: 10783 - var32 = var32.substring(var24 + 4); // L: 10784 + for (var32 = class7.method60(var32, var10); var32.length() > 0; var20 = var20 + var31.ascent + 1) { + var24 = var32.indexOf("
"); + if (var24 != -1) { + var43 = var32.substring(0, var24); + var32 = var32.substring(var24 + 4); } else { - var43 = var32; // L: 10787 - var32 = ""; // L: 10788 + var43 = var32; + var32 = ""; } - var25 = var31.stringWidth(var43); // L: 10790 - if (var25 > var19) { // L: 10791 + var25 = var31.stringWidth(var43); + if (var25 > var19) { var19 = var25; } } - var19 += 6; // L: 10794 - var20 += 7; // L: 10795 - var24 = var12 + var10.width - 5 - var19; // L: 10796 - var25 = var13 + var10.height + 5; // L: 10797 - if (var24 < var12 + 5) { // L: 10798 + var19 += 6; + var20 += 7; + var24 = var12 + var10.width - 5 - var19; + var25 = var13 + var10.height + 5; + if (var24 < var12 + 5) { var24 = var12 + 5; } - if (var24 + var19 > var4) { // L: 10799 + if (var24 + var19 > var4) { var24 = var4 - var19; } - if (var20 + var25 > var5) { // L: 10800 + if (var20 + var25 > var5) { var25 = var5 - var20; } - Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); // L: 10801 - Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); // L: 10802 - var32 = var10.text; // L: 10803 - var26 = var25 + var31.ascent + 2; // L: 10804 + Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); + Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); + var32 = var10.text; + var26 = var25 + var31.ascent + 2; - for (var32 = class7.method60(var32, var10); var32.length() > 0; var26 = var26 + var31.ascent + 1) { // L: 10805 10806 10817 - int var27 = var32.indexOf("
"); // L: 10807 - if (var27 != -1) { // L: 10808 - var43 = var32.substring(0, var27); // L: 10809 - var32 = var32.substring(var27 + 4); // L: 10810 + for (var32 = class7.method60(var32, var10); var32.length() > 0; var26 = var26 + var31.ascent + 1) { + int var27 = var32.indexOf("
"); + if (var27 != -1) { + var43 = var32.substring(0, var27); + var32 = var32.substring(var27 + 4); } else { - var43 = var32; // L: 10813 - var32 = ""; // L: 10814 + var43 = var32; + var32 = ""; } - var31.draw(var43, var24 + 3, var26, 0, -1); // L: 10816 + var31.draw(var43, var24 + 3, var26, 0, -1); } } - if (var10.type == 9) { // L: 10821 - if (var10.field3359) { // L: 10826 - var19 = var12; // L: 10827 - var20 = var13 + var10.height; // L: 10828 - var21 = var12 + var10.width; // L: 10829 - var22 = var13; // L: 10830 + if (var10.type == 9) { + if (var10.field3359) { + var19 = var12; + var20 = var13 + var10.height; + var21 = var12 + var10.width; + var22 = var13; } else { - var19 = var12; // L: 10833 - var20 = var13; // L: 10834 - var21 = var12 + var10.width; // L: 10835 - var22 = var13 + var10.height; // L: 10836 + var19 = var12; + var20 = var13; + var21 = var12 + var10.width; + var22 = var13 + var10.height; } - if (var10.lineWid == 1) { // L: 10838 - Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); // L: 10839 + if (var10.lineWid == 1) { + Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); } else { - ScriptEvent.method2147(var19, var20, var21, var22, var10.color, var10.lineWid); // L: 10842 + ScriptEvent.method2147(var19, var20, var21, var22, var10.color, var10.lineWid); } } } @@ -724,5 +724,5 @@ public class class118 implements class110 { } } - } // L: 10847 + } } diff --git a/runescape-client/src/main/java/class119.java b/runescape-client/src/main/java/class119.java index 6cd036cab2..cd564216a8 100644 --- a/runescape-client/src/main/java/class119.java +++ b/runescape-client/src/main/java/class119.java @@ -11,18 +11,18 @@ public class class119 { ) @Export("getEnum") public static EnumComposition getEnum(int var0) { - EnumComposition var1 = (EnumComposition)EnumComposition.EnumDefinition_cached.get((long)var0); // L: 25 - if (var1 != null) { // L: 26 + EnumComposition var1 = (EnumComposition)EnumComposition.EnumDefinition_cached.get((long)var0); + if (var1 != null) { return var1; } else { - byte[] var2 = EnumComposition.EnumDefinition_archive.takeFile(8, var0); // L: 27 - var1 = new EnumComposition(); // L: 28 - if (var2 != null) { // L: 29 + byte[] var2 = EnumComposition.EnumDefinition_archive.takeFile(8, var0); + var1 = new EnumComposition(); + if (var2 != null) { var1.decode(new Buffer(var2)); } - EnumComposition.EnumDefinition_cached.put(var1, (long)var0); // L: 30 - return var1; // L: 31 + EnumComposition.EnumDefinition_cached.put(var1, (long)var0); + return var1; } } @@ -32,17 +32,17 @@ public class class119 { garbageValue = "935400693" ) static void method2689() { - Tiles.Tiles_underlays = null; // L: 64 - Tiles.Tiles_overlays = null; // L: 65 - Tiles.Tiles_shapes = null; // L: 66 - WorldMapLabelSize.field2580 = null; // L: 67 - ClanChannelMember.field1504 = null; // L: 68 - SoundCache.field321 = null; // L: 69 - class194.field2280 = null; // L: 70 - Tiles.Tiles_hue = null; // L: 71 - User.Tiles_saturation = null; // L: 72 - Tiles.Tiles_lightness = null; // L: 73 - UserComparator5.Tiles_hueMultiplier = null; // L: 74 - VerticalAlignment.field1874 = null; // L: 75 - } // L: 76 + Tiles.Tiles_underlays = null; + Tiles.Tiles_overlays = null; + Tiles.Tiles_shapes = null; + WorldMapLabelSize.field2580 = null; + ClanChannelMember.field1504 = null; + SoundCache.field321 = null; + class194.field2280 = null; + Tiles.Tiles_hue = null; + User.Tiles_saturation = null; + Tiles.Tiles_lightness = null; + UserComparator5.Tiles_hueMultiplier = null; + VerticalAlignment.field1874 = null; + } } diff --git a/runescape-client/src/main/java/class12.java b/runescape-client/src/main/java/class12.java index 7c0db4af2c..091e11d6dc 100644 --- a/runescape-client/src/main/java/class12.java +++ b/runescape-client/src/main/java/class12.java @@ -34,86 +34,86 @@ class class12 extends SSLSocket { descriptor = "(Le;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;Ljava/lang/String;)V" ) class12(class15 var1, TlsClientProtocol var2, String var3) { - this.this$0 = var1; // L: 90 + this.this$0 = var1; this.val$tlsClientProtocol = var2; this.val$host = var3; } public void removeHandshakeCompletedListener(HandshakeCompletedListener var1) { - } // L: 262 + } public String[] getSupportedCipherSuites() { - return null; // L: 248 + return null; } public String[] getEnabledProtocols() { - return null; // L: 123 + return null; } public boolean getNeedClientAuth() { - return false; // L: 128 + return false; } public SSLSession getSession() { - return new class17(this); // L: 133 + return new class17(this); } public String[] getSupportedProtocols() { - return null; // L: 243 + return null; } public void setEnabledCipherSuites(String[] var1) { - } // L: 268 + } public boolean getWantClientAuth() { - return false; // L: 258 + return false; } public void setWantClientAuth(boolean var1) { - } // L: 280 + } public void startHandshake() throws IOException { - this.val$tlsClientProtocol.connect(new class13(this)); // L: 284 - } // L: 334 + this.val$tlsClientProtocol.connect(new class13(this)); + } public void setNeedClientAuth(boolean var1) { - } // L: 274 + } public InputStream getInputStream() throws IOException { - return this.val$tlsClientProtocol.getInputStream(); // L: 95 + return this.val$tlsClientProtocol.getInputStream(); } public void setEnabledProtocols(String[] var1) { - } // L: 271 + } public OutputStream getOutputStream() throws IOException { - return this.val$tlsClientProtocol.getOutputStream(); // L: 100 + return this.val$tlsClientProtocol.getOutputStream(); } public boolean getEnableSessionCreation() { - return false; // L: 113 + return false; } public void addHandshakeCompletedListener(HandshakeCompletedListener var1) { - } // L: 109 + } public String[] getEnabledCipherSuites() { - return null; // L: 118 + return null; } public void setEnableSessionCreation(boolean var1) { - } // L: 265 + } public boolean getUseClientMode() { - return false; // L: 253 + return false; } public synchronized void close() throws IOException { - this.val$tlsClientProtocol.close(); // L: 105 - } // L: 106 + this.val$tlsClientProtocol.close(); + } public void setUseClientMode(boolean var1) { - } // L: 277 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -121,11 +121,11 @@ class class12 extends SSLSocket { garbageValue = "392889295" ) static int method189(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 14 - if (var2 == null) { // L: 15 + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var2 == null) { return -1; } else { - return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; // L: 16 17 + return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; } } @@ -135,17 +135,17 @@ class class12 extends SSLSocket { garbageValue = "-1062038297" ) static int method158(IterableNodeHashTable var0, int var1, int var2) { - if (var0 == null) { // L: 33 + if (var0 == null) { return var2; } else { - IntegerNode var3 = (IntegerNode)var0.get((long)var1); // L: 34 - return var3 == null ? var2 : var3.integer; // L: 35 36 + IntegerNode var3 = (IntegerNode)var0.get((long)var1); + return var3 == null ? var2 : var3.integer; } } @ObfuscatedName("w") static boolean method188(long var0) { - return (int)(var0 >>> 16 & 1L) == 1; // L: 81 + return (int)(var0 >>> 16 & 1L) == 1; } @ObfuscatedName("z") @@ -154,137 +154,137 @@ class class12 extends SSLSocket { garbageValue = "122" ) static int method190(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.CLIENTCLOCK) { // L: 1913 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.cycle; // L: 1914 - return 1; // L: 1915 + if (var0 == ScriptOpcodes.CLIENTCLOCK) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.cycle; + return 1; } else { int var3; int var4; - if (var0 == ScriptOpcodes.INV_GETOBJ) { // L: 1917 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 1918 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 1919 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 1920 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = method189(var3, var4); // L: 1921 - return 1; // L: 1922 - } else if (var0 == ScriptOpcodes.INV_GETNUM) { // L: 1924 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 1925 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 1926 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 1927 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = ReflectionCheck.ItemContainer_getCount(var3, var4); // L: 1928 - return 1; // L: 1929 - } else if (var0 == ScriptOpcodes.INV_TOTAL) { // L: 1931 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 1932 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 1933 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 1934 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = MouseRecorder.method2160(var3, var4); // L: 1935 - return 1; // L: 1936 - } else if (var0 == ScriptOpcodes.INV_SIZE) { // L: 1938 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1939 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class78.getInvDefinition(var3).size; // L: 1940 - return 1; // L: 1941 - } else if (var0 == ScriptOpcodes.STAT) { // L: 1943 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1944 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; // L: 1945 - return 1; // L: 1946 - } else if (var0 == ScriptOpcodes.STAT_BASE) { // L: 1948 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1949 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.levels[var3]; // L: 1950 - return 1; // L: 1951 - } else if (var0 == ScriptOpcodes.STAT_XP) { // L: 1953 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1954 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.experience[var3]; // L: 1955 - return 1; // L: 1956 + if (var0 == ScriptOpcodes.INV_GETOBJ) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = method189(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INV_GETNUM) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = ReflectionCheck.ItemContainer_getCount(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INV_TOTAL) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = MouseRecorder.method2160(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INV_SIZE) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class78.getInvDefinition(var3).size; + return 1; + } else if (var0 == ScriptOpcodes.STAT) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; + return 1; + } else if (var0 == ScriptOpcodes.STAT_BASE) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.levels[var3]; + return 1; + } else if (var0 == ScriptOpcodes.STAT_XP) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.experience[var3]; + return 1; } else { int var5; - if (var0 == ScriptOpcodes.COORD) { // L: 1958 - var3 = class20.Client_plane; // L: 1959 - var4 = (class340.localPlayer.x >> 7) + class131.baseX; // L: 1960 - var5 = (class340.localPlayer.y >> 7) + TileItem.baseY; // L: 1961 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); // L: 1962 - return 1; // L: 1963 - } else if (var0 == ScriptOpcodes.COORDX) { // L: 1965 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1966 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; // L: 1967 - return 1; // L: 1968 - } else if (var0 == ScriptOpcodes.COORDZ) { // L: 1970 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1971 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 >> 28; // L: 1972 - return 1; // L: 1973 - } else if (var0 == ScriptOpcodes.COORDY) { // L: 1975 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1976 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 & 16383; // L: 1977 - return 1; // L: 1978 - } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { // L: 1980 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; // L: 1981 - return 1; // L: 1982 - } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { // L: 1984 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 1985 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] + 32768; // L: 1986 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 1987 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = method189(var3, var4); // L: 1988 - return 1; // L: 1989 - } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { // L: 1991 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 1992 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] + 32768; // L: 1993 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 1994 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = ReflectionCheck.ItemContainer_getCount(var3, var4); // L: 1995 - return 1; // L: 1996 - } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { // L: 1998 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 1999 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] + 32768; // L: 2000 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2001 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = MouseRecorder.method2160(var3, var4); // L: 2002 - return 1; // L: 2003 - } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { // L: 2005 - if (Client.staffModLevel >= 2) { // L: 2006 + if (var0 == ScriptOpcodes.COORD) { + var3 = class20.Client_plane; + var4 = (class340.localPlayer.x >> 7) + class131.baseX; + var5 = (class340.localPlayer.y >> 7) + TileItem.baseY; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); + return 1; + } else if (var0 == ScriptOpcodes.COORDX) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; + return 1; + } else if (var0 == ScriptOpcodes.COORDZ) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 >> 28; + return 1; + } else if (var0 == ScriptOpcodes.COORDY) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 & 16383; + return 1; + } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = method189(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = ReflectionCheck.ItemContainer_getCount(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = MouseRecorder.method2160(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { + if (Client.staffModLevel >= 2) { Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.staffModLevel; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 2007 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; } - return 1; // L: 2008 - } else if (var0 == ScriptOpcodes.REBOOTTIMER) { // L: 2010 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.rebootTimer; // L: 2011 - return 1; // L: 2012 - } else if (var0 == ScriptOpcodes.MAP_WORLD) { // L: 2014 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.worldId; // L: 2015 - return 1; // L: 2016 - } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { // L: 2018 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.runEnergy; // L: 2019 - return 1; // L: 2020 - } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { // L: 2022 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.weight; // L: 2023 - return 1; // L: 2024 - } else if (var0 == ScriptOpcodes.PLAYERMOD) { // L: 2026 - if (Client.playerMod) { // L: 2027 + return 1; + } else if (var0 == ScriptOpcodes.REBOOTTIMER) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.rebootTimer; + return 1; + } else if (var0 == ScriptOpcodes.MAP_WORLD) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.worldId; + return 1; + } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.runEnergy; + return 1; + } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.weight; + return 1; + } else if (var0 == ScriptOpcodes.PLAYERMOD) { + if (Client.playerMod) { Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 2028 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; } - return 1; // L: 2029 - } else if (var0 == ScriptOpcodes.WORLDFLAGS) { // L: 2031 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.worldProperties; // L: 2032 - return 1; // L: 2033 - } else if (var0 == ScriptOpcodes.MOVECOORD) { // L: 2035 - IsaacCipher.Interpreter_intStackSize -= 4; // L: 2036 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2037 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2038 - var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 2039 - int var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3]; // L: 2040 - var3 += var4 << 14; // L: 2041 - var3 += var5 << 28; // L: 2042 - var3 += var6; // L: 2043 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3; // L: 2044 - return 1; // L: 2045 - } else if (var0 == 3326) { // L: 2047 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.field483; // L: 2048 - return 1; // L: 2049 - } else if (var0 == 3327) { // L: 2051 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.field746; // L: 2052 - return 1; // L: 2053 + return 1; + } else if (var0 == ScriptOpcodes.WORLDFLAGS) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.worldProperties; + return 1; + } else if (var0 == ScriptOpcodes.MOVECOORD) { + IsaacCipher.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; + int var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3]; + var3 += var4 << 14; + var3 += var5 << 28; + var3 += var6; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3; + return 1; + } else if (var0 == 3326) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.field483; + return 1; + } else if (var0 == 3327) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.field746; + return 1; } else { - return 2; // L: 2055 + return 2; } } } @@ -297,25 +297,25 @@ class class12 extends SSLSocket { ) @Export("drawWidgets") static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (class242.loadInterface(var0)) { // L: 10372 - BufferedFile.field4430 = null; // L: 10379 - class118.drawInterface(MouseRecorder.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); // L: 10380 - if (BufferedFile.field4430 != null) { // L: 10381 - class118.drawInterface(BufferedFile.field4430, -1412584499, var1, var2, var3, var4, HitSplatDefinition.field1945, class78.field1000, var7); // L: 10382 - BufferedFile.field4430 = null; // L: 10383 + if (class242.loadInterface(var0)) { + BufferedFile.field4430 = null; + class118.drawInterface(MouseRecorder.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); + if (BufferedFile.field4430 != null) { + class118.drawInterface(BufferedFile.field4430, -1412584499, var1, var2, var3, var4, HitSplatDefinition.field1945, class78.field1000, var7); + BufferedFile.field4430 = null; } } else { - if (var7 != -1) { // L: 10373 + if (var7 != -1) { Client.field504[var7] = true; } else { - for (int var8 = 0; var8 < 100; ++var8) { // L: 10375 + for (int var8 = 0; var8 < 100; ++var8) { Client.field504[var8] = true; } } } - } // L: 10377 10385 + } @ObfuscatedName("jm") @ObfuscatedSignature( @@ -324,6 +324,6 @@ class class12 extends SSLSocket { ) @Export("setTapToDrop") static void setTapToDrop(boolean var0) { - Client.tapToDrop = var0; // L: 11368 - } // L: 11369 + Client.tapToDrop = var0; + } } diff --git a/runescape-client/src/main/java/class120.java b/runescape-client/src/main/java/class120.java index 7b858ba8f7..ea86442a33 100644 --- a/runescape-client/src/main/java/class120.java +++ b/runescape-client/src/main/java/class120.java @@ -52,24 +52,24 @@ public class class120 extends DualNode { descriptor = "(Lku;Lku;IZ)V" ) class120(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { - this.field1453 = null; // L: 14 - this.field1451 = null; // L: 15 - this.field1455 = 0; // L: 19 - this.field1454 = var3; // L: 44 - byte[] var5 = var1.takeFile(this.field1454 >> 16 & 65535, this.field1454 & 65535); // L: 45 - Buffer var6 = new Buffer(var5); // L: 46 - int var7 = var6.readUnsignedByte(); // L: 47 - int var8 = var6.readUnsignedShort(); // L: 48 + this.field1453 = null; + this.field1451 = null; + this.field1455 = 0; + this.field1454 = var3; + byte[] var5 = var1.takeFile(this.field1454 >> 16 & 65535, this.field1454 & 65535); + Buffer var6 = new Buffer(var5); + int var7 = var6.readUnsignedByte(); + int var8 = var6.readUnsignedShort(); byte[] var9; - if (var4) { // L: 50 + if (var4) { var9 = var2.getFile(0, var8); } else { - var9 = var2.getFile(var8, 0); // L: 51 + var9 = var2.getFile(var8, 0); } - this.field1457 = new Skeleton(var8, var9); // L: 52 - this.method2690(var6, var7); // L: 53 - } // L: 54 + this.field1457 = new Skeleton(var8, var9); + this.method2690(var6, var7); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -77,48 +77,48 @@ public class class120 extends DualNode { garbageValue = "1" ) void method2690(Buffer var1, int var2) { - this.field1452 = var1.readUnsignedShort(); // L: 57 - this.field1456 = var1.readUnsignedShort(); // L: 58 - this.field1455 = var1.readUnsignedByte(); // L: 59 - int var3 = var1.readUnsignedShort(); // L: 60 - this.field1451 = new class115[this.field1457.method3943().method3935()][]; // L: 61 - this.field1453 = new class115[this.field1457.method3949()][]; // L: 62 + this.field1452 = var1.readUnsignedShort(); + this.field1456 = var1.readUnsignedShort(); + this.field1455 = var1.readUnsignedByte(); + int var3 = var1.readUnsignedShort(); + this.field1451 = new class115[this.field1457.method3943().method3935()][]; + this.field1453 = new class115[this.field1457.method3949()][]; - for (int var4 = 0; var4 < var3; ++var4) { // L: 63 - int var6 = var1.readUnsignedByte(); // L: 65 - class116 var7 = (class116)class130.findEnumerated(Login.method1994(), var6); // L: 67 - if (var7 == null) { // L: 68 + for (int var4 = 0; var4 < var3; ++var4) { + int var6 = var1.readUnsignedByte(); + class116 var7 = (class116)class130.findEnumerated(Login.method1994(), var6); + if (var7 == null) { var7 = class116.field1421; } - int var8 = var1.readShortSmart(); // L: 72 - int var10 = var1.readUnsignedByte(); // L: 74 - class117 var11 = (class117)class130.findEnumerated(class7.method74(), var10); // L: 76 - if (var11 == null) { // L: 77 + int var8 = var1.readShortSmart(); + int var10 = var1.readUnsignedByte(); + class117 var11 = (class117)class130.findEnumerated(class7.method74(), var10); + if (var11 == null) { var11 = class117.field1425; } - class115 var12 = new class115(); // L: 81 - var12.method2638(var1, var2); // L: 82 - int var13 = var7.method2669(); // L: 83 + class115 var12 = new class115(); + var12.method2638(var1, var2); + int var13 = var7.method2669(); class115[][] var14; - if (var7 == class116.field1415) { // L: 85 - var14 = this.field1451; // L: 86 + if (var7 == class116.field1415) { + var14 = this.field1451; } else { - var14 = this.field1453; // L: 89 + var14 = this.field1453; } - if (var14[var8] == null) { // L: 91 - var14[var8] = new class115[var13]; // L: 92 + if (var14[var8] == null) { + var14[var8] = new class115[var13]; } - var14[var8][var11.method2674()] = var12; // L: 94 - if (var7 == class116.field1418) { // L: 95 - this.field1449 = true; // L: 96 + var14[var8][var11.method2674()] = var12; + if (var7 == class116.field1418) { + this.field1449 = true; } } - } // L: 99 + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -126,7 +126,7 @@ public class class120 extends DualNode { garbageValue = "44" ) int method2704() { - return this.field1452; // L: 102 + return this.field1452; } @ObfuscatedName("m") @@ -135,7 +135,7 @@ public class class120 extends DualNode { garbageValue = "-565946270" ) int method2693() { - return this.field1456; // L: 106 + return this.field1456; } @ObfuscatedName("t") @@ -144,7 +144,7 @@ public class class120 extends DualNode { garbageValue = "-1439954797" ) public int method2694() { - return this.field1455; // L: 110 + return this.field1455; } @ObfuscatedName("s") @@ -153,7 +153,7 @@ public class class120 extends DualNode { garbageValue = "528719548" ) public int method2691() { - return this.method2693() - this.method2704(); // L: 114 + return this.method2693() - this.method2704(); } @ObfuscatedName("j") @@ -162,7 +162,7 @@ public class class120 extends DualNode { garbageValue = "8" ) public boolean method2695() { - return this.field1449; // L: 118 + return this.field1449; } @ObfuscatedName("w") @@ -172,21 +172,21 @@ public class class120 extends DualNode { ) public void method2700(int var1, class113 var2, int var3, int var4) { class366 var5; - synchronized(class366.field4191) { // L: 124 - if (class149.field1663 == 0) { // L: 125 + synchronized(class366.field4191) { + if (class149.field1663 == 0) { var5 = new class366(); } else { - class366.field4191[--class149.field1663].method6652(); // L: 127 - var5 = class366.field4191[class149.field1663]; // L: 128 + class366.field4191[--class149.field1663].method6652(); + var5 = class366.field4191[class149.field1663]; } } - this.method2701(var5, var3, var2, var1); // L: 133 - this.method2699(var5, var3, var2, var1); // L: 134 - this.method2698(var5, var3, var2, var1); // L: 135 - var2.method2576(var5); // L: 136 - var5.method6656(); // L: 137 - } // L: 138 + this.method2701(var5, var3, var2, var1); + this.method2699(var5, var3, var2, var1); + this.method2698(var5, var3, var2, var1); + var2.method2576(var5); + var5.method6656(); + } @ObfuscatedName("n") @ObfuscatedSignature( @@ -194,55 +194,55 @@ public class class120 extends DualNode { garbageValue = "96" ) void method2701(class366 var1, int var2, class113 var3, int var4) { - float[] var5 = var3.method2583(this.field1455); // L: 141 - float var6 = var5[0]; // L: 142 - float var7 = var5[1]; // L: 143 - float var8 = var5[2]; // L: 144 - if (this.field1451[var2] != null) { // L: 145 - class115 var9 = this.field1451[var2][0]; // L: 146 - class115 var10 = this.field1451[var2][1]; // L: 147 - class115 var11 = this.field1451[var2][2]; // L: 148 - if (var9 != null) { // L: 149 + float[] var5 = var3.method2583(this.field1455); + float var6 = var5[0]; + float var7 = var5[1]; + float var8 = var5[2]; + if (this.field1451[var2] != null) { + class115 var9 = this.field1451[var2][0]; + class115 var10 = this.field1451[var2][1]; + class115 var11 = this.field1451[var2][2]; + if (var9 != null) { var6 = var9.method2632(var4); } - if (var10 != null) { // L: 150 + if (var10 != null) { var7 = var10.method2632(var4); } - if (var11 != null) { // L: 151 + if (var11 != null) { var8 = var11.method2632(var4); } } - class365 var17 = Friend.method6296(); // L: 153 - var17.method6630(1.0F, 0.0F, 0.0F, var6); // L: 154 - class365 var18 = Friend.method6296(); // L: 155 - var18.method6630(0.0F, 1.0F, 0.0F, var7); // L: 156 - class365 var19 = Friend.method6296(); // L: 157 - var19.method6630(0.0F, 0.0F, 1.0F, var8); // L: 158 - class365 var12 = Friend.method6296(); // L: 159 - var12.method6628(var19); // L: 160 - var12.method6628(var17); // L: 161 - var12.method6628(var18); // L: 162 + class365 var17 = Friend.method6296(); + var17.method6630(1.0F, 0.0F, 0.0F, var6); + class365 var18 = Friend.method6296(); + var18.method6630(0.0F, 1.0F, 0.0F, var7); + class365 var19 = Friend.method6296(); + var19.method6630(0.0F, 0.0F, 1.0F, var8); + class365 var12 = Friend.method6296(); + var12.method6628(var19); + var12.method6628(var17); + var12.method6628(var18); class366 var13; - synchronized(class366.field4191) { // L: 165 - if (class149.field1663 == 0) { // L: 166 + synchronized(class366.field4191) { + if (class149.field1663 == 0) { var13 = new class366(); } else { - class366.field4191[--class149.field1663].method6652(); // L: 168 - var13 = class366.field4191[class149.field1663]; // L: 169 + class366.field4191[--class149.field1663].method6652(); + var13 = class366.field4191[class149.field1663]; } } - var13.method6711(var12); // L: 174 - var1.method6670(var13); // L: 175 - var17.method6646(); // L: 176 - var18.method6646(); // L: 177 - var19.method6646(); // L: 178 - var12.method6646(); // L: 179 - var13.method6656(); // L: 180 - } // L: 181 + var13.method6711(var12); + var1.method6670(var13); + var17.method6646(); + var18.method6646(); + var19.method6646(); + var12.method6646(); + var13.method6656(); + } @ObfuscatedName("r") @ObfuscatedSignature( @@ -250,31 +250,31 @@ public class class120 extends DualNode { garbageValue = "1" ) void method2698(class366 var1, int var2, class113 var3, int var4) { - float[] var5 = var3.method2577(this.field1455); // L: 184 - float var6 = var5[0]; // L: 185 - float var7 = var5[1]; // L: 186 - float var8 = var5[2]; // L: 187 - if (this.field1451[var2] != null) { // L: 188 - class115 var9 = this.field1451[var2][3]; // L: 189 - class115 var10 = this.field1451[var2][4]; // L: 190 - class115 var11 = this.field1451[var2][5]; // L: 191 - if (var9 != null) { // L: 192 + float[] var5 = var3.method2577(this.field1455); + float var6 = var5[0]; + float var7 = var5[1]; + float var8 = var5[2]; + if (this.field1451[var2] != null) { + class115 var9 = this.field1451[var2][3]; + class115 var10 = this.field1451[var2][4]; + class115 var11 = this.field1451[var2][5]; + if (var9 != null) { var6 = var9.method2632(var4); } - if (var10 != null) { // L: 193 + if (var10 != null) { var7 = var10.method2632(var4); } - if (var11 != null) { // L: 194 + if (var11 != null) { var8 = var11.method2632(var4); } } - var1.field4196[12] = var6; // L: 196 - var1.field4196[13] = var7; // L: 197 - var1.field4196[14] = var8; // L: 198 - } // L: 199 + var1.field4196[12] = var6; + var1.field4196[13] = var7; + var1.field4196[14] = var8; + } @ObfuscatedName("o") @ObfuscatedSignature( @@ -282,41 +282,41 @@ public class class120 extends DualNode { garbageValue = "-84" ) void method2699(class366 var1, int var2, class113 var3, int var4) { - float[] var5 = var3.method2585(this.field1455); // L: 202 - float var6 = var5[0]; // L: 203 - float var7 = var5[1]; // L: 204 - float var8 = var5[2]; // L: 205 - if (this.field1451[var2] != null) { // L: 206 - class115 var9 = this.field1451[var2][6]; // L: 207 - class115 var10 = this.field1451[var2][7]; // L: 208 - class115 var11 = this.field1451[var2][8]; // L: 209 - if (var9 != null) { // L: 210 + float[] var5 = var3.method2585(this.field1455); + float var6 = var5[0]; + float var7 = var5[1]; + float var8 = var5[2]; + if (this.field1451[var2] != null) { + class115 var9 = this.field1451[var2][6]; + class115 var10 = this.field1451[var2][7]; + class115 var11 = this.field1451[var2][8]; + if (var9 != null) { var6 = var9.method2632(var4); } - if (var10 != null) { // L: 211 + if (var10 != null) { var7 = var10.method2632(var4); } - if (var11 != null) { // L: 212 + if (var11 != null) { var8 = var11.method2632(var4); } } class366 var14; - synchronized(class366.field4191) { // L: 216 - if (class149.field1663 == 0) { // L: 217 + synchronized(class366.field4191) { + if (class149.field1663 == 0) { var14 = new class366(); } else { - class366.field4191[--class149.field1663].method6652(); // L: 219 - var14 = class366.field4191[class149.field1663]; // L: 220 + class366.field4191[--class149.field1663].method6652(); + var14 = class366.field4191[class149.field1663]; } } - var14.method6667(var6, var7, var8); // L: 225 - var1.method6670(var14); // L: 226 - var14.method6656(); // L: 227 - } // L: 228 + var14.method6667(var6, var7, var8); + var1.method6670(var14); + var14.method6656(); + } @ObfuscatedName("w") @ObfuscatedSignature( @@ -324,133 +324,133 @@ public class class120 extends DualNode { garbageValue = "-2070475584" ) static int method2724(int var0, Script var1, boolean var2) { - boolean var3 = true; // L: 842 + boolean var3 = true; Widget var4; - if (var0 >= 2000) { // L: 844 - var0 -= 1000; // L: 845 - var4 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 846 - var3 = false; // L: 847 + if (var0 >= 2000) { + var0 -= 1000; + var4 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); + var3 = false; } else { - var4 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; // L: 849 + var4 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; } int var11; - if (var0 == ScriptOpcodes.CC_SETOP) { // L: 850 - var11 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] - 1; // L: 851 - if (var11 >= 0 && var11 <= 9) { // L: 852 - var4.setAction(var11, Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]); // L: 856 - return 1; // L: 857 + if (var0 == ScriptOpcodes.CC_SETOP) { + var11 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] - 1; + if (var11 >= 0 && var11 <= 9) { + var4.setAction(var11, Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]); + return 1; } else { - --class13.Interpreter_stringStackSize; // L: 853 - return 1; // L: 854 + --class13.Interpreter_stringStackSize; + return 1; } } else { int var6; - if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { // L: 859 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 860 - var11 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 861 - var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 862 - var4.parent = class126.getWidgetChild(var11, var6); // L: 863 - return 1; // L: 864 - } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { // L: 866 - var4.isScrollBar = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 867 - return 1; // L: 868 - } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { // L: 870 - var4.dragZoneSize = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 871 - return 1; // L: 872 - } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { // L: 874 - var4.dragThreshold = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 875 - return 1; // L: 876 - } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { // L: 878 - var4.dataText = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 879 - return 1; // L: 880 - } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { // L: 882 - var4.spellActionName = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 883 - return 1; // L: 884 - } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { // L: 886 - var4.actions = null; // L: 887 - return 1; // L: 888 - } else if (var0 == 1308) { // L: 890 - var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 891 - return 1; // L: 892 - } else if (var0 == 1309) { // L: 894 - --IsaacCipher.Interpreter_intStackSize; // L: 895 - return 1; // L: 896 + if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { + IsaacCipher.Interpreter_intStackSize -= 2; + var11 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + var4.parent = class126.getWidgetChild(var11, var6); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { + var4.isScrollBar = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { + var4.dragZoneSize = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { + var4.dragThreshold = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { + var4.dataText = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { + var4.spellActionName = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { + var4.actions = null; + return 1; + } else if (var0 == 1308) { + var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 1309) { + --IsaacCipher.Interpreter_intStackSize; + return 1; } else { int var7; byte[] var8; - if (var0 != ScriptOpcodes.CC_SETOPKEY) { // L: 898 + if (var0 != ScriptOpcodes.CC_SETOPKEY) { byte var5; - if (var0 == ScriptOpcodes.CC_SETOPTKEY) { // L: 928 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 929 - var5 = 10; // L: 930 - var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]}; // L: 931 - byte[] var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]}; // L: 932 - World.Widget_setKey(var4, var5, var8, var9); // L: 933 - return 1; // L: 934 - } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { // L: 936 - IsaacCipher.Interpreter_intStackSize -= 3; // L: 937 - var11 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] - 1; // L: 938 - var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 939 - var7 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 940 - if (var11 >= 0 && var11 <= 9) { // L: 941 - UserComparator3.Widget_setKeyRate(var4, var11, var6, var7); // L: 944 - return 1; // L: 945 + if (var0 == ScriptOpcodes.CC_SETOPTKEY) { + IsaacCipher.Interpreter_intStackSize -= 2; + var5 = 10; + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]}; + byte[] var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]}; + World.Widget_setKey(var4, var5, var8, var9); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { + IsaacCipher.Interpreter_intStackSize -= 3; + var11 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] - 1; + var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + var7 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; + if (var11 >= 0 && var11 <= 9) { + UserComparator3.Widget_setKeyRate(var4, var11, var6, var7); + return 1; } else { - throw new RuntimeException(); // L: 942 + throw new RuntimeException(); } - } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { // L: 947 - var5 = 10; // L: 948 - var6 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 949 - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 950 - UserComparator3.Widget_setKeyRate(var4, var5, var6, var7); // L: 951 - return 1; // L: 952 - } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { // L: 954 - --IsaacCipher.Interpreter_intStackSize; // L: 955 - var11 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] - 1; // L: 956 - if (var11 >= 0 && var11 <= 9) { // L: 957 - class16.Widget_setKeyIgnoreHeld(var4, var11); // L: 960 - return 1; // L: 961 + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { + var5 = 10; + var6 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + UserComparator3.Widget_setKeyRate(var4, var5, var6, var7); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { + --IsaacCipher.Interpreter_intStackSize; + var11 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] - 1; + if (var11 >= 0 && var11 <= 9) { + class16.Widget_setKeyIgnoreHeld(var4, var11); + return 1; } else { - throw new RuntimeException(); // L: 958 + throw new RuntimeException(); } - } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { // L: 963 - var5 = 10; // L: 964 - class16.Widget_setKeyIgnoreHeld(var4, var5); // L: 965 - return 1; // L: 966 + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { + var5 = 10; + class16.Widget_setKeyIgnoreHeld(var4, var5); + return 1; } else { - return 2; // L: 968 + return 2; } } else { - byte[] var10 = null; // L: 899 - var8 = null; // L: 900 - if (var3) { // L: 901 - IsaacCipher.Interpreter_intStackSize -= 10; // L: 902 + byte[] var10 = null; + var8 = null; + if (var3) { + IsaacCipher.Interpreter_intStackSize -= 10; - for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + IsaacCipher.Interpreter_intStackSize] >= 0; var7 += 2) { // L: 904 905 + for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + IsaacCipher.Interpreter_intStackSize] >= 0; var7 += 2) { } - if (var7 > 0) { // L: 907 - var10 = new byte[var7 / 2]; // L: 908 - var8 = new byte[var7 / 2]; // L: 909 + if (var7 > 0) { + var10 = new byte[var7 / 2]; + var8 = new byte[var7 / 2]; - for (var7 -= 2; var7 >= 0; var7 -= 2) { // L: 910 - var10[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + IsaacCipher.Interpreter_intStackSize]; // L: 911 - var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + IsaacCipher.Interpreter_intStackSize + 1]; // L: 912 + for (var7 -= 2; var7 >= 0; var7 -= 2) { + var10[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + IsaacCipher.Interpreter_intStackSize]; + var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + IsaacCipher.Interpreter_intStackSize + 1]; } } } else { - IsaacCipher.Interpreter_intStackSize -= 2; // L: 917 - var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]}; // L: 918 - var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]}; // L: 919 + IsaacCipher.Interpreter_intStackSize -= 2; + var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]}; + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]}; } - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] - 1; // L: 921 - if (var7 >= 0 && var7 <= 9) { // L: 922 - World.Widget_setKey(var4, var7, var10, var8); // L: 925 - return 1; // L: 926 + var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] - 1; + if (var7 >= 0 && var7 <= 9) { + World.Widget_setKey(var4, var7, var10, var8); + return 1; } else { - throw new RuntimeException(); // L: 923 + throw new RuntimeException(); } } } diff --git a/runescape-client/src/main/java/class121.java b/runescape-client/src/main/java/class121.java index a4f4c730f0..40d754f4d3 100644 --- a/runescape-client/src/main/java/class121.java +++ b/runescape-client/src/main/java/class121.java @@ -65,9 +65,9 @@ public enum class121 implements MouseWheel { final int field1468; class121(int var3, int var4) { - this.field1460 = var3; // L: 105 - this.field1468 = var4; // L: 106 - } // L: 107 + this.field1460 = var3; + this.field1468 = var4; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -76,6 +76,6 @@ public enum class121 implements MouseWheel { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field1468; // L: 110 + return this.field1468; } } diff --git a/runescape-client/src/main/java/class122.java b/runescape-client/src/main/java/class122.java index 3a202ea99c..10770adfcf 100644 --- a/runescape-client/src/main/java/class122.java +++ b/runescape-client/src/main/java/class122.java @@ -39,9 +39,9 @@ public enum class122 implements MouseWheel { final int id; class122(int var3, int var4) { - this.field1475 = var3; // L: 16 - this.id = var4; // L: 17 - } // L: 18 + this.field1475 = var3; + this.id = var4; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -50,6 +50,6 @@ public enum class122 implements MouseWheel { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 22 + return this.id; } } diff --git a/runescape-client/src/main/java/class123.java b/runescape-client/src/main/java/class123.java index ba706ddb94..1ecc25fbd6 100644 --- a/runescape-client/src/main/java/class123.java +++ b/runescape-client/src/main/java/class123.java @@ -35,8 +35,8 @@ public class class123 extends class126 { ) class123(class129 var1) { this.this$0 = var1; - this.field1481 = -1; // L: 158 - } // L: 163 + this.field1481 = -1; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -44,11 +44,11 @@ public class class123 extends class126 { garbageValue = "1416770155" ) void vmethod3029(Buffer var1) { - this.field1481 = var1.readUnsignedShort(); // L: 166 - this.field1479 = var1.readInt(); // L: 167 - this.field1480 = var1.readUnsignedByte(); // L: 168 - this.field1482 = var1.readUnsignedByte(); // L: 169 - } // L: 170 + this.field1481 = var1.readUnsignedShort(); + this.field1479 = var1.readInt(); + this.field1480 = var1.readUnsignedByte(); + this.field1482 = var1.readUnsignedByte(); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -56,8 +56,8 @@ public class class123 extends class126 { garbageValue = "-1531735008" ) void vmethod3028(ClanSettings var1) { - var1.method2858(this.field1481, this.field1479, this.field1480, this.field1482); // L: 173 - } // L: 174 + var1.method2858(this.field1481, this.field1479, this.field1480, this.field1482); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -65,7 +65,7 @@ public class class123 extends class126 { garbageValue = "-84" ) public static int method2744(int var0, int var1) { - return (int)Math.round(Math.atan2((double)var0, (double)var1) * 2607.5945876176133D) & 16383; // L: 29 + return (int)Math.round(Math.atan2((double)var0, (double)var1) * 2607.5945876176133D) & 16383; } @ObfuscatedName("m") @@ -85,8 +85,8 @@ public class class123 extends class126 { garbageValue = "1" ) public static void method2746(int var0) { - MouseHandler.MouseHandler_idleCycles = var0; // L: 72 - } // L: 73 + MouseHandler.MouseHandler_idleCycles = var0; + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -94,9 +94,9 @@ public class class123 extends class126 { garbageValue = "-1478303214" ) static void method2745() { - 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 + Messages.Messages_channels.clear(); + Messages.Messages_hashTable.clear(); + Messages.Messages_queue.clear(); + Messages.Messages_count = 0; + } } diff --git a/runescape-client/src/main/java/class124.java b/runescape-client/src/main/java/class124.java index a3adcb55b5..d8ec903f63 100644 --- a/runescape-client/src/main/java/class124.java +++ b/runescape-client/src/main/java/class124.java @@ -45,7 +45,7 @@ public class class124 extends class126 { } this.field1484 = var1.readStringCp1252NullTerminatedOrNull(); - } // L: 85 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -53,8 +53,8 @@ public class class124 extends class126 { garbageValue = "-1531735008" ) void vmethod3028(ClanSettings var1) { - var1.method2850(this.field1485, this.field1484, 0); // L: 88 - } // L: 89 + var1.method2850(this.field1485, this.field1484, 0); + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -62,19 +62,19 @@ public class class124 extends class126 { garbageValue = "3" ) static int method2747(PacketBuffer var0) { - int var1 = var0.readBits(2); // L: 187 + int var1 = var0.readBits(2); int var2; - if (var1 == 0) { // L: 189 + if (var1 == 0) { var2 = 0; - } else if (var1 == 1) { // L: 190 + } else if (var1 == 1) { var2 = var0.readBits(5); - } else if (var1 == 2) { // L: 191 + } else if (var1 == 2) { var2 = var0.readBits(8); } else { - var2 = var0.readBits(11); // L: 192 + var2 = var0.readBits(11); } - return var2; // L: 193 + return var2; } @ObfuscatedName("t") @@ -83,22 +83,22 @@ public class class124 extends class126 { garbageValue = "970200706" ) static SpritePixels method2754() { - SpritePixels var0 = new SpritePixels(); // L: 72 - var0.width = class432.SpriteBuffer_spriteWidth; // L: 73 - var0.height = class432.SpriteBuffer_spriteHeight; // L: 74 - var0.xOffset = class141.SpriteBuffer_xOffsets[0]; // L: 75 - var0.yOffset = RouteStrategy.SpriteBuffer_yOffsets[0]; // L: 76 - var0.subWidth = class432.SpriteBuffer_spriteWidths[0]; // L: 77 - var0.subHeight = class330.SpriteBuffer_spriteHeights[0]; // L: 78 - int var1 = var0.subWidth * var0.subHeight; // L: 79 - byte[] var2 = class369.SpriteBuffer_pixels[0]; // L: 80 - var0.pixels = new int[var1]; // L: 81 + SpritePixels var0 = new SpritePixels(); + var0.width = class432.SpriteBuffer_spriteWidth; + var0.height = class432.SpriteBuffer_spriteHeight; + var0.xOffset = class141.SpriteBuffer_xOffsets[0]; + var0.yOffset = RouteStrategy.SpriteBuffer_yOffsets[0]; + var0.subWidth = class432.SpriteBuffer_spriteWidths[0]; + var0.subHeight = class330.SpriteBuffer_spriteHeights[0]; + int var1 = var0.subWidth * var0.subHeight; + byte[] var2 = class369.SpriteBuffer_pixels[0]; + var0.pixels = new int[var1]; - for (int var3 = 0; var3 < var1; ++var3) { // L: 82 + for (int var3 = 0; var3 < var1; ++var3) { var0.pixels[var3] = class432.SpriteBuffer_spritePalette[var2[var3] & 255]; } - UserComparator3.method2529(); // L: 83 - return var0; // L: 84 + UserComparator3.method2529(); + return var0; } } diff --git a/runescape-client/src/main/java/class125.java b/runescape-client/src/main/java/class125.java index ab84dac08a..3ed9ad5da2 100644 --- a/runescape-client/src/main/java/class125.java +++ b/runescape-client/src/main/java/class125.java @@ -25,8 +25,8 @@ public class class125 extends class126 { ) class125(class129 var1) { this.this$0 = var1; - this.field1493 = -1; // L: 114 - } // L: 116 + this.field1493 = -1; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -34,8 +34,8 @@ public class class125 extends class126 { garbageValue = "1416770155" ) void vmethod3029(Buffer var1) { - this.field1493 = var1.readUnsignedShort(); // L: 119 - } // L: 120 + this.field1493 = var1.readUnsignedShort(); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -43,8 +43,8 @@ public class class125 extends class126 { garbageValue = "-1531735008" ) void vmethod3028(ClanSettings var1) { - var1.method2862(this.field1493); // L: 123 - } // L: 124 + var1.method2862(this.field1493); + } @ObfuscatedName("gi") @ObfuscatedSignature( @@ -53,26 +53,26 @@ public class class125 extends class126 { ) @Export("performPlayerAnimation") static void performPlayerAnimation(Player var0, int var1, int var2) { - if (var0.sequence == var1 && var1 != -1) { // L: 4946 - int var3 = UserComparator5.SequenceDefinition_get(var1).field2078; // L: 4947 - if (var3 == 1) { // L: 4948 - var0.sequenceFrame = 0; // L: 4949 - var0.sequenceFrameCycle = 0; // L: 4950 - var0.sequenceDelay = var2; // L: 4951 - var0.field1126 = 0; // L: 4952 + if (var0.sequence == var1 && var1 != -1) { + int var3 = UserComparator5.SequenceDefinition_get(var1).field2078; + if (var3 == 1) { + var0.sequenceFrame = 0; + var0.sequenceFrameCycle = 0; + var0.sequenceDelay = var2; + var0.field1126 = 0; } - if (var3 == 2) { // L: 4954 - var0.field1126 = 0; // L: 4955 + if (var3 == 2) { + var0.field1126 = 0; } - } else if (var1 == -1 || var0.sequence == -1 || UserComparator5.SequenceDefinition_get(var1).field2092 >= UserComparator5.SequenceDefinition_get(var0.sequence).field2092) { // L: 4958 - var0.sequence = var1; // L: 4959 - var0.sequenceFrame = 0; // L: 4960 - var0.sequenceFrameCycle = 0; // L: 4961 - var0.sequenceDelay = var2; // L: 4962 - var0.field1126 = 0; // L: 4963 - var0.field1098 = var0.pathLength; // L: 4964 + } else if (var1 == -1 || var0.sequence == -1 || UserComparator5.SequenceDefinition_get(var1).field2092 >= UserComparator5.SequenceDefinition_get(var0.sequence).field2092) { + var0.sequence = var1; + var0.sequenceFrame = 0; + var0.sequenceFrameCycle = 0; + var0.sequenceDelay = var2; + var0.field1126 = 0; + var0.field1098 = var0.pathLength; } - } // L: 4966 + } } diff --git a/runescape-client/src/main/java/class126.java b/runescape-client/src/main/java/class126.java index ed04816038..6aea40d884 100644 --- a/runescape-client/src/main/java/class126.java +++ b/runescape-client/src/main/java/class126.java @@ -24,7 +24,7 @@ public abstract class class126 extends Node { static Fonts WorldMapElement_fonts; class126() { - } // L: 68 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -47,11 +47,11 @@ public abstract class class126 extends Node { ) @Export("getWidgetChild") public static Widget getWidgetChild(int var0, int var1) { - Widget var2 = ChatChannel.getWidget(var0); // L: 209 - if (var1 == -1) { // L: 210 + Widget var2 = ChatChannel.getWidget(var0); + if (var1 == -1) { return var2; } else { - return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; // L: 211 212 + return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; } } } diff --git a/runescape-client/src/main/java/class127.java b/runescape-client/src/main/java/class127.java index bd2ee7a6d2..7503cffb2f 100644 --- a/runescape-client/src/main/java/class127.java +++ b/runescape-client/src/main/java/class127.java @@ -28,8 +28,8 @@ public class class127 extends class126 { ) class127(class129 var1) { this.this$0 = var1; - this.field1503 = -1; // L: 178 - } // L: 181 + this.field1503 = -1; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -37,9 +37,9 @@ public class class127 extends class126 { garbageValue = "1416770155" ) void vmethod3029(Buffer var1) { - this.field1503 = var1.readUnsignedShort(); // L: 184 - this.field1499 = var1.readUnsignedByte() == 1; // L: 185 - } // L: 186 + this.field1503 = var1.readUnsignedShort(); + this.field1499 = var1.readUnsignedByte() == 1; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -47,8 +47,8 @@ public class class127 extends class126 { garbageValue = "-1531735008" ) void vmethod3028(ClanSettings var1) { - var1.method2857(this.field1503, this.field1499); // L: 189 - } // L: 190 + var1.method2857(this.field1503, this.field1499); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -56,8 +56,8 @@ public class class127 extends class126 { garbageValue = "-39935659" ) static void method2770() { - WorldMapRegion.WorldMapRegion_cachedSprites.clear(); // L: 48 - } // L: 49 + WorldMapRegion.WorldMapRegion_cachedSprites.clear(); + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -66,21 +66,21 @@ public class class127 extends class126 { ) @Export("savePreferences") static void savePreferences() { - AccessFile var0 = null; // L: 100 + AccessFile var0 = null; try { - var0 = class231.getPreferencesFile("", class338.field4054.name, true); // L: 102 - Buffer var1 = SecureRandomFuture.clientPreferences.toBuffer(); // L: 103 - var0.write(var1.array, 0, var1.offset); // L: 104 - } catch (Exception var3) { // L: 106 + var0 = class231.getPreferencesFile("", class338.field4054.name, true); + Buffer var1 = SecureRandomFuture.clientPreferences.toBuffer(); + var0.write(var1.array, 0, var1.offset); + } catch (Exception var3) { } try { - if (var0 != null) { // L: 108 - var0.closeSync(true); // L: 109 + if (var0 != null) { + var0.closeSync(true); } - } catch (Exception var2) { // L: 112 + } catch (Exception var2) { } - } // L: 113 + } } diff --git a/runescape-client/src/main/java/class129.java b/runescape-client/src/main/java/class129.java index f524cfc4ce..af010af39a 100644 --- a/runescape-client/src/main/java/class129.java +++ b/runescape-client/src/main/java/class129.java @@ -31,10 +31,10 @@ public class class129 { descriptor = "(Lpi;)V" ) public class129(Buffer var1) { - this.field1511 = -1; // L: 9 - this.field1512 = new IterableNodeDeque(); // L: 10 - this.method2780(var1); // L: 28 - } // L: 29 + this.field1511 = -1; + this.field1512 = new IterableNodeDeque(); + this.method2780(var1); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -42,52 +42,52 @@ public class class129 { garbageValue = "-65" ) void method2780(Buffer var1) { - this.field1513 = var1.readLong(); // L: 32 - this.field1511 = var1.readInt(); // L: 33 + this.field1513 = var1.readLong(); + this.field1511 = var1.readInt(); - for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { // L: 34 35 55 + for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { Object var3; - if (var2 == 3) { // L: 37 + if (var2 == 3) { var3 = new class148(this); - } else if (var2 == 1) { // L: 38 + } else if (var2 == 1) { var3 = new class124(this); - } else if (var2 == 13) { // L: 39 + } else if (var2 == 13) { var3 = new class141(this); - } else if (var2 == 4) { // L: 40 + } else if (var2 == 4) { var3 = new class133(this); - } else if (var2 == 6) { // L: 41 + } else if (var2 == 6) { var3 = new class140(this); - } else if (var2 == 5) { // L: 42 + } else if (var2 == 5) { var3 = new class125(this); - } else if (var2 == 2) { // L: 43 + } else if (var2 == 2) { var3 = new class130(this); - } else if (var2 == 7) { // L: 44 + } else if (var2 == 7) { var3 = new class123(this); - } else if (var2 == 14) { // L: 45 + } else if (var2 == 14) { var3 = new class127(this); - } else if (var2 == 8) { // L: 46 + } else if (var2 == 8) { var3 = new class144(this); - } else if (var2 == 9) { // L: 47 + } else if (var2 == 9) { var3 = new class150(this); } else if (var2 == 10) { - var3 = new class136(this); // L: 48 - } else if (var2 == 11) { // L: 49 + var3 = new class136(this); + } else if (var2 == 11) { var3 = new class131(this); - } else if (var2 == 12) { // L: 50 + } else if (var2 == 12) { var3 = new class135(this); } else { - if (var2 != 15) { // L: 51 - throw new RuntimeException(""); // L: 52 + if (var2 != 15) { + throw new RuntimeException(""); } var3 = new class145(this); } - ((class126)var3).vmethod3029(var1); // L: 53 - this.field1512.addFirst((Node)var3); // L: 54 + ((class126)var3).vmethod3029(var1); + this.field1512.addFirst((Node)var3); } - } // L: 57 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -95,16 +95,16 @@ public class class129 { garbageValue = "1939011884" ) public void method2781(ClanSettings var1) { - if (this.field1513 == var1.field1562 && this.field1511 == var1.field1563) { // L: 60 - for (class126 var2 = (class126)this.field1512.last(); var2 != null; var2 = (class126)this.field1512.previous()) { // L: 61 - var2.vmethod3028(var1); // L: 62 + if (this.field1513 == var1.field1562 && this.field1511 == var1.field1563) { + for (class126 var2 = (class126)this.field1512.last(); var2 != null; var2 = (class126)this.field1512.previous()) { + var2.vmethod3028(var1); } - ++var1.field1563; // L: 64 + ++var1.field1563; } else { throw new RuntimeException(""); } - } // L: 65 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -113,7 +113,7 @@ public class class129 { ) @Export("ServerPacket_values") public static ServerPacket[] ServerPacket_values() { - return new ServerPacket[]{ServerPacket.field3013, ServerPacket.field2931, ServerPacket.field2983, ServerPacket.field2933, ServerPacket.field2934, ServerPacket.field2930, ServerPacket.field2936, ServerPacket.field2937, ServerPacket.field3000, ServerPacket.field3003, ServerPacket.field2940, ServerPacket.field2941, ServerPacket.field2942, ServerPacket.field3006, ServerPacket.field2944, ServerPacket.field2945, ServerPacket.field2946, ServerPacket.field3008, ServerPacket.field2948, ServerPacket.field2949, ServerPacket.field2950, ServerPacket.field2951, ServerPacket.field2961, ServerPacket.field2982, ServerPacket.field2954, ServerPacket.field2955, ServerPacket.field2956, ServerPacket.field2978, ServerPacket.field2958, ServerPacket.field2959, ServerPacket.field3029, ServerPacket.field2938, ServerPacket.field2962, ServerPacket.field2963, ServerPacket.field2964, ServerPacket.field2965, ServerPacket.field3014, ServerPacket.field2986, ServerPacket.field2968, ServerPacket.field3005, ServerPacket.field2997, ServerPacket.field2971, ServerPacket.field2972, ServerPacket.field2932, ServerPacket.field2974, ServerPacket.field2975, ServerPacket.field2976, ServerPacket.field2987, ServerPacket.field2947, ServerPacket.field2979, ServerPacket.field2980, ServerPacket.field2981, ServerPacket.field2957, ServerPacket.field2939, ServerPacket.field2984, ServerPacket.field2985, ServerPacket.field3016, ServerPacket.field3017, ServerPacket.field2943, ServerPacket.field2989, ServerPacket.field2990, ServerPacket.field2991, ServerPacket.field2992, ServerPacket.field2993, ServerPacket.field2994, ServerPacket.field2995, ServerPacket.field2996, ServerPacket.field2952, ServerPacket.field2998, ServerPacket.field2999, ServerPacket.field2953, ServerPacket.field3001, ServerPacket.field3002, ServerPacket.field2960, ServerPacket.field3004, ServerPacket.field2966, ServerPacket.field2988, ServerPacket.field3007, ServerPacket.field2967, ServerPacket.field3009, ServerPacket.field3010, ServerPacket.field3011, ServerPacket.field3012, ServerPacket.field2969, ServerPacket.field2970, ServerPacket.field3015, ServerPacket.field2935, ServerPacket.field3025, ServerPacket.field3018, ServerPacket.field3019, ServerPacket.field3020, ServerPacket.field3021, ServerPacket.field3022, ServerPacket.field3023, ServerPacket.field3024, ServerPacket.field2973, ServerPacket.field3026, ServerPacket.field3027}; // L: 107 + return new ServerPacket[]{ServerPacket.field3013, ServerPacket.field2931, ServerPacket.field2983, ServerPacket.field2933, ServerPacket.field2934, ServerPacket.field2930, ServerPacket.field2936, ServerPacket.field2937, ServerPacket.field3000, ServerPacket.field3003, ServerPacket.field2940, ServerPacket.field2941, ServerPacket.field2942, ServerPacket.field3006, ServerPacket.field2944, ServerPacket.field2945, ServerPacket.field2946, ServerPacket.field3008, ServerPacket.field2948, ServerPacket.field2949, ServerPacket.field2950, ServerPacket.field2951, ServerPacket.field2961, ServerPacket.field2982, ServerPacket.field2954, ServerPacket.field2955, ServerPacket.field2956, ServerPacket.field2978, ServerPacket.field2958, ServerPacket.field2959, ServerPacket.field3029, ServerPacket.field2938, ServerPacket.field2962, ServerPacket.field2963, ServerPacket.field2964, ServerPacket.field2965, ServerPacket.field3014, ServerPacket.field2986, ServerPacket.field2968, ServerPacket.field3005, ServerPacket.field2997, ServerPacket.field2971, ServerPacket.field2972, ServerPacket.field2932, ServerPacket.field2974, ServerPacket.field2975, ServerPacket.field2976, ServerPacket.field2987, ServerPacket.field2947, ServerPacket.field2979, ServerPacket.field2980, ServerPacket.field2981, ServerPacket.field2957, ServerPacket.field2939, ServerPacket.field2984, ServerPacket.field2985, ServerPacket.field3016, ServerPacket.field3017, ServerPacket.field2943, ServerPacket.field2989, ServerPacket.field2990, ServerPacket.field2991, ServerPacket.field2992, ServerPacket.field2993, ServerPacket.field2994, ServerPacket.field2995, ServerPacket.field2996, ServerPacket.field2952, ServerPacket.field2998, ServerPacket.field2999, ServerPacket.field2953, ServerPacket.field3001, ServerPacket.field3002, ServerPacket.field2960, ServerPacket.field3004, ServerPacket.field2966, ServerPacket.field2988, ServerPacket.field3007, ServerPacket.field2967, ServerPacket.field3009, ServerPacket.field3010, ServerPacket.field3011, ServerPacket.field3012, ServerPacket.field2969, ServerPacket.field2970, ServerPacket.field3015, ServerPacket.field2935, ServerPacket.field3025, ServerPacket.field3018, ServerPacket.field3019, ServerPacket.field3020, ServerPacket.field3021, ServerPacket.field3022, ServerPacket.field3023, ServerPacket.field3024, ServerPacket.field2973, ServerPacket.field3026, ServerPacket.field3027}; } @ObfuscatedName("jr") @@ -123,23 +123,23 @@ public class class129 { ) @Export("drawScrollBar") static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { - AbstractWorldMapData.scrollBarSprites[0].drawAt(var0, var1); // L: 11022 - AbstractWorldMapData.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); // L: 11023 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field693); // L: 11024 - int var5 = var3 * (var3 - 32) / var4; // L: 11025 - if (var5 < 8) { // L: 11026 + AbstractWorldMapData.scrollBarSprites[0].drawAt(var0, var1); + AbstractWorldMapData.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field693); + int var5 = var3 * (var3 - 32) / var4; + if (var5 < 8) { var5 = 8; } - int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); // L: 11027 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field716); // L: 11028 - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field544); // L: 11029 - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field544); // L: 11030 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field544); // L: 11031 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field544); // L: 11032 - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field509); // L: 11033 - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field509); // L: 11034 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field509); // L: 11035 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field509); // L: 11036 - } // L: 11037 + int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field716); + Rasterizer2D.method7709(var0, var6 + var1 + 16, var5, Client.field544); + Rasterizer2D.method7709(var0 + 1, var6 + var1 + 16, var5, Client.field544); + Rasterizer2D.method7649(var0, var6 + var1 + 16, 16, Client.field544); + Rasterizer2D.method7649(var0, var6 + var1 + 17, 16, Client.field544); + Rasterizer2D.method7709(var0 + 15, var6 + var1 + 16, var5, Client.field509); + Rasterizer2D.method7709(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field509); + Rasterizer2D.method7649(var0, var6 + var5 + var1 + 15, 16, Client.field509); + Rasterizer2D.method7649(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field509); + } } diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java index ea3caf81c1..9181cafebc 100644 --- a/runescape-client/src/main/java/class13.java +++ b/runescape-client/src/main/java/class13.java @@ -32,42 +32,42 @@ class class13 extends DefaultTlsClient { descriptor = "(Ld;)V" ) class13(class12 var1) { - this.this$1 = var1; // L: 284 + this.this$1 = var1; } public Hashtable getClientExtensions() throws IOException { - Hashtable var1 = super.getClientExtensions(); // L: 287 - if (var1 == null) { // L: 288 - var1 = new Hashtable(); // L: 289 + Hashtable var1 = super.getClientExtensions(); + if (var1 == null) { + var1 = new Hashtable(); } - byte[] var2 = this.this$1.val$host.getBytes(); // L: 291 - ByteArrayOutputStream var3 = new ByteArrayOutputStream(); // L: 292 - DataOutputStream var4 = new DataOutputStream(var3); // L: 293 - var4.writeShort(var2.length + 3); // L: 294 - var4.writeByte(0); // L: 295 - var4.writeShort(var2.length); // L: 296 - var4.write(var2); // L: 297 - var4.close(); // L: 298 - var1.put(0, var3.toByteArray()); // L: 299 - return var1; // L: 300 + byte[] var2 = this.this$1.val$host.getBytes(); + ByteArrayOutputStream var3 = new ByteArrayOutputStream(); + DataOutputStream var4 = new DataOutputStream(var3); + var4.writeShort(var2.length + 3); + var4.writeByte(0); + var4.writeShort(var2.length); + var4.write(var2); + var4.close(); + var1.put(0, var3.toByteArray()); + return var1; } public TlsAuthentication getAuthentication() throws IOException { - return new class11(this); // L: 305 + return new class11(this); } @ObfuscatedName("c") public static String method195(long var0) { - Calendar.Calendar_calendar.setTime(new Date(var0)); // L: 31 - int var2 = Calendar.Calendar_calendar.get(7); // L: 32 - int var3 = Calendar.Calendar_calendar.get(5); // L: 33 - int var4 = Calendar.Calendar_calendar.get(2); // L: 34 - int var5 = Calendar.Calendar_calendar.get(1); // L: 35 - int var6 = Calendar.Calendar_calendar.get(11); // L: 36 - int var7 = Calendar.Calendar_calendar.get(12); // L: 37 - int var8 = Calendar.Calendar_calendar.get(13); // L: 38 - return Calendar.DAYS_OF_THE_WEEK[var2 - 1] + ", " + var3 / 10 + var3 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var4] + "-" + var5 + " " + var6 / 10 + var6 % 10 + ":" + var7 / 10 + var7 % 10 + ":" + var8 / 10 + var8 % 10 + " GMT"; // L: 39 + Calendar.Calendar_calendar.setTime(new Date(var0)); + int var2 = Calendar.Calendar_calendar.get(7); + int var3 = Calendar.Calendar_calendar.get(5); + int var4 = Calendar.Calendar_calendar.get(2); + int var5 = Calendar.Calendar_calendar.get(1); + int var6 = Calendar.Calendar_calendar.get(11); + int var7 = Calendar.Calendar_calendar.get(12); + int var8 = Calendar.Calendar_calendar.get(13); + return Calendar.DAYS_OF_THE_WEEK[var2 - 1] + ", " + var3 / 10 + var3 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var4] + "-" + var5 + " " + var6 / 10 + var6 % 10 + ":" + var7 / 10 + var7 % 10 + ":" + var8 / 10 + var8 % 10 + " GMT"; } @ObfuscatedName("p") @@ -76,71 +76,71 @@ class class13 extends DefaultTlsClient { garbageValue = "1644015096" ) static void method202(class115 var0, float[] var1, float[] var2) { - if (var0 != null) { // L: 224 - float var3 = var1[3] - var1[0]; // L: 227 - if ((double)var3 != 0.0D) { // L: 228 - float var4 = var1[1] - var1[0]; // L: 231 - float var5 = var1[2] - var1[0]; // L: 232 - Float var6 = var4 / var3; // L: 233 - Float var7 = var5 / var3; // L: 234 - var0.field1398 = var6 == 0.33333334F && var7 == 0.6666667F; // L: 235 - float var8 = var6; // L: 236 - float var9 = var7; // L: 237 - if ((double)var6 < 0.0D) { // L: 238 + if (var0 != null) { + float var3 = var1[3] - var1[0]; + if ((double)var3 != 0.0D) { + float var4 = var1[1] - var1[0]; + float var5 = var1[2] - var1[0]; + Float var6 = var4 / var3; + Float var7 = var5 / var3; + var0.field1398 = var6 == 0.33333334F && var7 == 0.6666667F; + float var8 = var6; + float var9 = var7; + if ((double)var6 < 0.0D) { var6 = 0.0F; } - if ((double)var7 > 1.0D) { // L: 239 + if ((double)var7 > 1.0D) { var7 = 1.0F; } - if ((double)var6 > 1.0D || var7 < -1.0F) { // L: 240 - Tile.method3844(var6, var7); // L: 241 + if ((double)var6 > 1.0D || var7 < -1.0F) { + Tile.method3844(var6, var7); } - if (var6 != var8) { // L: 243 - var1[1] = var1[0] + var6 * var3; // L: 244 - if (0.0D != (double)var8) { // L: 245 - var2[1] = var2[0] + (var2[1] - var2[0]) * var6 / var8; // L: 246 + if (var6 != var8) { + var1[1] = var1[0] + var6 * var3; + if (0.0D != (double)var8) { + var2[1] = var2[0] + (var2[1] - var2[0]) * var6 / var8; } } - if (var7 != var9) { // L: 249 - var1[2] = var1[0] + var7 * var3; // L: 250 - if ((double)var9 != 1.0D) { // L: 251 - var2[2] = (float)((double)var2[3] - (double)(var2[3] - var2[2]) * (1.0D - (double)var7) / (1.0D - (double)var9)); // L: 252 + if (var7 != var9) { + var1[2] = var1[0] + var7 * var3; + if ((double)var9 != 1.0D) { + var2[2] = (float)((double)var2[3] - (double)(var2[3] - var2[2]) * (1.0D - (double)var7) / (1.0D - (double)var9)); } } - var0.field1406 = var1[0]; // L: 255 - var0.field1394 = var1[3]; // L: 256 - float var10 = var6; // L: 257 - float var11 = var7; // L: 258 - float[] var12 = var0.field1401; // L: 259 - float var13 = var10 - 0.0F; // L: 261 - float var14 = var11 - var10; // L: 262 - float var15 = 1.0F - var11; // L: 263 - float var16 = var14 - var13; // L: 264 - var12[3] = var15 - var14 - var16; // L: 265 - var12[2] = var16 + var16 + var16; // L: 266 - var12[1] = var13 + var13 + var13; // L: 267 - var12[0] = 0.0F; // L: 268 - var13 = var2[0]; // L: 270 - var14 = var2[1]; // L: 271 - var15 = var2[2]; // L: 272 - var16 = var2[3]; // L: 273 - float[] var17 = var0.field1402; // L: 274 - float var18 = var14 - var13; // L: 276 - float var19 = var15 - var14; // L: 277 - float var20 = var16 - var15; // L: 278 - float var21 = var19 - var18; // L: 279 - var17[3] = var20 - var19 - var21; // L: 280 - var17[2] = var21 + var21 + var21; // L: 281 - var17[1] = var18 + var18 + var18; // L: 282 - var17[0] = var13; // L: 283 + var0.field1406 = var1[0]; + var0.field1394 = var1[3]; + float var10 = var6; + float var11 = var7; + float[] var12 = var0.field1401; + float var13 = var10 - 0.0F; + float var14 = var11 - var10; + float var15 = 1.0F - var11; + float var16 = var14 - var13; + var12[3] = var15 - var14 - var16; + var12[2] = var16 + var16 + var16; + var12[1] = var13 + var13 + var13; + var12[0] = 0.0F; + var13 = var2[0]; + var14 = var2[1]; + var15 = var2[2]; + var16 = var2[3]; + float[] var17 = var0.field1402; + float var18 = var14 - var13; + float var19 = var15 - var14; + float var20 = var16 - var15; + float var21 = var19 - var18; + var17[3] = var20 - var19 - var21; + var17[2] = var21 + var21 + var21; + var17[1] = var18 + var18 + var18; + var17[0] = var13; } } - } // L: 225 229 285 + } @ObfuscatedName("y") @ObfuscatedSignature( @@ -149,20 +149,20 @@ class class13 extends DefaultTlsClient { ) static int method201(int var0, Script var1, boolean var2) { int var3; - if (var0 == 3500) { // L: 2111 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2112 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = DevicePcmPlayerProvider.method398(var3) ? 1 : 0; // L: 2113 - return 1; // L: 2114 - } else if (var0 == 3501) { // L: 2116 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2117 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = StructComposition.method3424(var3) ? 1 : 0; // L: 2118 - return 1; // L: 2119 - } else if (var0 == 3502) { // L: 2121 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2122 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class117.method2676(var3) ? 1 : 0; // L: 2123 - return 1; // L: 2124 + if (var0 == 3500) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = DevicePcmPlayerProvider.method398(var3) ? 1 : 0; + return 1; + } else if (var0 == 3501) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = StructComposition.method3424(var3) ? 1 : 0; + return 1; + } else if (var0 == 3502) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class117.method2676(var3) ? 1 : 0; + return 1; } else { - return 2; // L: 2126 + return 2; } } @@ -173,8 +173,8 @@ class class13 extends DefaultTlsClient { ) @Export("updateRootInterface") static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (class242.loadInterface(var0)) { // L: 11380 - FriendSystem.updateInterface(MouseRecorder.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); // L: 11381 + if (class242.loadInterface(var0)) { + FriendSystem.updateInterface(MouseRecorder.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); } - } // L: 11382 + } } diff --git a/runescape-client/src/main/java/class130.java b/runescape-client/src/main/java/class130.java index a24cd5fa2c..19980340d2 100644 --- a/runescape-client/src/main/java/class130.java +++ b/runescape-client/src/main/java/class130.java @@ -23,8 +23,8 @@ public class class130 extends class126 { ) class130(class129 var1) { this.this$0 = var1; - this.field1524 = -1; // L: 128 - } // L: 131 + this.field1524 = -1; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -32,9 +32,9 @@ public class class130 extends class126 { garbageValue = "1416770155" ) void vmethod3029(Buffer var1) { - this.field1524 = var1.readUnsignedShort(); // L: 134 - this.field1522 = var1.readByte(); // L: 135 - } // L: 136 + this.field1524 = var1.readUnsignedShort(); + this.field1522 = var1.readByte(); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -42,8 +42,8 @@ public class class130 extends class126 { garbageValue = "-1531735008" ) void vmethod3028(ClanSettings var1) { - var1.method2887(this.field1524, this.field1522); // L: 139 - } // L: 140 + var1.method2887(this.field1524, this.field1522); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -52,16 +52,16 @@ public class class130 extends class126 { ) @Export("findEnumerated") public static MouseWheel findEnumerated(MouseWheel[] var0, int var1) { - MouseWheel[] var2 = var0; // L: 17 + MouseWheel[] var2 = var0; - for (int var3 = 0; var3 < var2.length; ++var3) { // L: 18 - MouseWheel var4 = var2[var3]; // L: 19 + for (int var3 = 0; var3 < var2.length; ++var3) { + MouseWheel var4 = var2[var3]; if (var1 == var4.rsOrdinal()) { - return var4; // L: 21 + return var4; } } - return null; // L: 25 + return null; } @ObfuscatedName("x") @@ -70,6 +70,6 @@ public class class130 extends class126 { garbageValue = "1459785075" ) public static final void method2795(class47 var0) { - class11.pcmPlayerProvider = var0; // L: 45 - } // L: 46 + class11.pcmPlayerProvider = var0; + } } diff --git a/runescape-client/src/main/java/class131.java b/runescape-client/src/main/java/class131.java index 64f43d5725..76dcf3f5ef 100644 --- a/runescape-client/src/main/java/class131.java +++ b/runescape-client/src/main/java/class131.java @@ -50,7 +50,7 @@ public class class131 extends class126 { descriptor = "(Lda;)V" ) class131(class129 var1) { - this.this$0 = var1; // L: 289 + this.this$0 = var1; } @ObfuscatedName("c") @@ -59,11 +59,11 @@ public class class131 extends class126 { garbageValue = "1416770155" ) void vmethod3029(Buffer var1) { - this.field1526 = var1.readInt(); // L: 292 - this.field1533 = var1.readInt(); // L: 293 - this.field1525 = var1.readUnsignedByte(); // L: 294 - this.field1528 = var1.readUnsignedByte(); // L: 295 - } // L: 296 + this.field1526 = var1.readInt(); + this.field1533 = var1.readInt(); + this.field1525 = var1.readUnsignedByte(); + this.field1528 = var1.readUnsignedByte(); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -71,8 +71,8 @@ public class class131 extends class126 { garbageValue = "-1531735008" ) void vmethod3028(ClanSettings var1) { - var1.method2860(this.field1526, this.field1533, this.field1525, this.field1528); // L: 299 - } // L: 300 + var1.method2860(this.field1526, this.field1533, this.field1525, this.field1528); + } @ObfuscatedName("r") @ObfuscatedSignature( @@ -80,7 +80,7 @@ public class class131 extends class126 { garbageValue = "-37" ) static final int method2802(int var0, int var1, int var2, int var3) { - int var4 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var2 * 1024 / var3] >> 1; // L: 476 - return ((65536 - var4) * var0 >> 16) + (var4 * var1 >> 16); // L: 477 + int var4 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var2 * 1024 / var3] >> 1; + return ((65536 - var4) * var0 >> 16) + (var4 * var1 >> 16); } } diff --git a/runescape-client/src/main/java/class132.java b/runescape-client/src/main/java/class132.java index cca25370d4..9aa071ae92 100644 --- a/runescape-client/src/main/java/class132.java +++ b/runescape-client/src/main/java/class132.java @@ -31,8 +31,8 @@ public class class132 extends class142 { ) class132(class143 var1) { this.this$0 = var1; - this.field1535 = -1; // L: 101 - } // L: 106 + this.field1535 = -1; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -40,12 +40,12 @@ public class class132 extends class142 { garbageValue = "4" ) void vmethod3022(Buffer var1) { - this.field1535 = var1.readUnsignedShort(); // L: 109 - this.field1541 = var1.readByte(); // L: 110 - this.field1536 = var1.readUnsignedShort(); // L: 111 - var1.readLong(); // L: 112 - this.field1538 = var1.readStringCp1252NullTerminated(); // L: 113 - } // L: 114 + this.field1535 = var1.readUnsignedShort(); + this.field1541 = var1.readByte(); + this.field1536 = var1.readUnsignedShort(); + var1.readLong(); + this.field1538 = var1.readStringCp1252NullTerminated(); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -53,11 +53,11 @@ public class class132 extends class142 { garbageValue = "40" ) void vmethod3021(ClanChannel var1) { - ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1535); // L: 117 - var2.rank = this.field1541; // L: 118 - var2.world = this.field1536; // L: 119 - var2.username = new Username(this.field1538); // L: 120 - } // L: 121 + ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1535); + var2.rank = this.field1541; + var2.world = this.field1536; + var2.username = new Username(this.field1538); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -65,33 +65,33 @@ public class class132 extends class142 { garbageValue = "420472721" ) static void method2810() { - 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 + if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { + KeyHandler.KeyHandler_keyCodes[186] = 57; + KeyHandler.KeyHandler_keyCodes[187] = 27; + KeyHandler.KeyHandler_keyCodes[188] = 71; + KeyHandler.KeyHandler_keyCodes[189] = 26; + KeyHandler.KeyHandler_keyCodes[190] = 72; + KeyHandler.KeyHandler_keyCodes[191] = 73; + KeyHandler.KeyHandler_keyCodes[192] = 58; + KeyHandler.KeyHandler_keyCodes[219] = 42; + KeyHandler.KeyHandler_keyCodes[220] = 74; + KeyHandler.KeyHandler_keyCodes[221] = 43; + KeyHandler.KeyHandler_keyCodes[222] = 59; + KeyHandler.KeyHandler_keyCodes[223] = 28; } else { - KeyHandler.KeyHandler_keyCodes[44] = 71; // 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 + KeyHandler.KeyHandler_keyCodes[44] = 71; + KeyHandler.KeyHandler_keyCodes[45] = 26; + KeyHandler.KeyHandler_keyCodes[46] = 72; + KeyHandler.KeyHandler_keyCodes[47] = 73; + KeyHandler.KeyHandler_keyCodes[59] = 57; + KeyHandler.KeyHandler_keyCodes[61] = 27; + KeyHandler.KeyHandler_keyCodes[91] = 42; + KeyHandler.KeyHandler_keyCodes[92] = 74; + KeyHandler.KeyHandler_keyCodes[93] = 43; + KeyHandler.KeyHandler_keyCodes[192] = 28; + KeyHandler.KeyHandler_keyCodes[222] = 58; + KeyHandler.KeyHandler_keyCodes[520] = 59; } - } // L: 152 + } } diff --git a/runescape-client/src/main/java/class133.java b/runescape-client/src/main/java/class133.java index 9562913868..3b3e04fc97 100644 --- a/runescape-client/src/main/java/class133.java +++ b/runescape-client/src/main/java/class133.java @@ -37,7 +37,7 @@ public class class133 extends class126 { descriptor = "(Lda;)V" ) class133(class129 var1) { - this.this$0 = var1; // L: 248 + this.this$0 = var1; } @ObfuscatedName("c") @@ -46,12 +46,12 @@ public class class133 extends class126 { garbageValue = "1416770155" ) void vmethod3029(Buffer var1) { - this.field1543 = var1.readUnsignedByte() == 1; // L: 251 - this.field1547 = var1.readByte(); // L: 252 - this.field1544 = var1.readByte(); // L: 253 - this.field1542 = var1.readByte(); // L: 254 - this.field1546 = var1.readByte(); // L: 255 - } // L: 256 + this.field1543 = var1.readUnsignedByte() == 1; + this.field1547 = var1.readByte(); + this.field1544 = var1.readByte(); + this.field1542 = var1.readByte(); + this.field1546 = var1.readByte(); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -59,10 +59,10 @@ public class class133 extends class126 { garbageValue = "-1531735008" ) void vmethod3028(ClanSettings var1) { - var1.allowGuests = this.field1543; // L: 259 - var1.field1567 = this.field1547; // L: 260 - var1.field1568 = this.field1544; // L: 261 - var1.field1569 = this.field1542; // L: 262 - var1.field1570 = this.field1546; // L: 263 - } // L: 264 + var1.allowGuests = this.field1543; + var1.field1567 = this.field1547; + var1.field1568 = this.field1544; + var1.field1569 = this.field1542; + var1.field1570 = this.field1546; + } } diff --git a/runescape-client/src/main/java/class134.java b/runescape-client/src/main/java/class134.java index f97bd6c215..1f5864d2d9 100644 --- a/runescape-client/src/main/java/class134.java +++ b/runescape-client/src/main/java/class134.java @@ -21,8 +21,8 @@ public class class134 extends class142 { ) class134(class143 var1) { this.this$0 = var1; - this.field1552 = -1; // L: 82 - } // L: 84 + this.field1552 = -1; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -30,14 +30,14 @@ public class class134 extends class142 { garbageValue = "4" ) void vmethod3022(Buffer var1) { - this.field1552 = var1.readUnsignedShort(); // L: 87 - var1.readUnsignedByte(); // L: 88 - if (var1.readUnsignedByte() != 255) { // L: 89 - --var1.offset; // L: 90 - var1.readLong(); // L: 91 + this.field1552 = var1.readUnsignedShort(); + var1.readUnsignedByte(); + if (var1.readUnsignedByte() != 255) { + --var1.offset; + var1.readLong(); } - } // L: 93 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -45,8 +45,8 @@ public class class134 extends class142 { garbageValue = "40" ) void vmethod3021(ClanChannel var1) { - var1.removeMember(this.field1552); // L: 96 - } // L: 97 + var1.removeMember(this.field1552); + } @ObfuscatedName("av") @ObfuscatedSignature( @@ -54,49 +54,49 @@ public class class134 extends class142 { garbageValue = "1" ) static int method2824(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.GETWINDOWMODE) { // L: 3533 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class143.getWindowedMode(); // L: 3534 - return 1; // L: 3535 + if (var0 == ScriptOpcodes.GETWINDOWMODE) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class143.getWindowedMode(); + return 1; } else { int var3; - if (var0 == ScriptOpcodes.SETWINDOWMODE) { // L: 3537 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3538 - if (var3 == 1 || var3 == 2) { // L: 3539 + if (var0 == ScriptOpcodes.SETWINDOWMODE) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + if (var3 == 1 || var3 == 2) { Occluder.setWindowedMode(var3); } - return 1; // L: 3540 - } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { // L: 3542 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = SecureRandomFuture.clientPreferences.windowMode; // L: 3543 - return 1; // L: 3544 - } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { // L: 3546 - if (var0 == 5310) { // L: 3554 - --IsaacCipher.Interpreter_intStackSize; // L: 3555 - return 1; // L: 3556 - } else if (var0 == 5311) { // L: 3558 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 3559 - return 1; // L: 3560 - } else if (var0 == 5312) { // L: 3562 - --IsaacCipher.Interpreter_intStackSize; // L: 3563 - return 1; // L: 3564 - } else if (var0 == 5350) { // L: 3566 - class13.Interpreter_stringStackSize -= 2; // L: 3567 - --IsaacCipher.Interpreter_intStackSize; // L: 3568 - return 1; // L: 3569 - } else if (var0 == 5351) { // L: 3571 - --class13.Interpreter_stringStackSize; // L: 3572 - return 1; // L: 3573 + return 1; + } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = SecureRandomFuture.clientPreferences.windowMode; + return 1; + } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { + if (var0 == 5310) { + --IsaacCipher.Interpreter_intStackSize; + return 1; + } else if (var0 == 5311) { + IsaacCipher.Interpreter_intStackSize -= 2; + return 1; + } else if (var0 == 5312) { + --IsaacCipher.Interpreter_intStackSize; + return 1; + } else if (var0 == 5350) { + class13.Interpreter_stringStackSize -= 2; + --IsaacCipher.Interpreter_intStackSize; + return 1; + } else if (var0 == 5351) { + --class13.Interpreter_stringStackSize; + return 1; } else { - return 2; // L: 3575 + return 2; } } else { - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3547 - if (var3 == 1 || var3 == 2) { // L: 3548 - SecureRandomFuture.clientPreferences.windowMode = var3; // L: 3549 - class127.savePreferences(); // L: 3550 + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + if (var3 == 1 || var3 == 2) { + SecureRandomFuture.clientPreferences.windowMode = var3; + class127.savePreferences(); } - return 1; // L: 3552 + return 1; } } } diff --git a/runescape-client/src/main/java/class135.java b/runescape-client/src/main/java/class135.java index 9e2e14f03d..5b32584803 100644 --- a/runescape-client/src/main/java/class135.java +++ b/runescape-client/src/main/java/class135.java @@ -15,7 +15,7 @@ public class class135 extends class126 { descriptor = "(Lda;)V" ) class135(class129 var1) { - this.this$0 = var1; // L: 229 + this.this$0 = var1; } @ObfuscatedName("c") @@ -24,9 +24,9 @@ public class class135 extends class126 { garbageValue = "1416770155" ) void vmethod3029(Buffer var1) { - this.field1555 = var1.readStringCp1252NullTerminated(); // L: 232 - var1.readInt(); // L: 233 - } // L: 234 + this.field1555 = var1.readStringCp1252NullTerminated(); + var1.readInt(); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -34,8 +34,8 @@ public class class135 extends class126 { garbageValue = "-1531735008" ) void vmethod3028(ClanSettings var1) { - var1.name = this.field1555; // L: 237 - } // L: 238 + var1.name = this.field1555; + } @ObfuscatedName("o") @ObfuscatedSignature( @@ -43,9 +43,9 @@ public class class135 extends class126 { garbageValue = "-877203069" ) public static final void method2832() { - ViewportMouse.ViewportMouse_isInViewport = false; // L: 95 - ViewportMouse.ViewportMouse_entityCount = 0; // L: 96 - } // L: 97 + ViewportMouse.ViewportMouse_isInViewport = false; + ViewportMouse.ViewportMouse_entityCount = 0; + } @ObfuscatedName("lz") @ObfuscatedSignature( @@ -53,19 +53,19 @@ public class class135 extends class126 { garbageValue = "1487689727" ) static final void method2831(int var0, int var1) { - ClanChannel var2 = var0 >= 0 ? Client.currentClanChannels[var0] : UserComparator5.guestClanChannel; // L: 12510 - if (var2 != null && var1 >= 0 && var1 < var2.method2990()) { // L: 12511 - ClanChannelMember var3 = (ClanChannelMember)var2.members.get(var1); // L: 12512 + ClanChannel var2 = var0 >= 0 ? Client.currentClanChannels[var0] : UserComparator5.guestClanChannel; + if (var2 != null && var1 >= 0 && var1 < var2.method2990()) { + ClanChannelMember var3 = (ClanChannelMember)var2.members.get(var1); if (var3.rank == -1) { - String var4 = var3.username.getName(); // L: 12514 - PacketWriter var5 = Client.packetWriter; // L: 12515 - PacketBufferNode var6 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2875, var5.isaacCipher); // L: 12516 - var6.packetBuffer.writeByte(3 + class116.stringCp1252NullTerminatedByteSize(var4)); // L: 12517 - var6.packetBuffer.writeByte(var0); // L: 12518 - var6.packetBuffer.writeShort(var1); // L: 12519 - var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 12520 - var5.addNode(var6); // L: 12521 + String var4 = var3.username.getName(); + PacketWriter var5 = Client.packetWriter; + PacketBufferNode var6 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2875, var5.isaacCipher); + var6.packetBuffer.writeByte(3 + class116.stringCp1252NullTerminatedByteSize(var4)); + var6.packetBuffer.writeByte(var0); + var6.packetBuffer.writeShort(var1); + var6.packetBuffer.writeStringCp1252NullTerminated(var4); + var5.addNode(var6); } } - } // L: 12513 12522 + } } diff --git a/runescape-client/src/main/java/class136.java b/runescape-client/src/main/java/class136.java index c517e6490d..80b5f760d8 100644 --- a/runescape-client/src/main/java/class136.java +++ b/runescape-client/src/main/java/class136.java @@ -29,7 +29,7 @@ public class class136 extends class126 { descriptor = "(Lda;)V" ) class136(class129 var1) { - this.this$0 = var1; // L: 323 + this.this$0 = var1; } @ObfuscatedName("c") @@ -38,9 +38,9 @@ public class class136 extends class126 { garbageValue = "1416770155" ) void vmethod3029(Buffer var1) { - this.field1556 = var1.readInt(); // L: 326 - this.field1557 = var1.readStringCp1252NullTerminated(); // L: 327 - } // L: 328 + this.field1556 = var1.readInt(); + this.field1557 = var1.readStringCp1252NullTerminated(); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -48,8 +48,8 @@ public class class136 extends class126 { garbageValue = "-1531735008" ) void vmethod3028(ClanSettings var1) { - var1.method2873(this.field1556, this.field1557); // L: 331 - } // L: 332 + var1.method2873(this.field1556, this.field1557); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -57,10 +57,10 @@ public class class136 extends class126 { garbageValue = "-54146153" ) static void method2839(Component var0) { - var0.addMouseListener(MouseHandler.MouseHandler_instance); // L: 37 - var0.addMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 38 - var0.addFocusListener(MouseHandler.MouseHandler_instance); // L: 39 - } // L: 40 + var0.addMouseListener(MouseHandler.MouseHandler_instance); + var0.addMouseMotionListener(MouseHandler.MouseHandler_instance); + var0.addFocusListener(MouseHandler.MouseHandler_instance); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -68,19 +68,19 @@ public class class136 extends class126 { garbageValue = "-10" ) public static boolean method2842(char var0) { - if ((var0 <= 0 || var0 >= 128) && (var0 < 160 || var0 > 255)) { // L: 45 - if (var0 != 0) { // L: 46 - char[] var1 = class328.cp1252AsciiExtension; // L: 48 + if ((var0 <= 0 || var0 >= 128) && (var0 < 160 || var0 > 255)) { + if (var0 != 0) { + char[] var1 = class328.cp1252AsciiExtension; - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 49 - char var3 = var1[var2]; // L: 50 - if (var0 == var3) { // L: 52 + for (int var2 = 0; var2 < var1.length; ++var2) { + char var3 = var1[var2]; + if (var0 == var3) { return true; } } } - return false; // L: 57 + return false; } else { return true; } @@ -92,7 +92,7 @@ public class class136 extends class126 { garbageValue = "-56" ) public static boolean method2841(int var0) { - return (var0 >> 20 & 1) != 0; // L: 25 + return (var0 >> 20 & 1) != 0; } @ObfuscatedName("ic") @@ -101,45 +101,45 @@ public class class136 extends class126 { garbageValue = "429003988" ) static void method2840(int var0, String var1) { - int var2 = Players.Players_count; // L: 9822 - int[] var3 = Players.Players_indices; // L: 9823 - boolean var4 = false; // L: 9824 - Username var5 = new Username(var1, class194.loginType); // L: 9825 + int var2 = Players.Players_count; + int[] var3 = Players.Players_indices; + boolean var4 = false; + Username var5 = new Username(var1, class194.loginType); - for (int var6 = 0; var6 < var2; ++var6) { // L: 9826 - Player var7 = Client.players[var3[var6]]; // L: 9827 - if (var7 != null && var7 != class340.localPlayer && var7.username != null && var7.username.equals(var5)) { // L: 9828 + for (int var6 = 0; var6 < var2; ++var6) { + Player var7 = Client.players[var3[var6]]; + if (var7 != null && var7 != class340.localPlayer && var7.username != null && var7.username.equals(var5)) { PacketBufferNode var8; - if (var0 == 1) { // L: 9829 - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2887, Client.packetWriter.isaacCipher); // L: 9831 - var8.packetBuffer.method7343(0); // L: 9832 - var8.packetBuffer.method7398(var3[var6]); // L: 9833 - Client.packetWriter.addNode(var8); // L: 9834 - } else if (var0 == 4) { // L: 9836 - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2807, Client.packetWriter.isaacCipher); // L: 9838 - var8.packetBuffer.method7349(var3[var6]); // L: 9839 - var8.packetBuffer.writeByte(0); // L: 9840 - Client.packetWriter.addNode(var8); // L: 9841 - } else if (var0 == 6) { // L: 9843 - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2863, Client.packetWriter.isaacCipher); // L: 9845 - var8.packetBuffer.method7390(0); // L: 9846 - var8.packetBuffer.method7398(var3[var6]); // L: 9847 - Client.packetWriter.addNode(var8); // L: 9848 - } else if (var0 == 7) { // L: 9850 - var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2906, Client.packetWriter.isaacCipher); // L: 9852 - var8.packetBuffer.method7362(0); // L: 9853 - var8.packetBuffer.method7493(var3[var6]); // L: 9854 - Client.packetWriter.addNode(var8); // L: 9855 + if (var0 == 1) { + var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2887, Client.packetWriter.isaacCipher); + var8.packetBuffer.method7343(0); + var8.packetBuffer.method7398(var3[var6]); + Client.packetWriter.addNode(var8); + } else if (var0 == 4) { + var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2807, Client.packetWriter.isaacCipher); + var8.packetBuffer.method7349(var3[var6]); + var8.packetBuffer.writeByte(0); + Client.packetWriter.addNode(var8); + } else if (var0 == 6) { + var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2863, Client.packetWriter.isaacCipher); + var8.packetBuffer.method7390(0); + var8.packetBuffer.method7398(var3[var6]); + Client.packetWriter.addNode(var8); + } else if (var0 == 7) { + var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2906, Client.packetWriter.isaacCipher); + var8.packetBuffer.method7362(0); + var8.packetBuffer.method7493(var3[var6]); + Client.packetWriter.addNode(var8); } - var4 = true; // L: 9857 + var4 = true; break; } } - if (!var4) { // L: 9861 + if (!var4) { class194.addGameMessage(4, "", "Unable to find " + var1); } - } // L: 9862 + } } diff --git a/runescape-client/src/main/java/class138.java b/runescape-client/src/main/java/class138.java index 4fb3253961..7ead201214 100644 --- a/runescape-client/src/main/java/class138.java +++ b/runescape-client/src/main/java/class138.java @@ -31,8 +31,8 @@ public class class138 extends class142 { ) class138(class143 var1) { this.this$0 = var1; - this.field1589 = null; // L: 55 - } // L: 59 + this.field1589 = null; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -40,16 +40,16 @@ public class class138 extends class142 { garbageValue = "4" ) void vmethod3022(Buffer var1) { - if (var1.readUnsignedByte() != 255) { // L: 62 - --var1.offset; // L: 63 - var1.readLong(); // L: 64 + if (var1.readUnsignedByte() != 255) { + --var1.offset; + var1.readLong(); } - this.field1589 = var1.readStringCp1252NullTerminatedOrNull(); // L: 66 - this.field1588 = var1.readUnsignedShort(); // L: 67 - this.field1590 = var1.readByte(); // L: 68 - var1.readLong(); // L: 69 - } // L: 70 + this.field1589 = var1.readStringCp1252NullTerminatedOrNull(); + this.field1588 = var1.readUnsignedShort(); + this.field1590 = var1.readByte(); + var1.readLong(); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -57,10 +57,10 @@ public class class138 extends class142 { garbageValue = "40" ) void vmethod3021(ClanChannel var1) { - ClanChannelMember var2 = new ClanChannelMember(); // L: 73 - var2.username = new Username(this.field1589); // L: 74 - var2.world = this.field1588; // L: 75 - var2.rank = this.field1590; // L: 76 - var1.addMember(var2); // L: 77 - } // L: 78 + ClanChannelMember var2 = new ClanChannelMember(); + var2.username = new Username(this.field1589); + var2.world = this.field1588; + var2.rank = this.field1590; + var1.addMember(var2); + } } diff --git a/runescape-client/src/main/java/class139.java b/runescape-client/src/main/java/class139.java index e30d553c28..2207223486 100644 --- a/runescape-client/src/main/java/class139.java +++ b/runescape-client/src/main/java/class139.java @@ -36,8 +36,8 @@ public class class139 extends class142 { ) class139(class143 var1) { this.this$0 = var1; - this.field1595 = -1; // L: 125 - } // L: 130 + this.field1595 = -1; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -45,14 +45,14 @@ public class class139 extends class142 { garbageValue = "4" ) void vmethod3022(Buffer var1) { - var1.readUnsignedByte(); // L: 133 - this.field1595 = var1.readUnsignedShort(); // L: 134 - this.field1594 = var1.readByte(); // L: 135 - this.field1593 = var1.readUnsignedShort(); // L: 136 - var1.readLong(); // L: 137 - this.field1596 = var1.readStringCp1252NullTerminated(); // L: 138 - var1.readUnsignedByte(); // L: 139 - } // L: 140 + var1.readUnsignedByte(); + this.field1595 = var1.readUnsignedShort(); + this.field1594 = var1.readByte(); + this.field1593 = var1.readUnsignedShort(); + var1.readLong(); + this.field1596 = var1.readStringCp1252NullTerminated(); + var1.readUnsignedByte(); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -60,11 +60,11 @@ public class class139 extends class142 { garbageValue = "40" ) void vmethod3021(ClanChannel var1) { - ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1595); // L: 143 - var2.rank = this.field1594; // L: 144 - var2.world = this.field1593; // L: 145 - var2.username = new Username(this.field1596); // L: 146 - } // L: 147 + ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1595); + var2.rank = this.field1594; + var2.world = this.field1593; + var2.username = new Username(this.field1596); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -73,14 +73,14 @@ public class class139 extends class142 { @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 + if (var0 instanceof RunException) { + var2 = (RunException)var0; + var2.message = var2.message + ' ' + var1; } else { - var2 = new RunException(var0, var1); // L: 61 + var2 = new RunException(var0, var1); } - return var2; // L: 62 + return var2; } @ObfuscatedName("m") @@ -90,7 +90,7 @@ public class class139 extends class142 { ) @Export("Messages_getMessage") static Message Messages_getMessage(int var0) { - return (Message)Messages.Messages_hashTable.get((long)var0); // L: 40 + return (Message)Messages.Messages_hashTable.get((long)var0); } @ObfuscatedName("o") @@ -99,10 +99,10 @@ public class class139 extends class142 { garbageValue = "1312744051" ) static final int method2932(int var0, int var1) { - int var2 = KeyHandler.method367(var0 - 1, var1 - 1) + KeyHandler.method367(var0 + 1, var1 - 1) + KeyHandler.method367(var0 - 1, 1 + var1) + KeyHandler.method367(var0 + 1, var1 + 1); // L: 481 - int var3 = KeyHandler.method367(var0 - 1, var1) + KeyHandler.method367(var0 + 1, var1) + KeyHandler.method367(var0, var1 - 1) + KeyHandler.method367(var0, 1 + var1); // L: 482 - int var4 = KeyHandler.method367(var0, var1); // L: 483 - return var2 / 16 + var3 / 8 + var4 / 4; // L: 484 + int var2 = KeyHandler.method367(var0 - 1, var1 - 1) + KeyHandler.method367(var0 + 1, var1 - 1) + KeyHandler.method367(var0 - 1, 1 + var1) + KeyHandler.method367(var0 + 1, var1 + 1); + int var3 = KeyHandler.method367(var0 - 1, var1) + KeyHandler.method367(var0 + 1, var1) + KeyHandler.method367(var0, var1 - 1) + KeyHandler.method367(var0, 1 + var1); + int var4 = KeyHandler.method367(var0, var1); + return var2 / 16 + var3 / 8 + var4 / 4; } @ObfuscatedName("v") @@ -111,6 +111,6 @@ public class class139 extends class142 { garbageValue = "341496897" ) static final boolean method2931() { - return ViewportMouse.ViewportMouse_isInViewport; // L: 100 + return ViewportMouse.ViewportMouse_isInViewport; } } diff --git a/runescape-client/src/main/java/class14.java b/runescape-client/src/main/java/class14.java index 3485c42660..fb055f7515 100644 --- a/runescape-client/src/main/java/class14.java +++ b/runescape-client/src/main/java/class14.java @@ -21,9 +21,9 @@ public class class14 { final ThreadPoolExecutor field82; public class14(String var1, int var2, int var3) { - this.field79 = var1; // L: 15 - this.field80 = var2; // L: 16 - this.field81 = new class16(this); // L: 17 + this.field79 = var1; + this.field80 = var2; + this.field81 = new class16(this); this.field82 = this.method203(var3); } @@ -42,11 +42,11 @@ public class class14 { garbageValue = "-977382928" ) public class19 method213(class10 var1) { - if (this.field82.getQueue().remainingCapacity() <= 0) { // L: 26 + if (this.field82.getQueue().remainingCapacity() <= 0) { System.err.println("REST thread pool queue is empty\r\nThread pool size " + this.field82.getCorePoolSize() + " Queue capacity " + this.field80); return new class19("Queue full"); } else { - class19 var2 = new class19(this.field82.submit(new class20(this, var1))); // L: 30 + class19 var2 = new class19(this.field82.submit(new class20(this, var1))); return var2; } } @@ -71,100 +71,100 @@ public class class14 { garbageValue = "1" ) static float method210(class115 var0, float var1) { - if (var0 != null && var0.method2637() != 0) { // L: 18 - if (var1 < (float)var0.field1393[0].field1359) { // L: 21 - return var0.field1410 == class114.field1390 ? var0.field1393[0].field1349 : class213.method4354(var0, var1, true); // L: 22 23 25 - } else if (var1 > (float)var0.field1393[var0.method2637() - 1].field1359) { // L: 27 - return var0.field1396 == class114.field1390 ? var0.field1393[var0.method2637() - 1].field1349 : class213.method4354(var0, var1, false); // L: 28 29 31 - } else if (var0.field1408) { // L: 33 - return var0.field1393[0].field1349; // L: 34 + if (var0 != null && var0.method2637() != 0) { + if (var1 < (float)var0.field1393[0].field1359) { + return var0.field1410 == class114.field1390 ? var0.field1393[0].field1349 : class213.method4354(var0, var1, true); + } else if (var1 > (float)var0.field1393[var0.method2637() - 1].field1359) { + return var0.field1396 == class114.field1390 ? var0.field1393[var0.method2637() - 1].field1349 : class213.method4354(var0, var1, false); + } else if (var0.field1408) { + return var0.field1393[0].field1349; } else { - class111 var2 = var0.method2631(var1); // L: 36 - boolean var3 = false; // L: 37 - boolean var4 = false; // L: 38 - if (var2 == null) { // L: 39 - return 0.0F; // L: 134 + class111 var2 = var0.method2631(var1); + boolean var3 = false; + boolean var4 = false; + if (var2 == null) { + return 0.0F; } else { - if (0.0D == (double)var2.field1352 && (double)var2.field1357 == 0.0D) { // L: 40 - var3 = true; // L: 41 - } else if (Float.MAX_VALUE == var2.field1352 && var2.field1357 == Float.MAX_VALUE) { // L: 43 - var4 = true; // L: 44 - } else if (var2.field1354 != null) { // L: 46 - if (var0.field1403) { // L: 47 - float[] var5 = new float[4]; // L: 48 - float[] var6 = new float[4]; // L: 49 - var5[0] = (float)var2.field1359; // L: 50 - var6[0] = var2.field1349; // L: 51 - var5[1] = var5[0] + var2.field1352 * 0.33333334F; // L: 52 - var6[1] = var6[0] + 0.33333334F * var2.field1357; // L: 53 - var5[3] = (float)var2.field1354.field1359; // L: 54 - var6[3] = var2.field1354.field1349; // L: 55 - var5[2] = var5[3] - var2.field1354.field1350 * 0.33333334F; // L: 56 - var6[2] = var6[3] - var2.field1354.field1351 * 0.33333334F; // L: 57 - if (var0.field1397) { // L: 58 - class13.method202(var0, var5, var6); // L: 59 + if (0.0D == (double)var2.field1352 && (double)var2.field1357 == 0.0D) { + var3 = true; + } else if (Float.MAX_VALUE == var2.field1352 && var2.field1357 == Float.MAX_VALUE) { + var4 = true; + } else if (var2.field1354 != null) { + if (var0.field1403) { + float[] var5 = new float[4]; + float[] var6 = new float[4]; + var5[0] = (float)var2.field1359; + var6[0] = var2.field1349; + var5[1] = var5[0] + var2.field1352 * 0.33333334F; + var6[1] = var6[0] + 0.33333334F * var2.field1357; + var5[3] = (float)var2.field1354.field1359; + var6[3] = var2.field1354.field1349; + var5[2] = var5[3] - var2.field1354.field1350 * 0.33333334F; + var6[2] = var6[3] - var2.field1354.field1351 * 0.33333334F; + if (var0.field1397) { + class13.method202(var0, var5, var6); } else { - UserComparator4.method2504(var0, var5, var6); // L: 62 + UserComparator4.method2504(var0, var5, var6); } - var0.field1403 = false; // L: 64 + var0.field1403 = false; } } else { - var3 = true; // L: 68 + var3 = true; } - if (var3) { // L: 70 - return var2.field1349; // L: 71 - } else if (var4) { // L: 73 - return (float)var2.field1359 != var1 && var2.field1354 != null ? var2.field1354.field1349 : var2.field1349; // L: 74 75 78 + if (var3) { + return var2.field1349; + } else if (var4) { + return (float)var2.field1359 != var1 && var2.field1354 != null ? var2.field1354.field1349 : var2.field1349; } else { float var11; float var12; - if (var0.field1397) { // L: 81 - if (var0 == null) { // L: 84 - var12 = 0.0F; // L: 85 + if (var0.field1397) { + if (var0 == null) { + var12 = 0.0F; } else { - if (var1 == var0.field1406) { // L: 89 - var11 = 0.0F; // L: 90 - } else if (var1 == var0.field1394) { // L: 92 - var11 = 1.0F; // L: 93 + if (var1 == var0.field1406) { + var11 = 0.0F; + } else if (var1 == var0.field1394) { + var11 = 1.0F; } else { - var11 = (var1 - var0.field1406) / (var0.field1394 - var0.field1406); // L: 96 + var11 = (var1 - var0.field1406) / (var0.field1394 - var0.field1406); } float var7; - if (var0.field1398) { // L: 99 - var7 = var11; // L: 100 + if (var0.field1398) { + var7 = var11; } else { - float[] var8 = new float[]{var0.field1401[0] - var11, var0.field1401[1], var0.field1401[2], var0.field1401[3]}; // L: 103 104 105 106 107 - float[] var9 = new float[5]; // L: 108 - int var10 = class144.method2971(var8, 3, 0.0F, true, 1.0F, true, var9); // L: 109 - if (var10 == 1) { // L: 110 - var7 = var9[0]; // L: 111 + float[] var8 = new float[]{var0.field1401[0] - var11, var0.field1401[1], var0.field1401[2], var0.field1401[3]}; + float[] var9 = new float[5]; + int var10 = class144.method2971(var8, 3, 0.0F, true, 1.0F, true, var9); + if (var10 == 1) { + var7 = var9[0]; } else { - var7 = 0.0F; // L: 114 + var7 = 0.0F; } } - var12 = var0.field1402[0] + var7 * (var0.field1402[1] + var7 * (var0.field1402[2] + var7 * var0.field1402[3])); // L: 117 + var12 = var0.field1402[0] + var7 * (var0.field1402[1] + var7 * (var0.field1402[2] + var7 * var0.field1402[3])); } - return var12; // L: 119 + return var12; } else { - if (var0 == null) { // L: 124 - var12 = 0.0F; // L: 125 + if (var0 == null) { + var12 = 0.0F; } else { - var11 = var1 - var0.field1406; // L: 128 - var12 = (var11 * (var11 * var0.field1401[0] + var0.field1401[1]) + var0.field1401[2]) * var11 + var0.field1401[3]; // L: 129 + var11 = var1 - var0.field1406; + var12 = (var11 * (var11 * var0.field1401[0] + var0.field1401[1]) + var0.field1401[2]) * var11 + var0.field1401[3]; } - return var12; // L: 131 + return var12; } } } } } else { - return 0.0F; // L: 19 + return 0.0F; } } @@ -174,9 +174,9 @@ public class class14 { garbageValue = "-1522814517" ) public static int method214(boolean var0, boolean var1) { - byte var2 = 0; // L: 259 - int var3 = var2 + NetCache.NetCache_pendingPriorityResponsesCount + NetCache.NetCache_pendingPriorityWritesCount; // L: 260 - return var3; // L: 261 + byte var2 = 0; + int var3 = var2 + NetCache.NetCache_pendingPriorityResponsesCount + NetCache.NetCache_pendingPriorityWritesCount; + return var3; } @ObfuscatedName("id") @@ -185,6 +185,6 @@ public class class14 { garbageValue = "724384814" ) static final boolean method204() { - return Client.isMenuOpen; // L: 8857 + return Client.isMenuOpen; } } diff --git a/runescape-client/src/main/java/class140.java b/runescape-client/src/main/java/class140.java index 7eba465a97..fcdc1a580e 100644 --- a/runescape-client/src/main/java/class140.java +++ b/runescape-client/src/main/java/class140.java @@ -27,8 +27,8 @@ public class class140 extends class126 { ) class140(class129 var1) { this.this$0 = var1; - this.field1603 = -1; // L: 213 - } // L: 215 + this.field1603 = -1; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -36,8 +36,8 @@ public class class140 extends class126 { garbageValue = "1416770155" ) void vmethod3029(Buffer var1) { - this.field1603 = var1.readUnsignedShort(); // L: 218 - } // L: 219 + this.field1603 = var1.readUnsignedShort(); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -45,8 +45,8 @@ public class class140 extends class126 { garbageValue = "-1531735008" ) void vmethod3028(ClanSettings var1) { - var1.method2854(this.field1603); // L: 222 - } // L: 223 + var1.method2854(this.field1603); + } @ObfuscatedName("kn") @ObfuscatedSignature( @@ -55,17 +55,17 @@ public class class140 extends class126 { ) @Export("Widget_resetModelFrames") static final void Widget_resetModelFrames(int var0) { - if (class242.loadInterface(var0)) { // L: 12059 - Widget[] var1 = MouseRecorder.Widget_interfaceComponents[var0]; // L: 12060 + if (class242.loadInterface(var0)) { + Widget[] var1 = MouseRecorder.Widget_interfaceComponents[var0]; - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 12061 - Widget var3 = var1[var2]; // L: 12062 - if (var3 != null) { // L: 12063 - var3.modelFrame = 0; // L: 12064 - var3.modelFrameCycle = 0; // L: 12065 + for (int var2 = 0; var2 < var1.length; ++var2) { + Widget var3 = var1[var2]; + if (var3 != null) { + var3.modelFrame = 0; + var3.modelFrameCycle = 0; } } } - } // L: 12067 + } } diff --git a/runescape-client/src/main/java/class141.java b/runescape-client/src/main/java/class141.java index 622dbfc20a..944ff5aeaa 100644 --- a/runescape-client/src/main/java/class141.java +++ b/runescape-client/src/main/java/class141.java @@ -32,10 +32,10 @@ public class class141 extends class126 { ) class141(class129 var1) { this.this$0 = var1; - this.field1610 = -1L; // L: 93 - this.field1607 = null; // L: 94 - this.field1608 = 0; // L: 95 - } // L: 97 + this.field1610 = -1L; + this.field1607 = null; + this.field1608 = 0; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -43,14 +43,14 @@ public class class141 extends class126 { garbageValue = "1416770155" ) void vmethod3029(Buffer var1) { - if (var1.readUnsignedByte() != 255) { // L: 100 - --var1.offset; // L: 101 - this.field1610 = var1.readLong(); // L: 102 + if (var1.readUnsignedByte() != 255) { + --var1.offset; + this.field1610 = var1.readLong(); } - this.field1607 = var1.readStringCp1252NullTerminatedOrNull(); // L: 104 - this.field1608 = var1.readUnsignedShort(); // L: 105 - } // L: 106 + this.field1607 = var1.readStringCp1252NullTerminatedOrNull(); + this.field1608 = var1.readUnsignedShort(); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -58,8 +58,8 @@ public class class141 extends class126 { garbageValue = "-1531735008" ) void vmethod3028(ClanSettings var1) { - var1.method2850(this.field1610, this.field1607, this.field1608); // L: 109 - } // L: 110 + var1.method2850(this.field1610, this.field1607, this.field1608); + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -68,15 +68,15 @@ public class class141 extends class126 { ) @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 + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var1 != null) { + for (int var2 = 0; var2 < var1.ids.length; ++var2) { + var1.ids[var2] = -1; + var1.quantities[var2] = 0; } } - } // L: 69 + } @ObfuscatedName("ap") @ObfuscatedSignature( @@ -85,35 +85,35 @@ public class class141 extends class126 { ) static int method2950(int var0, Script var1, boolean var2) { int var3; - if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { // L: 3579 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 3580 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3581 - int var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3582 - if (!Client.isCameraLocked) { // L: 3583 - Client.camAngleX = var3; // L: 3584 - Client.camAngleY = var4; // L: 3585 + if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + int var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + if (!Client.isCameraLocked) { + Client.camAngleX = var3; + Client.camAngleY = var4; } - return 1; // L: 3587 - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { // L: 3589 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.camAngleX; // L: 3590 - return 1; // L: 3591 - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { // L: 3593 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.camAngleY; // L: 3594 - return 1; // L: 3595 - } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { // L: 3597 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3598 - if (var3 < 0) { // L: 3599 + return 1; + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.camAngleX; + return 1; + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.camAngleY; + return 1; + } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + if (var3 < 0) { var3 = 0; } - Client.camFollowHeight = var3; // L: 3600 - return 1; // L: 3601 - } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { // L: 3603 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.camFollowHeight; // L: 3604 - return 1; // L: 3605 + Client.camFollowHeight = var3; + return 1; + } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.camFollowHeight; + return 1; } else { - return 2; // L: 3607 + return 2; } } @@ -124,11 +124,11 @@ public class class141 extends class126 { ) @Export("Clan_joinChat") static final void Clan_joinChat(String var0) { - if (!var0.equals("")) { // L: 12494 - PacketBufferNode var1 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2857, Client.packetWriter.isaacCipher); // L: 12496 - var1.packetBuffer.writeByte(class116.stringCp1252NullTerminatedByteSize(var0)); // L: 12497 - var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 12498 - Client.packetWriter.addNode(var1); // L: 12499 + if (!var0.equals("")) { + PacketBufferNode var1 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2857, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(class116.stringCp1252NullTerminatedByteSize(var0)); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); } - } // L: 12500 + } } diff --git a/runescape-client/src/main/java/class142.java b/runescape-client/src/main/java/class142.java index 1a9658b4ca..96a9c81199 100644 --- a/runescape-client/src/main/java/class142.java +++ b/runescape-client/src/main/java/class142.java @@ -11,7 +11,7 @@ public abstract class class142 extends Node { static int field1615; class142() { - } // L: 49 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -33,6 +33,6 @@ public abstract class class142 extends Node { garbageValue = "-1686144009" ) static int method2958(int var0) { - return var0 * 3 + 600; // L: 2168 + return var0 * 3 + 600; } } diff --git a/runescape-client/src/main/java/class143.java b/runescape-client/src/main/java/class143.java index c2e7bcb768..ec42a24027 100644 --- a/runescape-client/src/main/java/class143.java +++ b/runescape-client/src/main/java/class143.java @@ -41,10 +41,10 @@ public class class143 { descriptor = "(Lpi;)V" ) public class143(Buffer var1) { - this.field1625 = -1L; // L: 10 - this.field1618 = new IterableNodeDeque(); // L: 11 - this.method2961(var1); // L: 19 - } // L: 20 + this.field1625 = -1L; + this.field1618 = new IterableNodeDeque(); + this.method2961(var1); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -52,32 +52,32 @@ public class class143 { garbageValue = "178883097" ) void method2961(Buffer var1) { - this.field1626 = var1.readLong(); // L: 23 - this.field1625 = var1.readLong(); // L: 24 + this.field1626 = var1.readLong(); + this.field1625 = var1.readLong(); - for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { // L: 25 26 36 + for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { Object var3; - if (var2 == 1) { // L: 28 + if (var2 == 1) { var3 = new class138(this); } else if (var2 == 4) { - var3 = new class149(this); // L: 29 - } else if (var2 == 3) { // L: 30 + var3 = new class149(this); + } else if (var2 == 3) { var3 = new class134(this); - } else if (var2 == 2) { // L: 31 + } else if (var2 == 2) { var3 = new class132(this); } else { - if (var2 != 5) { // L: 32 - throw new RuntimeException(""); // L: 33 + if (var2 != 5) { + throw new RuntimeException(""); } var3 = new class139(this); } - ((class142)var3).vmethod3022(var1); // L: 34 - this.field1618.addFirst((Node)var3); // L: 35 + ((class142)var3).vmethod3022(var1); + this.field1618.addFirst((Node)var3); } - } // L: 38 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -85,16 +85,16 @@ public class class143 { garbageValue = "5" ) public void method2960(ClanChannel var1) { - if (var1.key == this.field1626 && this.field1625 == var1.field1640) { // L: 41 - for (class142 var2 = (class142)this.field1618.last(); var2 != null; var2 = (class142)this.field1618.previous()) { // L: 42 - var2.vmethod3021(var1); // L: 43 + if (var1.key == this.field1626 && this.field1625 == var1.field1640) { + for (class142 var2 = (class142)this.field1618.last(); var2 != null; var2 = (class142)this.field1618.previous()) { + var2.vmethod3021(var1); } - ++var1.field1640; // L: 45 + ++var1.field1640; } else { throw new RuntimeException(""); } - } // L: 46 + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -102,187 +102,187 @@ public class class143 { garbageValue = "100" ) static int method2959(int var0, Script var1, boolean var2) { - int var4 = -1; // L: 614 + int var4 = -1; Widget var3; - if (var0 >= 2000) { // L: 615 - var0 -= 1000; // L: 616 - var4 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 617 - var3 = ChatChannel.getWidget(var4); // L: 618 + if (var0 >= 2000) { + var0 -= 1000; + var4 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + var3 = ChatChannel.getWidget(var4); } else { - var3 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; // L: 620 + var3 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; } - if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { // L: 621 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 622 - var3.scrollX = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 623 - if (var3.scrollX > var3.scrollWidth - var3.width) { // L: 624 + if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3.scrollX = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + if (var3.scrollX > var3.scrollWidth - var3.width) { var3.scrollX = var3.scrollWidth - var3.width; } - if (var3.scrollX < 0) { // L: 625 + if (var3.scrollX < 0) { var3.scrollX = 0; } - var3.scrollY = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 626 - if (var3.scrollY > var3.scrollHeight - var3.height) { // L: 627 + var3.scrollY = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + if (var3.scrollY > var3.scrollHeight - var3.height) { var3.scrollY = var3.scrollHeight - var3.height; } - if (var3.scrollY < 0) { // L: 628 + if (var3.scrollY < 0) { var3.scrollY = 0; } - SecureRandomCallable.invalidateWidget(var3); // L: 629 - return 1; // L: 630 - } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { // L: 632 - var3.color = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 633 - SecureRandomCallable.invalidateWidget(var3); // L: 634 - return 1; // L: 635 - } else if (var0 == ScriptOpcodes.CC_SETFILL) { // L: 637 - var3.fill = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 638 - SecureRandomCallable.invalidateWidget(var3); // L: 639 - return 1; // L: 640 - } else if (var0 == ScriptOpcodes.CC_SETTRANS) { // L: 642 - var3.transparencyTop = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 643 - SecureRandomCallable.invalidateWidget(var3); // L: 644 - return 1; // L: 645 - } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { // L: 647 - var3.lineWid = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 648 - SecureRandomCallable.invalidateWidget(var3); // L: 649 - return 1; // L: 650 - } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { // L: 652 - var3.spriteId2 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 653 - SecureRandomCallable.invalidateWidget(var3); // L: 654 - return 1; // L: 655 - } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { // L: 657 - var3.spriteAngle = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 658 - SecureRandomCallable.invalidateWidget(var3); // L: 659 - return 1; // L: 660 - } else if (var0 == ScriptOpcodes.CC_SETTILING) { // L: 662 - var3.spriteTiling = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 663 - SecureRandomCallable.invalidateWidget(var3); // L: 664 - return 1; // L: 665 - } else if (var0 == ScriptOpcodes.CC_SETMODEL) { // L: 667 - var3.modelType = 1; // L: 668 - var3.modelId = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 669 - SecureRandomCallable.invalidateWidget(var3); // L: 670 - return 1; // L: 671 - } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { // L: 673 - IsaacCipher.Interpreter_intStackSize -= 6; // L: 674 - var3.modelOffsetX = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 675 - var3.modelOffsetY = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 676 - var3.modelAngleX = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 677 - var3.modelAngleY = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3]; // L: 678 - var3.modelAngleZ = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 4]; // L: 679 - var3.modelZoom = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 5]; // L: 680 - SecureRandomCallable.invalidateWidget(var3); // L: 681 - return 1; // L: 682 + SecureRandomCallable.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { + var3.color = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + SecureRandomCallable.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETFILL) { + var3.fill = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + SecureRandomCallable.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTRANS) { + var3.transparencyTop = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + SecureRandomCallable.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { + var3.lineWid = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + SecureRandomCallable.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { + var3.spriteId2 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + SecureRandomCallable.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { + var3.spriteAngle = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + SecureRandomCallable.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTILING) { + var3.spriteTiling = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + SecureRandomCallable.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETMODEL) { + var3.modelType = 1; + var3.modelId = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + SecureRandomCallable.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { + IsaacCipher.Interpreter_intStackSize -= 6; + var3.modelOffsetX = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var3.modelOffsetY = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + var3.modelAngleX = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; + var3.modelAngleY = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3]; + var3.modelAngleZ = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 4]; + var3.modelZoom = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 5]; + SecureRandomCallable.invalidateWidget(var3); + return 1; } else { int var8; - if (var0 == ScriptOpcodes.CC_SETMODELANIM) { // L: 684 - var8 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 685 - if (var8 != var3.sequenceId) { // L: 686 - var3.sequenceId = var8; // L: 687 - var3.modelFrame = 0; // L: 688 - var3.modelFrameCycle = 0; // L: 689 - SecureRandomCallable.invalidateWidget(var3); // L: 690 + if (var0 == ScriptOpcodes.CC_SETMODELANIM) { + var8 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + if (var8 != var3.sequenceId) { + var3.sequenceId = var8; + var3.modelFrame = 0; + var3.modelFrameCycle = 0; + SecureRandomCallable.invalidateWidget(var3); } - return 1; // L: 692 - } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { // L: 694 - var3.modelOrthog = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 695 - SecureRandomCallable.invalidateWidget(var3); // L: 696 - return 1; // L: 697 - } else if (var0 == ScriptOpcodes.CC_SETTEXT) { // L: 699 - String var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 700 - if (!var7.equals(var3.text)) { // L: 701 - var3.text = var7; // L: 702 - SecureRandomCallable.invalidateWidget(var3); // L: 703 + return 1; + } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { + var3.modelOrthog = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + SecureRandomCallable.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTEXT) { + String var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + if (!var7.equals(var3.text)) { + var3.text = var7; + SecureRandomCallable.invalidateWidget(var3); } - return 1; // L: 705 - } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { // L: 707 - var3.fontId = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 708 - SecureRandomCallable.invalidateWidget(var3); // L: 709 - return 1; // L: 710 - } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { // L: 712 - IsaacCipher.Interpreter_intStackSize -= 3; // L: 713 - var3.textXAlignment = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 714 - var3.textYAlignment = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 715 - var3.textLineHeight = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 716 - SecureRandomCallable.invalidateWidget(var3); // L: 717 - return 1; // L: 718 - } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { // L: 720 - var3.textShadowed = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 721 - SecureRandomCallable.invalidateWidget(var3); // L: 722 - return 1; // L: 723 - } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { // L: 725 - var3.outline = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 726 - SecureRandomCallable.invalidateWidget(var3); // L: 727 - return 1; // L: 728 - } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { // L: 730 - var3.spriteShadow = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 731 - SecureRandomCallable.invalidateWidget(var3); // L: 732 - return 1; // L: 733 - } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { // L: 735 - var3.spriteFlipV = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 736 - SecureRandomCallable.invalidateWidget(var3); // L: 737 - return 1; // L: 738 - } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { // L: 740 - var3.spriteFlipH = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 741 - SecureRandomCallable.invalidateWidget(var3); // L: 742 - return 1; // L: 743 - } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { // L: 745 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 746 - var3.scrollWidth = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 747 - var3.scrollHeight = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 748 - SecureRandomCallable.invalidateWidget(var3); // L: 749 - if (var4 != -1 && var3.type == 0) { // L: 750 + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { + var3.fontId = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + SecureRandomCallable.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { + IsaacCipher.Interpreter_intStackSize -= 3; + var3.textXAlignment = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var3.textYAlignment = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + var3.textLineHeight = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; + SecureRandomCallable.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { + var3.textShadowed = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + SecureRandomCallable.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { + var3.outline = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + SecureRandomCallable.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { + var3.spriteShadow = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + SecureRandomCallable.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { + var3.spriteFlipV = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + SecureRandomCallable.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { + var3.spriteFlipH = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + SecureRandomCallable.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3.scrollWidth = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var3.scrollHeight = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + SecureRandomCallable.invalidateWidget(var3); + if (var4 != -1 && var3.type == 0) { class115.revalidateWidgetScroll(MouseRecorder.Widget_interfaceComponents[var4 >> 16], var3, false); } - return 1; // L: 751 - } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { // L: 753 - class288.resumePauseWidget(var3.id, var3.childIndex); // L: 754 - Client.meslayerContinueWidget = var3; // L: 755 - SecureRandomCallable.invalidateWidget(var3); // L: 756 - return 1; // L: 757 - } else if (var0 == 1122) { // L: 759 - var3.spriteId = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 760 - SecureRandomCallable.invalidateWidget(var3); // L: 761 - return 1; // L: 762 - } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { // L: 764 - var3.color2 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 765 - SecureRandomCallable.invalidateWidget(var3); // L: 766 - return 1; // L: 767 - } else if (var0 == 1124) { // L: 769 - var3.transparencyBot = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 770 - SecureRandomCallable.invalidateWidget(var3); // L: 771 - return 1; // L: 772 - } else if (var0 == 1125) { // L: 774 - var8 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 775 - FillMode var6 = (FillMode)class130.findEnumerated(class253.FillMode_values(), var8); // L: 776 - if (var6 != null) { // L: 777 - var3.fillMode = var6; // L: 778 - SecureRandomCallable.invalidateWidget(var3); // L: 779 + return 1; + } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { + class288.resumePauseWidget(var3.id, var3.childIndex); + Client.meslayerContinueWidget = var3; + SecureRandomCallable.invalidateWidget(var3); + return 1; + } else if (var0 == 1122) { + var3.spriteId = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + SecureRandomCallable.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { + var3.color2 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + SecureRandomCallable.invalidateWidget(var3); + return 1; + } else if (var0 == 1124) { + var3.transparencyBot = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + SecureRandomCallable.invalidateWidget(var3); + return 1; + } else if (var0 == 1125) { + var8 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + class429 var6 = (class429)class130.findEnumerated(class253.FillMode_values(), var8); + if (var6 != null) { + var3.fillMode = var6; + SecureRandomCallable.invalidateWidget(var3); } - return 1; // L: 781 + return 1; } else { boolean var5; - if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { // L: 783 - var5 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 784 - var3.field3359 = var5; // L: 785 - return 1; // L: 786 - } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { // L: 788 - var5 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 789 - var3.modelTransparency = var5; // L: 790 - return 1; // L: 791 - } else if (var0 == 1128) { // L: 793 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 794 - return 1; // L: 795 + if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { + var5 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + var3.field3359 = var5; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { + var5 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + var3.modelTransparency = var5; + return 1; + } else if (var0 == 1128) { + IsaacCipher.Interpreter_intStackSize -= 2; + return 1; } else { - return 2; // L: 797 + return 2; } } } @@ -295,39 +295,39 @@ public class class143 { ) @Export("getGcDuration") protected static int getGcDuration() { - int var0 = 0; // L: 569 - if (PacketBufferNode.garbageCollector == null || !PacketBufferNode.garbageCollector.isValid()) { // L: 570 + int var0 = 0; + if (PacketBufferNode.garbageCollector == null || !PacketBufferNode.garbageCollector.isValid()) { try { - Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); // L: 572 + Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); while (var1.hasNext()) { - GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); // L: 573 - if (var2.isValid()) { // L: 575 - PacketBufferNode.garbageCollector = var2; // L: 576 - GameEngine.garbageCollectorLastCheckTimeMs = -1L; // L: 577 - GameEngine.garbageCollectorLastCollectionTime = -1L; // L: 578 + GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); + if (var2.isValid()) { + PacketBufferNode.garbageCollector = var2; + GameEngine.garbageCollectorLastCheckTimeMs = -1L; + GameEngine.garbageCollectorLastCollectionTime = -1L; } } - } catch (Throwable var11) { // L: 583 + } catch (Throwable var11) { } } - if (PacketBufferNode.garbageCollector != null) { // L: 585 - long var9 = Ignored.method6459(); // L: 586 - long var3 = PacketBufferNode.garbageCollector.getCollectionTime(); // L: 587 - if (-1L != GameEngine.garbageCollectorLastCollectionTime) { // L: 588 - long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; // L: 589 - long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; // L: 590 - if (0L != var7) { // L: 591 + if (PacketBufferNode.garbageCollector != null) { + long var9 = Ignored.method6459(); + long var3 = PacketBufferNode.garbageCollector.getCollectionTime(); + if (-1L != GameEngine.garbageCollectorLastCollectionTime) { + long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; + long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; + if (0L != var7) { var0 = (int)(var5 * 100L / var7); } } - GameEngine.garbageCollectorLastCollectionTime = var3; // L: 593 - GameEngine.garbageCollectorLastCheckTimeMs = var9; // L: 594 + GameEngine.garbageCollectorLastCollectionTime = var3; + GameEngine.garbageCollectorLastCheckTimeMs = var9; } - return var0; // L: 596 + return var0; } @ObfuscatedName("gy") @@ -337,6 +337,6 @@ public class class143 { ) @Export("getWindowedMode") static int getWindowedMode() { - return Client.isResizable ? 2 : 1; // L: 4969 + return Client.isResizable ? 2 : 1; } } diff --git a/runescape-client/src/main/java/class144.java b/runescape-client/src/main/java/class144.java index 938d02e57f..17fa94ddd7 100644 --- a/runescape-client/src/main/java/class144.java +++ b/runescape-client/src/main/java/class144.java @@ -25,7 +25,7 @@ public class class144 extends class126 { descriptor = "(Lda;)V" ) class144(class129 var1) { - this.this$0 = var1; // L: 271 + this.this$0 = var1; } @ObfuscatedName("c") @@ -34,9 +34,9 @@ public class class144 extends class126 { garbageValue = "1416770155" ) void vmethod3029(Buffer var1) { - this.field1632 = var1.readInt(); // L: 274 - this.field1628 = var1.readInt(); // L: 275 - } // L: 276 + this.field1632 = var1.readInt(); + this.field1628 = var1.readInt(); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -44,8 +44,8 @@ public class class144 extends class126 { garbageValue = "-1531735008" ) void vmethod3028(ClanSettings var1) { - var1.method2859(this.field1632, this.field1628); // L: 279 - } // L: 280 + var1.method2859(this.field1632, this.field1628); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -56,12 +56,12 @@ public class class144 extends class126 { float var7 = 0.0F; for (int var8 = 0; var8 < var1 + 1; ++var8) { - var7 += Math.abs(var0[var8]); // L: 17 + var7 += Math.abs(var0[var8]); } float var44 = (Math.abs(var2) + Math.abs(var4)) * (float)(var1 + 1) * class112.field1361; if (var7 <= var44) { - return -1; // L: 21 + return -1; } else { float[] var9 = new float[var1 + 1]; @@ -75,16 +75,16 @@ public class class144 extends class126 { } var10 = 0; - if (var1 == 0) { // L: 31 + if (var1 == 0) { return var10; - } else if (var1 == 1) { // L: 34 + } else if (var1 == 1) { var6[0] = -var9[0] / var9[1]; boolean var42 = var3 ? var2 < var44 + var6[0] : var2 < var6[0] - var44; - boolean var43 = var5 ? var4 > var6[0] - var44 : var4 > var44 + var6[0]; // L: 37 - var10 = var42 && var43 ? 1 : 0; // L: 38 + boolean var43 = var5 ? var4 > var6[0] - var44 : var4 > var44 + var6[0]; + var10 = var42 && var43 ? 1 : 0; if (var10 > 0) { if (var3 && var6[0] < var2) { - var6[0] = var2; // L: 41 + var6[0] = var2; } else if (var5 && var6[0] > var4) { var6[0] = var4; } @@ -92,53 +92,53 @@ public class class144 extends class126 { return var10; } else { - class368 var11 = new class368(var9, var1); // L: 50 + class368 var11 = new class368(var9, var1); float[] var12 = new float[var1 + 1]; for (int var13 = 1; var13 <= var1; ++var13) { - var12[var13 - 1] = (float)var13 * var9[var13]; // L: 53 + var12[var13 - 1] = (float)var13 * var9[var13]; } float[] var41 = new float[var1 + 1]; - int var14 = method2971(var12, var1 - 1, var2, false, var4, false, var41); // L: 56 + int var14 = method2971(var12, var1 - 1, var2, false, var4, false, var41); if (var14 == -1) { - return 0; // L: 58 + return 0; } else { boolean var15 = false; - float var17 = 0.0F; // L: 62 - float var18 = 0.0F; // L: 63 + float var17 = 0.0F; + float var18 = 0.0F; float var19 = 0.0F; for (int var20 = 0; var20 <= var14; ++var20) { - if (var10 > var1) { // L: 66 + if (var10 > var1) { return var10; } float var16; - if (var20 == 0) { // L: 67 + if (var20 == 0) { var16 = var2; var18 = MidiPcmStream.method5196(var9, var1, var2); - if (Math.abs(var18) <= var44 && var3) { // L: 70 + if (Math.abs(var18) <= var44 && var3) { var6[var10++] = var2; } } else { var16 = var19; - var18 = var17; // L: 74 + var18 = var17; } if (var20 == var14) { var19 = var4; - var15 = false; // L: 78 + var15 = false; } else { - var19 = var41[var20]; // L: 81 + var19 = var41[var20]; } var17 = MidiPcmStream.method5196(var9, var1, var19); if (var15) { var15 = false; } else if (Math.abs(var17) < var44) { - if (var14 != var20 || var5) { // L: 89 - var6[var10++] = var19; // L: 90 + if (var14 != var20 || var5) { + var6[var10++] = var19; var15 = true; } } else if (var18 < 0.0F && var17 > 0.0F || var18 > 0.0F && var17 < 0.0F) { @@ -157,99 +157,99 @@ public class class144 extends class126 { float var28 = 0.0F; float var29 = 0.0F; float var30 = 0.0F; - float var35 = 0.0F; // L: 118 - boolean var36 = true; // L: 119 + float var35 = 0.0F; + boolean var36 = true; boolean var37 = false; do { - var37 = false; // L: 122 - if (var36) { // L: 123 - var28 = var24; // L: 124 - var35 = var26; // L: 125 - var29 = var25 - var24; // L: 126 - var30 = var29; // L: 127 - var36 = false; // L: 128 + var37 = false; + if (var36) { + var28 = var24; + var35 = var26; + var29 = var25 - var24; + var30 = var29; + var36 = false; } - if (Math.abs(var35) < Math.abs(var27)) { // L: 130 - var24 = var25; // L: 131 - var25 = var28; // L: 132 - var28 = var24; // L: 133 - var26 = var27; // L: 134 - var27 = var35; // L: 135 - var35 = var26; // L: 136 + if (Math.abs(var35) < Math.abs(var27)) { + var24 = var25; + var25 = var28; + var28 = var24; + var26 = var27; + var27 = var35; + var35 = var26; } - float var38 = class112.field1362 * Math.abs(var25) + 0.0F; // L: 138 - float var39 = 0.5F * (var28 - var25); // L: 139 - boolean var40 = Math.abs(var39) > var38 && var27 != 0.0F; // L: 140 - if (var40) { // L: 141 - if (Math.abs(var30) >= var38 && Math.abs(var26) > Math.abs(var27)) { // L: 142 - float var34 = var27 / var26; // L: 147 + float var38 = class112.field1362 * Math.abs(var25) + 0.0F; + float var39 = 0.5F * (var28 - var25); + boolean var40 = Math.abs(var39) > var38 && var27 != 0.0F; + if (var40) { + if (Math.abs(var30) >= var38 && Math.abs(var26) > Math.abs(var27)) { + float var34 = var27 / var26; float var31; float var32; - if (var28 == var24) { // L: 148 - var31 = 2.0F * var39 * var34; // L: 149 - var32 = 1.0F - var34; // L: 150 + if (var28 == var24) { + var31 = 2.0F * var39 * var34; + var32 = 1.0F - var34; } else { - var32 = var26 / var35; // L: 153 - float var33 = var27 / var35; // L: 154 - var31 = ((var32 - var33) * 2.0F * var39 * var32 - (var25 - var24) * (var33 - 1.0F)) * var34; // L: 155 - var32 = (var32 - 1.0F) * (var33 - 1.0F) * (var34 - 1.0F); // L: 156 + var32 = var26 / var35; + float var33 = var27 / var35; + var31 = ((var32 - var33) * 2.0F * var39 * var32 - (var25 - var24) * (var33 - 1.0F)) * var34; + var32 = (var32 - 1.0F) * (var33 - 1.0F) * (var34 - 1.0F); } - if ((double)var31 > 0.0D) { // L: 158 + if ((double)var31 > 0.0D) { var32 = -var32; } else { - var31 = -var31; // L: 159 + var31 = -var31; } - var34 = var30; // L: 160 - var30 = var29; // L: 161 - if (var31 * 2.0F < 3.0F * var39 * var32 - Math.abs(var38 * var32) && var31 < Math.abs(var32 * 0.5F * var34)) { // L: 162 - var29 = var31 / var32; // L: 163 + var34 = var30; + var30 = var29; + if (var31 * 2.0F < 3.0F * var39 * var32 - Math.abs(var38 * var32) && var31 < Math.abs(var32 * 0.5F * var34)) { + var29 = var31 / var32; } else { - var29 = var39; // L: 166 - var30 = var39; // L: 167 + var29 = var39; + var30 = var39; } } else { - var29 = var39; // L: 143 - var30 = var39; // L: 144 + var29 = var39; + var30 = var39; } - var24 = var25; // L: 170 - var26 = var27; // L: 171 - if (Math.abs(var29) > var38) { // L: 172 + var24 = var25; + var26 = var27; + if (Math.abs(var29) > var38) { var25 += var29; - } else if ((double)var39 > 0.0D) { // L: 173 + } else if ((double)var39 > 0.0D) { var25 += var38; } else { - var25 -= var38; // L: 174 + var25 -= var38; } - var27 = MidiPcmStream.method5196(var11.field4212, var11.field4211, var25); // L: 175 - if ((double)(var27 * (var35 / Math.abs(var35))) > 0.0D) { // L: 176 - var36 = true; // L: 177 - var37 = true; // L: 178 + var27 = MidiPcmStream.method5196(var11.field4212, var11.field4211, var25); + if ((double)(var27 * (var35 / Math.abs(var35))) > 0.0D) { + var36 = true; + var37 = true; } else { - var37 = true; // L: 181 + var37 = true; } } } while(var37); - var23 = var25; // L: 185 + var23 = var25; } } - var6[var22] = var23; // L: 187 - if (var10 > 1 && var6[var10 - 2] >= var6[var10 - 1] - var44) { // L: 188 - var6[var10 - 2] = (var6[var10 - 2] + var6[var10 - 1]) * 0.5F; // L: 189 - --var10; // L: 190 + var6[var22] = var23; + if (var10 > 1 && var6[var10 - 2] >= var6[var10 - 1] - var44) { + var6[var10 - 2] = (var6[var10 - 2] + var6[var10 - 1]) * 0.5F; + --var10; } } } - return var10; // L: 196 + return var10; } } } @@ -262,113 +262,113 @@ public class class144 extends class126 { ) @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 + int var3 = var0.length(); + int var4 = var1.length(); + int var5 = 0; + int var6 = 0; + byte var7 = 0; + byte var8 = 0; - while (var5 - var7 < var3 || var6 - var8 < var4) { // L: 18 - if (var5 - var7 >= var3) { // L: 19 + while (var5 - var7 < var3 || var6 - var8 < var4) { + if (var5 - var7 >= var3) { return -1; } - if (var6 - var8 >= var4) { // L: 20 + if (var6 - var8 >= var4) { return 1; } char var9; - if (var7 != 0) { // L: 23 - var9 = (char)var7; // L: 24 - boolean var14 = false; // L: 25 + if (var7 != 0) { + var9 = (char)var7; + boolean var14 = false; } else { - var9 = var0.charAt(var5++); // L: 27 + var9 = var0.charAt(var5++); } char var10; - if (var8 != 0) { // L: 28 - var10 = (char)var8; // L: 29 - boolean var15 = false; // L: 30 + if (var8 != 0) { + var10 = (char)var8; + boolean var15 = false; } else { - var10 = var1.charAt(var6++); // L: 32 + var10 = var1.charAt(var6++); } 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 + if (var9 == 198) { + var11 = 69; + } else if (var9 == 230) { + var11 = 101; + } else if (var9 == 223) { + var11 = 115; + } else if (var9 == 338) { + var11 = 69; + } else if (var9 == 339) { + var11 = 101; } else { - var11 = 0; // L: 55 + var11 = 0; } - var7 = var11; // L: 57 + var7 = var11; 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 + if (var10 == 198) { + var12 = 69; + } else if (var10 == 230) { + var12 = 101; + } else if (var10 == 223) { + var12 = 115; + } else if (var10 == 338) { + var12 = 69; + } else if (var10 == 339) { + var12 = 101; } else { - var12 = 0; // L: 80 + var12 = 0; } - var8 = var12; // L: 82 - var9 = Renderable.standardizeChar(var9, var2); // L: 83 - var10 = Renderable.standardizeChar(var10, var2); // L: 84 - if (var9 != var10 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { // L: 85 - var9 = Character.toLowerCase(var9); // L: 86 - var10 = Character.toLowerCase(var10); // L: 87 - if (var9 != var10) { // L: 88 + var8 = var12; + var9 = Renderable.standardizeChar(var9, var2); + var10 = Renderable.standardizeChar(var10, var2); + if (var9 != var10 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { + var9 = Character.toLowerCase(var9); + var10 = Character.toLowerCase(var10); + if (var9 != var10) { return Interpreter.lowercaseChar(var9, var2) - Interpreter.lowercaseChar(var10, var2); } } } - int var16 = Math.min(var3, var4); // L: 91 + int var16 = Math.min(var3, var4); 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 + for (var17 = 0; var17 < var16; ++var17) { + if (var2 == Language.Language_FR) { + var5 = var3 - 1 - var17; + var6 = var4 - 1 - var17; } else { var6 = var17; var5 = var17; } char var18 = var0.charAt(var5); - var20 = var1.charAt(var6); // L: 99 + var20 = var1.charAt(var6); if (var18 != var20 && Character.toUpperCase(var18) != Character.toUpperCase(var20)) { var18 = Character.toLowerCase(var18); var20 = Character.toLowerCase(var20); if (var18 != var20) { - return Interpreter.lowercaseChar(var18, var2) - Interpreter.lowercaseChar(var20, var2); // L: 103 + return Interpreter.lowercaseChar(var18, var2) - Interpreter.lowercaseChar(var20, var2); } } } var17 = var3 - var4; - if (var17 != 0) { // L: 107 + if (var17 != 0) { return var17; } else { for (int var19 = 0; var19 < var16; ++var19) { var20 = var0.charAt(var19); char var13 = var1.charAt(var19); - if (var13 != var20) { // L: 111 + if (var13 != var20) { return Interpreter.lowercaseChar(var20, var2) - Interpreter.lowercaseChar(var13, var2); } } @@ -384,24 +384,24 @@ public class class144 extends class126 { ) @Export("ByteArrayPool_release") public static synchronized void ByteArrayPool_release(byte[] var0) { - if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < ByteArrayPool.field4023) { // L: 96 - ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; // L: 97 - } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < ByteArrayPool.field4028) { // L: 100 - ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; // L: 101 - } else if (var0.length == 10000 && ByteArrayPool.ByteArrayPool_largeCount < ByteArrayPool.field4021) { // L: 104 - ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; // L: 105 - } else if (var0.length == 30000 && ByteArrayPool.field4026 < ByteArrayPool.field4030) { // L: 108 - ByteArrayPool.field4034[++ByteArrayPool.field4026 - 1] = var0; // L: 109 + if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < ByteArrayPool.field4023) { + ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; + } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < ByteArrayPool.field4028) { + ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; + } else if (var0.length == 10000 && ByteArrayPool.ByteArrayPool_largeCount < ByteArrayPool.field4021) { + ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; + } else if (var0.length == 30000 && ByteArrayPool.field4026 < ByteArrayPool.field4030) { + ByteArrayPool.field4034[++ByteArrayPool.field4026 - 1] = var0; } else { - if (World.ByteArrayPool_arrays != null) { // L: 112 - for (int var1 = 0; var1 < SoundCache.ByteArrayPool_alternativeSizes.length; ++var1) { // L: 113 - if (var0.length == SoundCache.ByteArrayPool_alternativeSizes[var1] && ApproximateRouteStrategy.ByteArrayPool_altSizeArrayCounts[var1] < World.ByteArrayPool_arrays[var1].length) { // L: 114 - World.ByteArrayPool_arrays[var1][ApproximateRouteStrategy.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; // L: 115 - return; // L: 116 + if (World.ByteArrayPool_arrays != null) { + for (int var1 = 0; var1 < SoundCache.ByteArrayPool_alternativeSizes.length; ++var1) { + if (var0.length == SoundCache.ByteArrayPool_alternativeSizes[var1] && ApproximateRouteStrategy.ByteArrayPool_altSizeArrayCounts[var1] < World.ByteArrayPool_arrays[var1].length) { + World.ByteArrayPool_arrays[var1][ApproximateRouteStrategy.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; + return; } } } } - } // L: 98 102 106 110 120 + } } diff --git a/runescape-client/src/main/java/class145.java b/runescape-client/src/main/java/class145.java index e2e010c4b2..482567294b 100644 --- a/runescape-client/src/main/java/class145.java +++ b/runescape-client/src/main/java/class145.java @@ -30,7 +30,7 @@ public class class145 extends class126 { garbageValue = "1416770155" ) void vmethod3029(Buffer var1) { - this.field1634 = var1.readUnsignedShort(); // L: 149 + this.field1634 = var1.readUnsignedShort(); } @ObfuscatedName("b") @@ -39,8 +39,8 @@ public class class145 extends class126 { garbageValue = "-1531735008" ) void vmethod3028(ClanSettings var1) { - var1.method2863(this.field1634); // L: 153 - } // L: 154 + var1.method2863(this.field1634); + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -49,54 +49,54 @@ public class class145 extends class126 { ) @Export("newScript") static Script newScript(byte[] var0) { - 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 + Script var1 = new Script(); + Buffer var2 = new Buffer(var0); + var2.offset = var2.array.length - 2; + int var3 = var2.readUnsignedShort(); + int var4 = var2.array.length - 2 - var3 - 12; + var2.offset = var4; + int var5 = var2.readInt(); + var1.localIntCount = var2.readUnsignedShort(); + var1.localStringCount = var2.readUnsignedShort(); + var1.intArgumentCount = var2.readUnsignedShort(); + var1.stringArgumentCount = var2.readUnsignedShort(); + int var6 = var2.readUnsignedByte(); int var7; int var8; - if (var6 > 0) { // L: 124 - var1.switches = var1.newIterableNodeHashTable(var6); // L: 125 + if (var6 > 0) { + var1.switches = var1.newIterableNodeHashTable(var6); - for (var7 = 0; var7 < var6; ++var7) { // L: 126 - var8 = var2.readUnsignedShort(); // L: 127 - IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? SpotAnimationDefinition.method3362(var8) : 1); // L: 128 - var1.switches[var7] = var9; // L: 129 + for (var7 = 0; var7 < var6; ++var7) { + var8 = var2.readUnsignedShort(); + IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? SpotAnimationDefinition.method3362(var8) : 1); + var1.switches[var7] = var9; - 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 + while (var8-- > 0) { + int var10 = var2.readInt(); + int var11 = var2.readInt(); + var9.put(new IntegerNode(var11), (long)var10); } } } - var2.offset = 0; // L: 137 - var1.field937 = 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 + var2.offset = 0; + var1.field937 = var2.readStringCp1252NullTerminatedOrNull(); + var1.opcodes = new int[var5]; + var1.intOperands = new int[var5]; + var1.stringOperands = new String[var5]; - for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { // L: 142 143 148 - var8 = var2.readUnsignedShort(); // L: 144 - if (var8 == 3) { // L: 145 + for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { + var8 = var2.readUnsignedShort(); + if (var8 == 3) { var1.stringOperands[var7] = var2.readStringCp1252NullTerminated(); } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) { - var1.intOperands[var7] = var2.readInt(); // L: 146 + var1.intOperands[var7] = var2.readInt(); } else { - var1.intOperands[var7] = var2.readUnsignedByte(); // L: 147 + var1.intOperands[var7] = var2.readUnsignedByte(); } } - return var1; // L: 150 + return var1; } @ObfuscatedName("gn") @@ -105,72 +105,72 @@ public class class145 extends class126 { garbageValue = "578120171" ) static final void method2985() { - if (class20.Client_plane != Client.field570) { // L: 4395 - Client.field570 = class20.Client_plane; // L: 4396 - int var0 = class20.Client_plane; // L: 4397 - int[] var1 = class29.sceneMinimapSprite.pixels; // L: 4399 - int var2 = var1.length; // L: 4400 + if (class20.Client_plane != Client.field570) { + Client.field570 = class20.Client_plane; + int var0 = class20.Client_plane; + int[] var1 = class29.sceneMinimapSprite.pixels; + int var2 = var1.length; int var3; - for (var3 = 0; var3 < var2; ++var3) { // L: 4401 + for (var3 = 0; var3 < var2; ++var3) { var1[var3] = 0; } int var4; int var5; - for (var3 = 1; var3 < 103; ++var3) { // L: 4402 - var4 = (103 - var3) * 2048 + 24628; // L: 4403 + for (var3 = 1; var3 < 103; ++var3) { + var4 = (103 - var3) * 2048 + 24628; - for (var5 = 1; var5 < 103; ++var5) { // L: 4404 - if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { // L: 4405 + for (var5 = 1; var5 < 103; ++var5) { + if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { class7.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3); } - if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { // L: 4406 + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { class7.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3); } - var4 += 4; // L: 4407 + var4 += 4; } } - var3 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); // L: 4410 - var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; // L: 4411 - class29.sceneMinimapSprite.setRaster(); // L: 4412 + var3 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); + var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; + class29.sceneMinimapSprite.setRaster(); int var6; - for (var5 = 1; var5 < 103; ++var5) { // L: 4413 - for (var6 = 1; var6 < 103; ++var6) { // L: 4414 - if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) { // L: 4415 + for (var5 = 1; var5 < 103; ++var5) { + for (var6 = 1; var6 < 103; ++var6) { + if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) { class33.drawObject(var0, var6, var5, var3, var4); } - if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { // L: 4416 + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { class33.drawObject(var0 + 1, var6, var5, var3, var4); } } } - Client.mapIconCount = 0; // L: 4419 + Client.mapIconCount = 0; - for (var5 = 0; var5 < 104; ++var5) { // L: 4420 - for (var6 = 0; var6 < 104; ++var6) { // L: 4421 - long var7 = class7.scene.getFloorDecorationTag(class20.Client_plane, var5, var6); // L: 4422 - if (var7 != 0L) { // L: 4423 - int var9 = PacketWriter.Entity_unpackID(var7); // L: 4424 - int var10 = class148.getObjectDefinition(var9).mapIconId; // L: 4425 - if (var10 >= 0 && class78.WorldMapElement_get(var10).field1759) { // L: 4426 4427 - Client.mapIcons[Client.mapIconCount] = class78.WorldMapElement_get(var10).getSpriteBool(false); // L: 4430 - Client.mapIconXs[Client.mapIconCount] = var5; // L: 4431 - Client.mapIconYs[Client.mapIconCount] = var6; // L: 4432 - ++Client.mapIconCount; // L: 4433 + for (var5 = 0; var5 < 104; ++var5) { + for (var6 = 0; var6 < 104; ++var6) { + long var7 = class7.scene.getFloorDecorationTag(class20.Client_plane, var5, var6); + if (var7 != 0L) { + int var9 = PacketWriter.Entity_unpackID(var7); + int var10 = class148.getObjectDefinition(var9).mapIconId; + if (var10 >= 0 && class78.WorldMapElement_get(var10).field1759) { + Client.mapIcons[Client.mapIconCount] = class78.WorldMapElement_get(var10).getSpriteBool(false); + Client.mapIconXs[Client.mapIconCount] = var5; + Client.mapIconYs[Client.mapIconCount] = var6; + ++Client.mapIconCount; } } } } - class19.rasterProvider.apply(); // L: 4438 + class19.rasterProvider.apply(); } - } // L: 4441 + } } diff --git a/runescape-client/src/main/java/class147.java b/runescape-client/src/main/java/class147.java index 831b0bf506..0b1866578b 100644 --- a/runescape-client/src/main/java/class147.java +++ b/runescape-client/src/main/java/class147.java @@ -9,12 +9,12 @@ public class class147 { garbageValue = "-1711899825" ) public static boolean method3009(AbstractArchive var0, int var1, int var2) { - byte[] var3 = var0.takeFile(var1, var2); // L: 88 - if (var3 == null) { // L: 89 + byte[] var3 = var0.takeFile(var1, var2); + if (var3 == null) { return false; } else { - WorldMapSection0.SpriteBuffer_decode(var3); // L: 90 - return true; // L: 91 + WorldMapSection0.SpriteBuffer_decode(var3); + return true; } } } diff --git a/runescape-client/src/main/java/class148.java b/runescape-client/src/main/java/class148.java index 8466db67a8..e87a3c9535 100644 --- a/runescape-client/src/main/java/class148.java +++ b/runescape-client/src/main/java/class148.java @@ -41,9 +41,9 @@ public class class148 extends class126 { ) class148(class129 var1) { this.this$0 = var1; - this.field1658 = -1L; // L: 194 - this.field1652 = null; // L: 195 - } // L: 197 + this.field1658 = -1L; + this.field1652 = null; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -51,13 +51,13 @@ public class class148 extends class126 { garbageValue = "1416770155" ) void vmethod3029(Buffer var1) { - if (var1.readUnsignedByte() != 255) { // L: 200 - --var1.offset; // L: 201 - this.field1658 = var1.readLong(); // L: 202 + if (var1.readUnsignedByte() != 255) { + --var1.offset; + this.field1658 = var1.readLong(); } - this.field1652 = var1.readStringCp1252NullTerminatedOrNull(); // L: 204 - } // L: 205 + this.field1652 = var1.readStringCp1252NullTerminatedOrNull(); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -65,8 +65,8 @@ public class class148 extends class126 { garbageValue = "-1531735008" ) void vmethod3028(ClanSettings var1) { - var1.method2853(this.field1658, this.field1652); // L: 208 - } // L: 209 + var1.method2853(this.field1658, this.field1652); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -75,25 +75,25 @@ public class class148 extends class126 { ) @Export("getObjectDefinition") public static ObjectComposition getObjectDefinition(int var0) { - ObjectComposition var1 = (ObjectComposition)ObjectComposition.ObjectDefinition_cached.get((long)var0); // L: 79 - if (var1 != null) { // L: 80 + ObjectComposition var1 = (ObjectComposition)ObjectComposition.ObjectDefinition_cached.get((long)var0); + if (var1 != null) { return var1; } else { - 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 + byte[] var2 = ObjectComposition.ObjectDefinition_archive.takeFile(6, var0); + var1 = new ObjectComposition(); + var1.id = var0; + if (var2 != null) { var1.decode(new Buffer(var2)); } - var1.postDecode(); // L: 85 - if (var1.isSolid) { // L: 86 - var1.interactType = 0; // L: 87 - var1.boolean1 = false; // L: 88 + var1.postDecode(); + if (var1.isSolid) { + var1.interactType = 0; + var1.boolean1 = false; } - ObjectComposition.ObjectDefinition_cached.put(var1, (long)var0); // L: 90 - return var1; // L: 91 + ObjectComposition.ObjectDefinition_cached.put(var1, (long)var0); + return var1; } } @@ -103,32 +103,32 @@ public class class148 extends class126 { garbageValue = "498482718" ) static int method3019(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; // L: 1200 - if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { // L: 1201 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class404.Widget_unpackTargetMask(class363.getWidgetFlags(var3)); // L: 1202 - return 1; // L: 1203 - } else if (var0 != ScriptOpcodes.CC_GETOP) { // L: 1205 - if (var0 == ScriptOpcodes.CC_GETOPBASE) { // L: 1212 - if (var3.dataText == null) { // L: 1213 + Widget var3 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; + if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class404.Widget_unpackTargetMask(class363.getWidgetFlags(var3)); + return 1; + } else if (var0 != ScriptOpcodes.CC_GETOP) { + if (var0 == ScriptOpcodes.CC_GETOPBASE) { + if (var3.dataText == null) { Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; } else { - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1214 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.dataText; } - return 1; // L: 1215 + return 1; } else { - return 2; // L: 1217 + return 2; } } else { - int var4 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1206 - --var4; // L: 1207 - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1208 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1209 + int var4 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + --var4; + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.actions[var4]; } else { Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; } - return 1; // L: 1210 + return 1; } } @@ -139,15 +139,15 @@ public class class148 extends class126 { ) @Export("playPcmPlayers") static final void playPcmPlayers() { - if (PacketWriter.pcmPlayer1 != null) { // L: 4298 + if (PacketWriter.pcmPlayer1 != null) { PacketWriter.pcmPlayer1.run(); } - if (JagexCache.pcmPlayer0 != null) { // L: 4299 + if (JagexCache.pcmPlayer0 != null) { JagexCache.pcmPlayer0.run(); } - } // L: 4300 + } @ObfuscatedName("hd") @ObfuscatedSignature( @@ -156,612 +156,612 @@ public class class148 extends class126 { ) @Export("drawActor2d") static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { - if (var0 != null && var0.isVisible()) { // L: 5592 - if (var0 instanceof NPC) { // L: 5593 - NPCComposition var6 = ((NPC)var0).definition; // L: 5594 - if (var6.transforms != null) { // L: 5595 + if (var0 != null && var0.isVisible()) { + if (var0 instanceof NPC) { + NPCComposition var6 = ((NPC)var0).definition; + if (var6.transforms != null) { var6 = var6.transform(); } - if (var6 == null) { // L: 5596 + if (var6 == null) { return; } } - int var75 = Players.Players_count; // L: 5598 - int[] var7 = Players.Players_indices; // L: 5599 - byte var8 = 0; // L: 5600 + int var75 = Players.Players_count; + int[] var7 = Players.Players_indices; + byte var8 = 0; Player var10; - if (var1 < var75 && var0.playerCycle == Client.cycle) { // L: 5601 - var10 = (Player)var0; // L: 5603 + if (var1 < var75 && var0.playerCycle == Client.cycle) { + var10 = (Player)var0; boolean var9; - if (Client.drawPlayerNames == 0) { // L: 5605 - var9 = false; // L: 5606 - } else if (var10 == class340.localPlayer) { // L: 5609 - var9 = class329.method6133(); // L: 5628 + if (Client.drawPlayerNames == 0) { + var9 = false; + } else if (var10 == class340.localPlayer) { + var9 = class329.method6133(); } else { - boolean var11 = MilliClock.method3121(); // L: 5610 + boolean var11 = MilliClock.method3121(); boolean var12; - if (!var11) { // L: 5611 - var12 = (Client.drawPlayerNames & 1) != 0; // L: 5614 - var11 = var12 && var10.isFriend(); // L: 5616 + if (!var11) { + var12 = (Client.drawPlayerNames & 1) != 0; + var11 = var12 && var10.isFriend(); } - var12 = var11; // L: 5618 - if (!var11) { // L: 5619 - boolean var13 = (Client.drawPlayerNames & 2) != 0; // L: 5622 - var12 = var13 && var10.isFriendsChatMember(); // L: 5624 + var12 = var11; + if (!var11) { + boolean var13 = (Client.drawPlayerNames & 2) != 0; + var12 = var13 && var10.isFriendsChatMember(); } - var9 = var12; // L: 5626 + var9 = var12; } - if (var9) { // L: 5630 - Player var76 = (Player)var0; // L: 5631 - if (var1 < var75) { // L: 5632 - VarpDefinition.method3167(var0, var0.defaultHeight + 15); // L: 5633 - AbstractFont var77 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); // L: 5634 - byte var91 = 9; // L: 5635 - var77.drawCentered(var76.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var91, 16777215, 0); // L: 5636 - var8 = 18; // L: 5637 + if (var9) { + Player var76 = (Player)var0; + if (var1 < var75) { + VarpDefinition.method3167(var0, var0.defaultHeight + 15); + AbstractFont var77 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); + byte var91 = 9; + var77.drawCentered(var76.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var91, 16777215, 0); + var8 = 18; } } } - int var87 = -2; // L: 5641 + int var87 = -2; int var15; int var22; int var23; - if (!var0.healthBars.method5915()) { // L: 5642 - VarpDefinition.method3167(var0, var0.defaultHeight + 15); // L: 5643 + if (!var0.healthBars.method5915()) { + VarpDefinition.method3167(var0, var0.defaultHeight + 15); - for (HealthBar var88 = (HealthBar)var0.healthBars.last(); var88 != null; var88 = (HealthBar)var0.healthBars.previous()) { // L: 5644 - HealthBarUpdate var95 = var88.get(Client.cycle); // L: 5645 - if (var95 == null) { // L: 5646 - if (var88.isEmpty()) { // L: 5704 + for (HealthBar var88 = (HealthBar)var0.healthBars.last(); var88 != null; var88 = (HealthBar)var0.healthBars.previous()) { + HealthBarUpdate var95 = var88.get(Client.cycle); + if (var95 == null) { + if (var88.isEmpty()) { var88.remove(); } } else { - HealthBarDefinition var96 = var88.definition; // L: 5647 - SpritePixels var79 = var96.getBackSprite(); // L: 5648 - SpritePixels var81 = var96.getFrontSprite(); // L: 5649 - int var82 = 0; // L: 5651 - if (var79 != null && var81 != null) { // L: 5652 - if (var96.widthPadding * 2 < var81.subWidth) { // L: 5653 + HealthBarDefinition var96 = var88.definition; + SpritePixels var79 = var96.getFrontSprite(); + SpritePixels var81 = var96.method3239(); + int var82 = 0; + if (var79 != null && var81 != null) { + if (var96.widthPadding * 2 < var81.subWidth) { var82 = var96.widthPadding; } - var15 = var81.subWidth - var82 * 2; // L: 5654 + var15 = var81.subWidth - var82 * 2; } else { - var15 = var96.width; // L: 5656 + var15 = var96.width; } - int var17 = 255; // L: 5657 - boolean var83 = true; // L: 5658 - int var84 = Client.cycle - var95.cycle; // L: 5659 - int var85 = var15 * var95.health2 / var96.width; // L: 5660 + int var17 = 255; + boolean var83 = true; + int var84 = Client.cycle - var95.cycle; + int var85 = var15 * var95.health2 / var96.width; int var86; int var98; - if (var95.cycleOffset > var84) { // L: 5661 - var86 = var96.field1798 == 0 ? 0 : var96.field1798 * (var84 / var96.field1798); // L: 5662 - var22 = var15 * var95.health / var96.width; // L: 5663 - var98 = var86 * (var85 - var22) / var95.cycleOffset + var22; // L: 5664 + if (var95.cycleOffset > var84) { + var86 = var96.field1798 == 0 ? 0 : var96.field1798 * (var84 / var96.field1798); + var22 = var15 * var95.health / var96.width; + var98 = var86 * (var85 - var22) / var95.cycleOffset + var22; } else { - var98 = var85; // L: 5667 - var86 = var95.cycleOffset + var96.int5 - var84; // L: 5668 - if (var96.int3 >= 0) { // L: 5669 + var98 = var85; + var86 = var95.cycleOffset + var96.int5 - var84; + if (var96.int3 >= 0) { var17 = (var86 << 8) / (var96.int5 - var96.int3); } } - if (var95.health2 > 0 && var98 < 1) { // L: 5671 + if (var95.health2 > 0 && var98 < 1) { var98 = 1; } - if (var79 != null && var81 != null) { // L: 5672 - if (var98 == var15) { // L: 5673 + if (var79 != null && var81 != null) { + if (var98 == var15) { var98 += var82 * 2; } else { - var98 += var82; // L: 5674 + var98 += var82; } - var86 = var79.subHeight; // L: 5675 - var87 += var86; // L: 5676 - var22 = var2 + Client.viewportTempX - (var15 >> 1); // L: 5677 - var23 = var3 + Client.viewportTempY - var87; // L: 5678 - var22 -= var82; // L: 5679 - if (var17 >= 0 && var17 < 255) { // L: 5680 - var79.drawTransAt(var22, var23, var17); // L: 5681 - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var98 + var22, var23 + var86); // L: 5682 - var81.drawTransAt(var22, var23, var17); // L: 5683 + var86 = var79.subHeight; + var87 += var86; + var22 = var2 + Client.viewportTempX - (var15 >> 1); + var23 = var3 + Client.viewportTempY - var87; + var22 -= var82; + if (var17 >= 0 && var17 < 255) { + var79.drawTransAt(var22, var23, var17); + Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var98 + var22, var23 + var86); + var81.drawTransAt(var22, var23, var17); } else { - var79.drawTransBgAt(var22, var23); // L: 5686 - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var98, var86 + var23); // L: 5687 - var81.drawTransBgAt(var22, var23); // L: 5688 + var79.drawTransBgAt(var22, var23); + Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var98, var86 + var23); + var81.drawTransBgAt(var22, var23); } - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); // L: 5690 - var87 += 2; // L: 5691 + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); + var87 += 2; } else { - var87 += 5; // L: 5694 - if (Client.viewportTempX > -1) { // L: 5695 - var86 = var2 + Client.viewportTempX - (var15 >> 1); // L: 5696 - var22 = var3 + Client.viewportTempY - var87; // L: 5697 - Rasterizer2D.Rasterizer2D_fillRectangle(var86, var22, var98, 5, 65280); // L: 5698 - Rasterizer2D.Rasterizer2D_fillRectangle(var98 + var86, var22, var15 - var98, 5, 16711680); // L: 5699 + var87 += 5; + if (Client.viewportTempX > -1) { + var86 = var2 + Client.viewportTempX - (var15 >> 1); + var22 = var3 + Client.viewportTempY - var87; + Rasterizer2D.Rasterizer2D_fillRectangle(var86, var22, var98, 5, 65280); + Rasterizer2D.Rasterizer2D_fillRectangle(var98 + var86, var22, var15 - var98, 5, 16711680); } - var87 += 2; // L: 5701 + var87 += 2; } } } } - if (var87 == -2) { // L: 5707 + if (var87 == -2) { var87 += 7; } - var87 += var8; // L: 5708 - if (var1 < var75) { // L: 5709 - var10 = (Player)var0; // L: 5710 - if (var10.isHidden) { // L: 5711 + var87 += var8; + if (var1 < var75) { + var10 = (Player)var0; + if (var10.isHidden) { return; } - if (var10.headIconPk != -1 || var10.headIconPrayer != -1) { // L: 5712 - VarpDefinition.method3167(var0, var0.defaultHeight + 15); // L: 5713 - if (Client.viewportTempX > -1) { // L: 5714 - if (var10.headIconPk != -1) { // L: 5715 - var87 += 25; // L: 5716 - class286.headIconPkSprites[var10.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); // L: 5717 + if (var10.headIconPk != -1 || var10.headIconPrayer != -1) { + VarpDefinition.method3167(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + if (var10.headIconPk != -1) { + var87 += 25; + class286.headIconPkSprites[var10.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); } - if (var10.headIconPrayer != -1) { // L: 5719 - var87 += 25; // L: 5720 - PlayerComposition.headIconPrayerSprites[var10.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); // L: 5721 + if (var10.headIconPrayer != -1) { + var87 += 25; + PlayerComposition.headIconPrayerSprites[var10.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); } } } - if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { // L: 5725 - VarpDefinition.method3167(var0, var0.defaultHeight + 15); // L: 5726 - if (Client.viewportTempX > -1) { // L: 5727 - var87 += class260.headIconHintSprites[1].subHeight; // L: 5728 - class260.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); // L: 5729 + if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { + VarpDefinition.method3167(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + var87 += class260.headIconHintSprites[1].subHeight; + class260.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); } } } else { - NPCComposition var89 = ((NPC)var0).definition; // L: 5734 - if (var89.transforms != null) { // L: 5735 + NPCComposition var89 = ((NPC)var0).definition; + if (var89.transforms != null) { var89 = var89.transform(); } - if (var89.headIconPrayer >= 0 && var89.headIconPrayer < PlayerComposition.headIconPrayerSprites.length) { // L: 5736 - VarpDefinition.method3167(var0, var0.defaultHeight + 15); // L: 5737 - if (Client.viewportTempX > -1) { // L: 5738 - PlayerComposition.headIconPrayerSprites[var89.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); // L: 5739 + if (var89.headIconPrayer >= 0 && var89.headIconPrayer < PlayerComposition.headIconPrayerSprites.length) { + VarpDefinition.method3167(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + PlayerComposition.headIconPrayerSprites[var89.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); } } - if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { // L: 5742 - VarpDefinition.method3167(var0, var0.defaultHeight + 15); // L: 5743 - if (Client.viewportTempX > -1) { // L: 5744 + if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { + VarpDefinition.method3167(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { class260.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); } } } - if (var0.overheadText != null && (var1 >= var75 || !var0.field1114 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { // L: 5747 5748 - VarpDefinition.method3167(var0, var0.defaultHeight); // L: 5749 - if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { // L: 5750 - Client.overheadTextXOffsets[Client.overheadTextCount] = class136.fontBold12.stringWidth(var0.overheadText) / 2; // L: 5751 - Client.overheadTextAscents[Client.overheadTextCount] = class136.fontBold12.ascent; // L: 5752 - Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; // L: 5753 - Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; // L: 5754 - Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; // L: 5755 - Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; // L: 5756 - Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; // L: 5757 - Client.overheadText[Client.overheadTextCount] = var0.overheadText; // L: 5758 - ++Client.overheadTextCount; // L: 5759 + if (var0.overheadText != null && (var1 >= var75 || !var0.field1114 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { + VarpDefinition.method3167(var0, var0.defaultHeight); + if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { + Client.overheadTextXOffsets[Client.overheadTextCount] = class136.fontBold12.stringWidth(var0.overheadText) / 2; + Client.overheadTextAscents[Client.overheadTextCount] = class136.fontBold12.ascent; + Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; + Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; + Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; + Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; + Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; + Client.overheadText[Client.overheadTextCount] = var0.overheadText; + ++Client.overheadTextCount; } } - for (int var78 = 0; var78 < 4; ++var78) { // L: 5763 - int var90 = var0.hitSplatCycles[var78]; // L: 5764 - int var92 = var0.hitSplatTypes[var78]; // L: 5765 - HitSplatDefinition var97 = null; // L: 5766 - int var14 = 0; // L: 5767 - if (var92 >= 0) { // L: 5768 - if (var90 <= Client.cycle) { // L: 5769 + for (int var78 = 0; var78 < 4; ++var78) { + int var90 = var0.hitSplatCycles[var78]; + int var92 = var0.hitSplatTypes[var78]; + HitSplatDefinition var97 = null; + int var14 = 0; + if (var92 >= 0) { + if (var90 <= Client.cycle) { continue; } - var97 = UserComparator6.method2554(var0.hitSplatTypes[var78]); // L: 5770 - var14 = var97.field1934; // L: 5771 - if (var97 != null && var97.transforms != null) { // L: 5772 - var97 = var97.transform(); // L: 5773 - if (var97 == null) { // L: 5774 - var0.hitSplatCycles[var78] = -1; // L: 5775 - continue; // L: 5776 + var97 = UserComparator6.method2554(var0.hitSplatTypes[var78]); + var14 = var97.field1934; + if (var97 != null && var97.transforms != null) { + var97 = var97.transform(); + if (var97 == null) { + var0.hitSplatCycles[var78] = -1; + continue; } } - } else if (var90 < 0) { // L: 5780 + } else if (var90 < 0) { continue; } - var15 = var0.hitSplatTypes2[var78]; // L: 5781 - HitSplatDefinition var16 = null; // L: 5782 - if (var15 >= 0) { // L: 5783 - var16 = UserComparator6.method2554(var15); // L: 5784 - if (var16 != null && var16.transforms != null) { // L: 5785 + var15 = var0.hitSplatTypes2[var78]; + HitSplatDefinition var16 = null; + if (var15 >= 0) { + var16 = UserComparator6.method2554(var15); + if (var16 != null && var16.transforms != null) { var16 = var16.transform(); } } - if (var90 - var14 <= Client.cycle) { // L: 5787 - if (var97 == null) { // L: 5788 - var0.hitSplatCycles[var78] = -1; // L: 5789 + if (var90 - var14 <= Client.cycle) { + if (var97 == null) { + var0.hitSplatCycles[var78] = -1; } else { - VarpDefinition.method3167(var0, var0.defaultHeight / 2); // L: 5792 - if (Client.viewportTempX > -1) { // L: 5793 - boolean var93 = true; // L: 5794 - if (var78 == 1) { // L: 5795 - Client.viewportTempY -= 20; // L: 5796 + VarpDefinition.method3167(var0, var0.defaultHeight / 2); + if (Client.viewportTempX > -1) { + boolean var93 = true; + if (var78 == 1) { + Client.viewportTempY -= 20; } - if (var78 == 2) { // L: 5798 - Client.viewportTempX -= 15; // L: 5799 - Client.viewportTempY -= 10; // L: 5800 + if (var78 == 2) { + Client.viewportTempX -= 15; + Client.viewportTempY -= 10; } - if (var78 == 3) { // L: 5802 - Client.viewportTempX += 15; // L: 5803 - Client.viewportTempY -= 10; // L: 5804 + if (var78 == 3) { + Client.viewportTempX += 15; + Client.viewportTempY -= 10; } - SpritePixels var18 = null; // L: 5806 - SpritePixels var19 = null; // L: 5807 - SpritePixels var20 = null; // L: 5808 - SpritePixels var21 = null; // L: 5809 - var22 = 0; // L: 5810 - var23 = 0; // L: 5811 - int var24 = 0; // L: 5812 - int var25 = 0; // L: 5813 - int var26 = 0; // L: 5814 - int var27 = 0; // L: 5815 - int var28 = 0; // L: 5816 - int var29 = 0; // L: 5817 - SpritePixels var30 = null; // L: 5818 - SpritePixels var31 = null; // L: 5819 - SpritePixels var32 = null; // L: 5820 - SpritePixels var33 = null; // L: 5821 - int var34 = 0; // L: 5822 - int var35 = 0; // L: 5823 - int var36 = 0; // L: 5824 - int var37 = 0; // L: 5825 - int var38 = 0; // L: 5826 - int var39 = 0; // L: 5827 - int var40 = 0; // L: 5828 - int var41 = 0; // L: 5829 - int var42 = 0; // L: 5830 - var18 = var97.method3451(); // L: 5831 + SpritePixels var18 = null; + SpritePixels var19 = null; + SpritePixels var20 = null; + SpritePixels var21 = null; + var22 = 0; + var23 = 0; + int var24 = 0; + int var25 = 0; + int var26 = 0; + int var27 = 0; + int var28 = 0; + int var29 = 0; + SpritePixels var30 = null; + SpritePixels var31 = null; + SpritePixels var32 = null; + SpritePixels var33 = null; + int var34 = 0; + int var35 = 0; + int var36 = 0; + int var37 = 0; + int var38 = 0; + int var39 = 0; + int var40 = 0; + int var41 = 0; + int var42 = 0; + var18 = var97.method3451(); int var43; - if (var18 != null) { // L: 5832 - var22 = var18.subWidth; // L: 5833 - var43 = var18.subHeight; // L: 5834 - if (var43 > var42) { // L: 5835 + if (var18 != null) { + var22 = var18.subWidth; + var43 = var18.subHeight; + if (var43 > var42) { var42 = var43; } - var26 = var18.xOffset; // L: 5836 + var26 = var18.xOffset; } - var19 = var97.method3452(); // L: 5838 - if (var19 != null) { // L: 5839 - var23 = var19.subWidth; // L: 5840 - var43 = var19.subHeight; // L: 5841 - if (var43 > var42) { // L: 5842 + var19 = var97.method3452(); + if (var19 != null) { + var23 = var19.subWidth; + var43 = var19.subHeight; + if (var43 > var42) { var42 = var43; } - var27 = var19.xOffset; // L: 5843 + var27 = var19.xOffset; } - var20 = var97.method3453(); // L: 5845 - if (var20 != null) { // L: 5846 - var24 = var20.subWidth; // L: 5847 - var43 = var20.subHeight; // L: 5848 - if (var43 > var42) { // L: 5849 + var20 = var97.method3453(); + if (var20 != null) { + var24 = var20.subWidth; + var43 = var20.subHeight; + if (var43 > var42) { var42 = var43; } - var28 = var20.xOffset; // L: 5850 + var28 = var20.xOffset; } - var21 = var97.method3454(); // L: 5852 - if (var21 != null) { // L: 5853 - var25 = var21.subWidth; // L: 5854 - var43 = var21.subHeight; // L: 5855 - if (var43 > var42) { // L: 5856 + var21 = var97.method3454(); + if (var21 != null) { + var25 = var21.subWidth; + var43 = var21.subHeight; + if (var43 > var42) { var42 = var43; } - var29 = var21.xOffset; // L: 5857 + var29 = var21.xOffset; } - if (var16 != null) { // L: 5859 - var30 = var16.method3451(); // L: 5860 - if (var30 != null) { // L: 5861 - var34 = var30.subWidth; // L: 5862 - var43 = var30.subHeight; // L: 5863 - if (var43 > var42) { // L: 5864 + if (var16 != null) { + var30 = var16.method3451(); + if (var30 != null) { + var34 = var30.subWidth; + var43 = var30.subHeight; + if (var43 > var42) { var42 = var43; } - var38 = var30.xOffset; // L: 5865 + var38 = var30.xOffset; } - var31 = var16.method3452(); // L: 5867 - if (var31 != null) { // L: 5868 - var35 = var31.subWidth; // L: 5869 - var43 = var31.subHeight; // L: 5870 - if (var43 > var42) { // L: 5871 + var31 = var16.method3452(); + if (var31 != null) { + var35 = var31.subWidth; + var43 = var31.subHeight; + if (var43 > var42) { var42 = var43; } - var39 = var31.xOffset; // L: 5872 + var39 = var31.xOffset; } - var32 = var16.method3453(); // L: 5874 - if (var32 != null) { // L: 5875 - var36 = var32.subWidth; // L: 5876 - var43 = var32.subHeight; // L: 5877 - if (var43 > var42) { // L: 5878 + var32 = var16.method3453(); + if (var32 != null) { + var36 = var32.subWidth; + var43 = var32.subHeight; + if (var43 > var42) { var42 = var43; } - var40 = var32.xOffset; // L: 5879 + var40 = var32.xOffset; } - var33 = var16.method3454(); // L: 5881 - if (var33 != null) { // L: 5882 - var37 = var33.subWidth; // L: 5883 - var43 = var33.subHeight; // L: 5884 - if (var43 > var42) { // L: 5885 + var33 = var16.method3454(); + if (var33 != null) { + var37 = var33.subWidth; + var43 = var33.subHeight; + if (var43 > var42) { var42 = var43; } - var41 = var33.xOffset; // L: 5886 + var41 = var33.xOffset; } } - Font var80 = var97.getFont(); // L: 5891 - if (var80 == null) { // L: 5892 + Font var80 = var97.getFont(); + if (var80 == null) { var80 = class307.fontPlain11; } Font var44; - if (var16 != null) { // L: 5893 - var44 = var16.getFont(); // L: 5894 - if (var44 == null) { // L: 5895 + if (var16 != null) { + var44 = var16.getFont(); + if (var44 == null) { var44 = class307.fontPlain11; } } else { - var44 = class307.fontPlain11; // L: 5897 + var44 = class307.fontPlain11; } - String var45 = null; // L: 5898 - String var46 = null; // L: 5899 - boolean var47 = false; // L: 5900 - int var48 = 0; // L: 5901 - var45 = var97.getString(var0.hitSplatValues[var78]); // L: 5902 - int var94 = var80.stringWidth(var45); // L: 5903 - if (var16 != null) { // L: 5904 - var46 = var16.getString(var0.hitSplatValues2[var78]); // L: 5905 - var48 = var44.stringWidth(var46); // L: 5906 + String var45 = null; + String var46 = null; + boolean var47 = false; + int var48 = 0; + var45 = var97.getString(var0.hitSplatValues[var78]); + int var94 = var80.stringWidth(var45); + if (var16 != null) { + var46 = var16.getString(var0.hitSplatValues2[var78]); + var48 = var44.stringWidth(var46); } - int var49 = 0; // L: 5908 - int var50 = 0; // L: 5909 - if (var23 > 0) { // L: 5910 - if (var20 == null && var21 == null) { // L: 5911 - var49 = 1; // L: 5912 + int var49 = 0; + int var50 = 0; + if (var23 > 0) { + if (var20 == null && var21 == null) { + var49 = 1; } else { var49 = var94 / var23 + 1; } } - if (var16 != null && var35 > 0) { // L: 5914 5915 - if (var32 == null && var33 == null) { // L: 5916 - var50 = 1; // L: 5917 + if (var16 != null && var35 > 0) { + if (var32 == null && var33 == null) { + var50 = 1; } else { var50 = var48 / var35 + 1; } } - int var51 = 0; // L: 5920 - int var52 = var51; // L: 5921 + int var51 = 0; + int var52 = var51; if (var22 > 0) { - var51 += var22; // L: 5922 + var51 += var22; } - var51 += 2; // L: 5923 - int var53 = var51; // L: 5924 - if (var24 > 0) { // L: 5925 + var51 += 2; + int var53 = var51; + if (var24 > 0) { var51 += var24; } - int var54 = var51; // L: 5926 - int var55 = var51; // L: 5927 + int var54 = var51; + int var55 = var51; int var56; - if (var23 > 0) { // L: 5928 - var56 = var49 * var23; // L: 5929 - var51 += var56; // L: 5930 - var55 += (var56 - var94) / 2; // L: 5931 + if (var23 > 0) { + var56 = var49 * var23; + var51 += var56; + var55 += (var56 - var94) / 2; } else { - var51 += var94; // L: 5934 + var51 += var94; } - var56 = var51; // L: 5936 - if (var25 > 0) { // L: 5937 + var56 = var51; + if (var25 > 0) { var51 += var25; } - int var57 = 0; // L: 5938 - int var58 = 0; // L: 5939 - int var59 = 0; // L: 5940 - int var60 = 0; // L: 5941 - int var61 = 0; // L: 5942 + int var57 = 0; + int var58 = 0; + int var59 = 0; + int var60 = 0; + int var61 = 0; int var62; - if (var16 != null) { // L: 5943 - var51 += 2; // L: 5944 - var57 = var51; // L: 5945 - if (var34 > 0) { // L: 5946 + if (var16 != null) { + var51 += 2; + var57 = var51; + if (var34 > 0) { var51 += var34; } - var51 += 2; // L: 5947 - var58 = var51; // L: 5948 - if (var36 > 0) { // L: 5949 + var51 += 2; + var58 = var51; + if (var36 > 0) { var51 += var36; } - var59 = var51; // L: 5950 - var61 = var51; // L: 5951 - if (var35 > 0) { // L: 5952 - var62 = var50 * var35; // L: 5953 - var51 += var62; // L: 5954 - var61 += (var62 - var48) / 2; // L: 5955 + var59 = var51; + var61 = var51; + if (var35 > 0) { + var62 = var50 * var35; + var51 += var62; + var61 += (var62 - var48) / 2; } else { - var51 += var48; // L: 5958 + var51 += var48; } - var60 = var51; // L: 5960 - if (var37 > 0) { // L: 5961 + var60 = var51; + if (var37 > 0) { var51 += var37; } } - var62 = var0.hitSplatCycles[var78] - Client.cycle; // L: 5963 - int var63 = var97.field1929 - var62 * var97.field1929 / var97.field1934; // L: 5964 - int var64 = var62 * var97.field1940 / var97.field1934 + -var97.field1940; // L: 5965 - int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1)); // L: 5966 - int var66 = var64 + (var3 + Client.viewportTempY - 12); // L: 5967 - int var67 = var66; // L: 5968 - int var68 = var66 + var42; // L: 5969 - int var69 = var66 + var97.field1944 + 15; // L: 5970 - int var70 = var69 - var80.maxAscent; // L: 5971 - int var71 = var69 + var80.maxDescent; // L: 5972 - if (var70 < var66) { // L: 5973 + var62 = var0.hitSplatCycles[var78] - Client.cycle; + int var63 = var97.field1929 - var62 * var97.field1929 / var97.field1934; + int var64 = var62 * var97.field1940 / var97.field1934 + -var97.field1940; + int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1)); + int var66 = var64 + (var3 + Client.viewportTempY - 12); + int var67 = var66; + int var68 = var66 + var42; + int var69 = var66 + var97.field1944 + 15; + int var70 = var69 - var80.maxAscent; + int var71 = var69 + var80.maxDescent; + if (var70 < var66) { var67 = var70; } - if (var71 > var68) { // L: 5974 + if (var71 > var68) { var68 = var71; } - int var72 = 0; // L: 5975 + int var72 = 0; int var73; int var74; - if (var16 != null) { // L: 5976 - var72 = var66 + var16.field1944 + 15; // L: 5977 - var73 = var72 - var44.maxAscent; // L: 5978 - var74 = var72 + var44.maxDescent; // L: 5979 - if (var73 < var67) { // L: 5980 + if (var16 != null) { + var72 = var66 + var16.field1944 + 15; + var73 = var72 - var44.maxAscent; + var74 = var72 + var44.maxDescent; + if (var73 < var67) { ; } - if (var74 > var68) { // L: 5981 + if (var74 > var68) { ; } } - var73 = 255; // L: 5983 - if (var97.field1943 >= 0) { // L: 5984 + var73 = 255; + if (var97.field1943 >= 0) { var73 = (var62 << 8) / (var97.field1934 - var97.field1943); } - if (var73 >= 0 && var73 < 255) { // L: 5985 - if (var18 != null) { // L: 5986 + if (var73 >= 0 && var73 < 255) { + if (var18 != null) { var18.drawTransAt(var65 + var52 - var26, var66, var73); } - if (var20 != null) { // L: 5987 + if (var20 != null) { var20.drawTransAt(var53 + var65 - var28, var66, var73); } - if (var19 != null) { // L: 5988 - for (var74 = 0; var74 < var49; ++var74) { // L: 5989 - var19.drawTransAt(var23 * var74 + (var54 + var65 - var27), var66, var73); // L: 5990 + if (var19 != null) { + for (var74 = 0; var74 < var49; ++var74) { + var19.drawTransAt(var23 * var74 + (var54 + var65 - var27), var66, var73); } } - if (var21 != null) { // L: 5993 + if (var21 != null) { var21.drawTransAt(var56 + var65 - var29, var66, var73); } - var80.drawAlpha(var45, var65 + var55, var69, var97.textColor, 0, var73); // L: 5994 - if (var16 != null) { // L: 5995 - if (var30 != null) { // L: 5996 + var80.drawAlpha(var45, var65 + var55, var69, var97.textColor, 0, var73); + if (var16 != null) { + if (var30 != null) { var30.drawTransAt(var65 + var57 - var38, var66, var73); } - if (var32 != null) { // L: 5997 + if (var32 != null) { var32.drawTransAt(var65 + var58 - var40, var66, var73); } - if (var31 != null) { // L: 5998 - for (var74 = 0; var74 < var50; ++var74) { // L: 5999 - var31.drawTransAt(var74 * var35 + (var59 + var65 - var39), var66, var73); // L: 6000 + if (var31 != null) { + for (var74 = 0; var74 < var50; ++var74) { + var31.drawTransAt(var74 * var35 + (var59 + var65 - var39), var66, var73); } } - if (var33 != null) { // L: 6003 + if (var33 != null) { var33.drawTransAt(var65 + var60 - var41, var66, var73); } - var44.drawAlpha(var46, var65 + var61, var72, var16.textColor, 0, var73); // L: 6004 + var44.drawAlpha(var46, var65 + var61, var72, var16.textColor, 0, var73); } } else { - if (var18 != null) { // L: 6008 + if (var18 != null) { var18.drawTransBgAt(var65 + var52 - var26, var66); } - if (var20 != null) { // L: 6009 + if (var20 != null) { var20.drawTransBgAt(var65 + var53 - var28, var66); } - if (var19 != null) { // L: 6010 - for (var74 = 0; var74 < var49; ++var74) { // L: 6011 - var19.drawTransBgAt(var74 * var23 + (var54 + var65 - var27), var66); // L: 6012 + if (var19 != null) { + for (var74 = 0; var74 < var49; ++var74) { + var19.drawTransBgAt(var74 * var23 + (var54 + var65 - var27), var66); } } - if (var21 != null) { // L: 6015 + if (var21 != null) { var21.drawTransBgAt(var56 + var65 - var29, var66); } - var80.draw(var45, var65 + var55, var69, var97.textColor | -16777216, 0); // L: 6016 - if (var16 != null) { // L: 6017 - if (var30 != null) { // L: 6018 + var80.draw(var45, var65 + var55, var69, var97.textColor | -16777216, 0); + if (var16 != null) { + if (var30 != null) { var30.drawTransBgAt(var65 + var57 - var38, var66); } - if (var32 != null) { // L: 6019 + if (var32 != null) { var32.drawTransBgAt(var58 + var65 - var40, var66); } - if (var31 != null) { // L: 6020 - for (var74 = 0; var74 < var50; ++var74) { // L: 6021 - var31.drawTransBgAt(var35 * var74 + (var59 + var65 - var39), var66); // L: 6022 + if (var31 != null) { + for (var74 = 0; var74 < var50; ++var74) { + var31.drawTransBgAt(var35 * var74 + (var59 + var65 - var39), var66); } } - if (var33 != null) { // L: 6025 + if (var33 != null) { var33.drawTransBgAt(var60 + var65 - var41, var66); } - var44.draw(var46, var65 + var61, var72, var16.textColor | -16777216, 0); // L: 6026 + var44.draw(var46, var65 + var61, var72, var16.textColor | -16777216, 0); } } } @@ -770,7 +770,7 @@ public class class148 extends class126 { } } - } // L: 6031 + } @ObfuscatedName("kc") @ObfuscatedSignature( @@ -779,116 +779,116 @@ public class class148 extends class126 { ) @Export("drawMinimap") static final void drawMinimap(Widget var0, int var1, int var2, int var3) { - playPcmPlayers(); // L: 12324 - SpriteMask var4 = var0.getSpriteMask(false); // L: 12325 - if (var4 != null) { // L: 12326 - Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); // L: 12327 - if (Client.minimapState != 2 && Client.minimapState != 5) { // L: 12328 - int var5 = Client.camAngleY & 2047; // L: 12329 - int var6 = class340.localPlayer.x / 32 + 48; // L: 12330 - int var7 = 464 - class340.localPlayer.y / 32; // L: 12331 - class29.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); // L: 12332 + playPcmPlayers(); + SpriteMask var4 = var0.getSpriteMask(false); + if (var4 != null) { + Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); + if (Client.minimapState != 2 && Client.minimapState != 5) { + int var5 = Client.camAngleY & 2047; + int var6 = class340.localPlayer.x / 32 + 48; + int var7 = 464 - class340.localPlayer.y / 32; + class29.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); int var8; int var10; int var16; - for (var8 = 0; var8 < Client.mapIconCount; ++var8) { // L: 12333 - var16 = Client.mapIconXs[var8] * 4 + 2 - class340.localPlayer.x / 32; // L: 12334 - var10 = Client.mapIconYs[var8] * 4 + 2 - class340.localPlayer.y / 32; // L: 12335 - ArchiveDisk.drawSpriteOnMinimap(var1, var2, var16, var10, Client.mapIcons[var8], var4); // L: 12336 + for (var8 = 0; var8 < Client.mapIconCount; ++var8) { + var16 = Client.mapIconXs[var8] * 4 + 2 - class340.localPlayer.x / 32; + var10 = Client.mapIconYs[var8] * 4 + 2 - class340.localPlayer.y / 32; + ArchiveDisk.drawSpriteOnMinimap(var1, var2, var16, var10, Client.mapIcons[var8], var4); } int var11; int var12; - for (var8 = 0; var8 < 104; ++var8) { // L: 12338 - for (var16 = 0; var16 < 104; ++var16) { // L: 12339 - NodeDeque var14 = Client.groundItems[class20.Client_plane][var8][var16]; // L: 12340 - if (var14 != null) { // L: 12341 - var11 = var8 * 4 + 2 - class340.localPlayer.x / 32; // L: 12342 - var12 = var16 * 4 + 2 - class340.localPlayer.y / 32; // L: 12343 - ArchiveDisk.drawSpriteOnMinimap(var1, var2, var11, var12, class111.mapDotSprites[0], var4); // L: 12344 + for (var8 = 0; var8 < 104; ++var8) { + for (var16 = 0; var16 < 104; ++var16) { + NodeDeque var14 = Client.groundItems[class20.Client_plane][var8][var16]; + if (var14 != null) { + var11 = var8 * 4 + 2 - class340.localPlayer.x / 32; + var12 = var16 * 4 + 2 - class340.localPlayer.y / 32; + ArchiveDisk.drawSpriteOnMinimap(var1, var2, var11, var12, class111.mapDotSprites[0], var4); } } } - for (var8 = 0; var8 < Client.npcCount; ++var8) { // L: 12348 - NPC var9 = Client.npcs[Client.npcIndices[var8]]; // L: 12349 - if (var9 != null && var9.isVisible()) { // L: 12350 - NPCComposition var18 = var9.definition; // L: 12351 - if (var18 != null && var18.transforms != null) { // L: 12352 + for (var8 = 0; var8 < Client.npcCount; ++var8) { + NPC var9 = Client.npcs[Client.npcIndices[var8]]; + if (var9 != null && var9.isVisible()) { + NPCComposition var18 = var9.definition; + if (var18 != null && var18.transforms != null) { var18 = var18.transform(); } - if (var18 != null && var18.drawMapDot && var18.isInteractable) { // L: 12353 - var11 = var9.x / 32 - class340.localPlayer.x / 32; // L: 12354 - var12 = var9.y / 32 - class340.localPlayer.y / 32; // L: 12355 - ArchiveDisk.drawSpriteOnMinimap(var1, var2, var11, var12, class111.mapDotSprites[1], var4); // L: 12356 + if (var18 != null && var18.drawMapDot && var18.isInteractable) { + var11 = var9.x / 32 - class340.localPlayer.x / 32; + var12 = var9.y / 32 - class340.localPlayer.y / 32; + ArchiveDisk.drawSpriteOnMinimap(var1, var2, var11, var12, class111.mapDotSprites[1], var4); } } } - var8 = Players.Players_count; // L: 12360 - int[] var17 = Players.Players_indices; // L: 12361 + var8 = Players.Players_count; + int[] var17 = Players.Players_indices; - for (var10 = 0; var10 < var8; ++var10) { // L: 12362 - Player var15 = Client.players[var17[var10]]; // L: 12363 - if (var15 != null && var15.isVisible() && !var15.isHidden && var15 != class340.localPlayer) { // L: 12364 - var12 = var15.x / 32 - class340.localPlayer.x / 32; // L: 12365 - int var13 = var15.y / 32 - class340.localPlayer.y / 32; // L: 12366 - if (var15.isFriend()) { // L: 12367 + for (var10 = 0; var10 < var8; ++var10) { + Player var15 = Client.players[var17[var10]]; + if (var15 != null && var15.isVisible() && !var15.isHidden && var15 != class340.localPlayer) { + var12 = var15.x / 32 - class340.localPlayer.x / 32; + int var13 = var15.y / 32 - class340.localPlayer.y / 32; + if (var15.isFriend()) { ArchiveDisk.drawSpriteOnMinimap(var1, var2, var12, var13, class111.mapDotSprites[3], var4); - } else if (class340.localPlayer.team != 0 && var15.team != 0 && var15.team == class340.localPlayer.team) { // L: 12368 + } else if (class340.localPlayer.team != 0 && var15.team != 0 && var15.team == class340.localPlayer.team) { ArchiveDisk.drawSpriteOnMinimap(var1, var2, var12, var13, class111.mapDotSprites[4], var4); - } else if (var15.isFriendsChatMember()) { // L: 12369 + } else if (var15.isFriendsChatMember()) { ArchiveDisk.drawSpriteOnMinimap(var1, var2, var12, var13, class111.mapDotSprites[5], var4); - } else if (var15.isClanMember()) { // L: 12370 + } else if (var15.isClanMember()) { ArchiveDisk.drawSpriteOnMinimap(var1, var2, var12, var13, class111.mapDotSprites[6], var4); } else { - ArchiveDisk.drawSpriteOnMinimap(var1, var2, var12, var13, class111.mapDotSprites[2], var4); // L: 12371 + ArchiveDisk.drawSpriteOnMinimap(var1, var2, var12, var13, class111.mapDotSprites[2], var4); } } } - if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { // L: 12374 - if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { // L: 12375 - NPC var19 = Client.npcs[Client.hintArrowNpcIndex]; // L: 12376 - if (var19 != null) { // L: 12377 - var11 = var19.x / 32 - class340.localPlayer.x / 32; // L: 12378 - var12 = var19.y / 32 - class340.localPlayer.y / 32; // L: 12379 - class409.worldToMinimap(var1, var2, var11, var12, UserComparator7.mapMarkerSprites[1], var4); // L: 12380 + if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { + if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { + NPC var19 = Client.npcs[Client.hintArrowNpcIndex]; + if (var19 != null) { + var11 = var19.x / 32 - class340.localPlayer.x / 32; + var12 = var19.y / 32 - class340.localPlayer.y / 32; + class409.worldToMinimap(var1, var2, var11, var12, UserComparator7.mapMarkerSprites[1], var4); } } - if (Client.hintArrowType == 2) { // L: 12383 - var10 = Client.hintArrowX * 4 - class131.baseX * 4 + 2 - class340.localPlayer.x / 32; // L: 12384 - var11 = Client.hintArrowY * 4 - TileItem.baseY * 4 + 2 - class340.localPlayer.y / 32; // L: 12385 - class409.worldToMinimap(var1, var2, var10, var11, UserComparator7.mapMarkerSprites[1], var4); // L: 12386 + if (Client.hintArrowType == 2) { + var10 = Client.hintArrowX * 4 - class131.baseX * 4 + 2 - class340.localPlayer.x / 32; + var11 = Client.hintArrowY * 4 - TileItem.baseY * 4 + 2 - class340.localPlayer.y / 32; + class409.worldToMinimap(var1, var2, var10, var11, UserComparator7.mapMarkerSprites[1], var4); } - if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { // L: 12388 - Player var20 = Client.players[Client.hintArrowPlayerIndex]; // L: 12389 - if (var20 != null) { // L: 12390 - var11 = var20.x / 32 - class340.localPlayer.x / 32; // L: 12391 - var12 = var20.y / 32 - class340.localPlayer.y / 32; // L: 12392 - class409.worldToMinimap(var1, var2, var11, var12, UserComparator7.mapMarkerSprites[1], var4); // L: 12393 + if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { + Player var20 = Client.players[Client.hintArrowPlayerIndex]; + if (var20 != null) { + var11 = var20.x / 32 - class340.localPlayer.x / 32; + var12 = var20.y / 32 - class340.localPlayer.y / 32; + class409.worldToMinimap(var1, var2, var11, var12, UserComparator7.mapMarkerSprites[1], var4); } } } - if (Client.destinationX != 0) { // L: 12397 - var10 = Client.destinationX * 4 + 2 - class340.localPlayer.x / 32; // L: 12398 - var11 = Client.destinationY * 4 + 2 - class340.localPlayer.y / 32; // L: 12399 - ArchiveDisk.drawSpriteOnMinimap(var1, var2, var10, var11, UserComparator7.mapMarkerSprites[0], var4); // L: 12400 + if (Client.destinationX != 0) { + var10 = Client.destinationX * 4 + 2 - class340.localPlayer.x / 32; + var11 = Client.destinationY * 4 + 2 - class340.localPlayer.y / 32; + ArchiveDisk.drawSpriteOnMinimap(var1, var2, var10, var11, UserComparator7.mapMarkerSprites[0], var4); } - if (!class340.localPlayer.isHidden) { // L: 12402 + if (!class340.localPlayer.isHidden) { Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215); } } else { - Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); // L: 12404 + Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); } - Client.field686[var3] = true; // L: 12405 + Client.field686[var3] = true; } - } // L: 12406 + } } diff --git a/runescape-client/src/main/java/class149.java b/runescape-client/src/main/java/class149.java index a3e24e571b..d747914e45 100644 --- a/runescape-client/src/main/java/class149.java +++ b/runescape-client/src/main/java/class149.java @@ -37,7 +37,7 @@ public class class149 extends class142 { descriptor = "(Len;)V" ) class149(class143 var1) { - this.this$0 = var1; // L: 155 + this.this$0 = var1; } @ObfuscatedName("c") @@ -46,14 +46,14 @@ public class class149 extends class142 { garbageValue = "4" ) void vmethod3022(Buffer var1) { - this.field1662 = var1.readStringCp1252NullTerminatedOrNull(); // L: 158 - if (this.field1662 != null) { // L: 159 - var1.readUnsignedByte(); // L: 160 - this.field1660 = var1.readByte(); // L: 161 - this.field1659 = var1.readByte(); // L: 162 + this.field1662 = var1.readStringCp1252NullTerminatedOrNull(); + if (this.field1662 != null) { + var1.readUnsignedByte(); + this.field1660 = var1.readByte(); + this.field1659 = var1.readByte(); } - } // L: 164 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -61,11 +61,11 @@ public class class149 extends class142 { garbageValue = "40" ) void vmethod3021(ClanChannel var1) { - var1.name = this.field1662; // L: 167 - if (this.field1662 != null) { // L: 168 - var1.field1636 = this.field1660; // L: 169 - var1.field1643 = this.field1659; // L: 170 + var1.name = this.field1662; + if (this.field1662 != null) { + var1.field1636 = this.field1660; + var1.field1643 = this.field1659; } - } // L: 172 + } } diff --git a/runescape-client/src/main/java/class15.java b/runescape-client/src/main/java/class15.java index 0fe7c18cc0..d0da11800c 100644 --- a/runescape-client/src/main/java/class15.java +++ b/runescape-client/src/main/java/class15.java @@ -18,15 +18,15 @@ public class class15 extends SSLSocketFactory { SecureRandom field85; static { - if (Security.getProvider("BC") == null) { // L: 40 + if (Security.getProvider("BC") == null) { Security.addProvider(new BouncyCastleProvider()); } - } // L: 41 + } class15() { - this.field85 = new SecureRandom(); // L: 43 - } // L: 45 + this.field85 = new SecureRandom(); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -34,43 +34,43 @@ public class class15 extends SSLSocketFactory { garbageValue = "117" ) SSLSocket method227(String var1, TlsClientProtocol var2) { - return new class12(this, var2, var1); // L: 90 + return new class12(this, var2, var1); } public Socket createSocket(Socket var1, String var2, int var3, boolean var4) throws IOException { - if (var1 == null) { // L: 49 - var1 = new Socket(); // L: 50 + if (var1 == null) { + var1 = new Socket(); } - if (!var1.isConnected()) { // L: 52 - var1.connect(new InetSocketAddress(var2, var3)); // L: 53 + if (!var1.isConnected()) { + var1.connect(new InetSocketAddress(var2, var3)); } - TlsClientProtocol var5 = new TlsClientProtocol(var1.getInputStream(), var1.getOutputStream(), this.field85); // L: 55 - return this.method227(var2, var5); // L: 56 + TlsClientProtocol var5 = new TlsClientProtocol(var1.getInputStream(), var1.getOutputStream(), this.field85); + return this.method227(var2, var5); } public Socket createSocket(InetAddress var1, int var2, InetAddress var3, int var4) throws IOException { - return null; // L: 86 + return null; } public String[] getDefaultCipherSuites() { - return null; // L: 61 + return null; } public String[] getSupportedCipherSuites() { - return null; // L: 66 + return null; } public Socket createSocket(String var1, int var2) throws IOException, UnknownHostException { - return null; // L: 71 + return null; } public Socket createSocket(InetAddress var1, int var2) throws IOException { - return null; // L: 76 + return null; } public Socket createSocket(String var1, int var2, InetAddress var3, int var4) throws IOException, UnknownHostException { - return null; // L: 81 + return null; } } diff --git a/runescape-client/src/main/java/class150.java b/runescape-client/src/main/java/class150.java index f5ec9c33cf..0590a6801e 100644 --- a/runescape-client/src/main/java/class150.java +++ b/runescape-client/src/main/java/class150.java @@ -28,7 +28,7 @@ public class class150 extends class126 { descriptor = "(Lda;)V" ) class150(class129 var1) { - this.this$0 = var1; // L: 307 + this.this$0 = var1; } @ObfuscatedName("c") @@ -37,9 +37,9 @@ public class class150 extends class126 { garbageValue = "1416770155" ) void vmethod3029(Buffer var1) { - this.field1666 = var1.readInt(); // L: 310 - this.field1669 = var1.readLong(); // L: 311 - } // L: 312 + this.field1666 = var1.readInt(); + this.field1669 = var1.readLong(); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -47,6 +47,6 @@ public class class150 extends class126 { garbageValue = "-1531735008" ) void vmethod3028(ClanSettings var1) { - var1.method2856(this.field1666, this.field1669); // L: 315 - } // L: 316 + var1.method2856(this.field1666, this.field1669); + } } diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java index 6c4d3b8ce8..08ebcb913e 100644 --- a/runescape-client/src/main/java/class16.java +++ b/runescape-client/src/main/java/class16.java @@ -20,17 +20,17 @@ public class class16 implements ThreadFactory { descriptor = "(Lg;)V" ) class16(class14 var1) { - this.this$0 = var1; // L: 68 - this.field86 = new AtomicInteger(1); // L: 66 - SecurityManager var2 = System.getSecurityManager(); // L: 69 - this.field87 = var2 != null ? var2.getThreadGroup() : Thread.currentThread().getThreadGroup(); // L: 70 - } // L: 71 + this.this$0 = var1; + this.field86 = new AtomicInteger(1); + SecurityManager var2 = System.getSecurityManager(); + this.field87 = var2 != null ? var2.getThreadGroup() : Thread.currentThread().getThreadGroup(); + } public Thread newThread(Runnable var1) { - Thread var2 = new Thread(this.field87, var1, this.this$0.field79 + "-rest-request-" + this.field86.getAndIncrement(), 0L); // L: 75 - var2.setDaemon(true); // L: 76 - var2.setPriority(5); // L: 77 - return var2; // L: 78 + Thread var2 = new Thread(this.field87, var1, this.this$0.field79 + "-rest-request-" + this.field86.getAndIncrement(), 0L); + var2.setDaemon(true); + var2.setPriority(5); + return var2; } @ObfuscatedName("o") @@ -40,16 +40,16 @@ public class class16 implements ThreadFactory { ) @Export("Widget_setKeyIgnoreHeld") static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { - if (var0.field3300 == null) { // L: 1004 - throw new RuntimeException(); // L: 1005 + if (var0.field3300 == null) { + throw new RuntimeException(); } else { - if (var0.field3368 == null) { // L: 1007 - var0.field3368 = new int[var0.field3300.length]; // L: 1008 + if (var0.field3368 == null) { + var0.field3368 = new int[var0.field3300.length]; } - var0.field3368[var1] = Integer.MAX_VALUE; // L: 1010 + var0.field3368[var1] = Integer.MAX_VALUE; } - } // L: 1011 + } @ObfuscatedName("ko") @ObfuscatedSignature( @@ -57,11 +57,11 @@ public class class16 implements ThreadFactory { garbageValue = "74" ) static void method239(int var0) { - class87.tempMenuAction = new MenuAction(); // L: 12023 - class87.tempMenuAction.param0 = Client.menuArguments1[var0]; // L: 12024 - class87.tempMenuAction.param1 = Client.menuArguments2[var0]; // L: 12025 - class87.tempMenuAction.opcode = Client.menuOpcodes[var0]; // L: 12026 - class87.tempMenuAction.identifier = Client.menuIdentifiers[var0]; // L: 12027 - class87.tempMenuAction.action = Client.menuActions[var0]; // L: 12028 - } // L: 12029 + class87.tempMenuAction = new MenuAction(); + class87.tempMenuAction.param0 = Client.menuArguments1[var0]; + class87.tempMenuAction.param1 = Client.menuArguments2[var0]; + class87.tempMenuAction.opcode = Client.menuOpcodes[var0]; + class87.tempMenuAction.identifier = Client.menuIdentifiers[var0]; + class87.tempMenuAction.action = Client.menuActions[var0]; + } } diff --git a/runescape-client/src/main/java/class160.java b/runescape-client/src/main/java/class160.java index ae8a8982c1..ab9a73acd7 100644 --- a/runescape-client/src/main/java/class160.java +++ b/runescape-client/src/main/java/class160.java @@ -8,16 +8,16 @@ public class class160 { public short[] field1738; class160(int var1) { - ItemComposition var2 = UserComparator6.ItemDefinition_get(var1); // L: 12 - if (var2.method3560()) { // L: 13 - this.field1732 = new short[var2.recolorTo.length]; // L: 14 - System.arraycopy(var2.recolorTo, 0, this.field1732, 0, this.field1732.length); // L: 15 + ItemComposition var2 = UserComparator6.ItemDefinition_get(var1); + if (var2.method3560()) { + this.field1732 = new short[var2.recolorTo.length]; + System.arraycopy(var2.recolorTo, 0, this.field1732, 0, this.field1732.length); } - if (var2.method3572()) { // L: 17 - this.field1738 = new short[var2.retextureTo.length]; // L: 18 - System.arraycopy(var2.retextureTo, 0, this.field1738, 0, this.field1738.length); // L: 19 + if (var2.method3572()) { + this.field1738 = new short[var2.retextureTo.length]; + System.arraycopy(var2.retextureTo, 0, this.field1738, 0, this.field1738.length); } - } // L: 21 + } } diff --git a/runescape-client/src/main/java/class167.java b/runescape-client/src/main/java/class167.java index f2f1b10bac..53e1758ed2 100644 --- a/runescape-client/src/main/java/class167.java +++ b/runescape-client/src/main/java/class167.java @@ -22,17 +22,17 @@ public class class167 { garbageValue = "1" ) static int method3269(int var0, Script var1, boolean var2) { - if (var0 != 3700 && var0 != 3701) { // L: 2486 - if (var0 == 3702) { // L: 2491 - ++IsaacCipher.Interpreter_intStackSize; // L: 2492 - return 1; // L: 2493 + if (var0 != 3700 && var0 != 3701) { + if (var0 == 3702) { + ++IsaacCipher.Interpreter_intStackSize; + return 1; } else { - return 2; // L: 2495 + return 2; } } else { - --IsaacCipher.Interpreter_intStackSize; // L: 2487 - --class13.Interpreter_stringStackSize; // L: 2488 - return 1; // L: 2489 + --IsaacCipher.Interpreter_intStackSize; + --class13.Interpreter_stringStackSize; + return 1; } } @@ -42,222 +42,222 @@ public class class167 { garbageValue = "553813410" ) static int method3270(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { // L: 3314 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.publicChatMode; // L: 3315 - return 1; // L: 3316 - } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { // L: 3318 - IsaacCipher.Interpreter_intStackSize -= 3; // L: 3319 - Client.publicChatMode = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3320 - Projectile.privateChatMode = WorldMapData_0.method4353(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]); // L: 3321 - if (Projectile.privateChatMode == null) { // L: 3322 + if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.publicChatMode; + return 1; + } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { + IsaacCipher.Interpreter_intStackSize -= 3; + Client.publicChatMode = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + Projectile.privateChatMode = WorldMapData_0.method4353(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]); + if (Projectile.privateChatMode == null) { Projectile.privateChatMode = PrivateChatMode.field4596; } - Client.tradeChatMode = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 3323 - PacketBufferNode var13 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2855, Client.packetWriter.isaacCipher); // L: 3325 - var13.packetBuffer.writeByte(Client.publicChatMode); // L: 3326 - var13.packetBuffer.writeByte(Projectile.privateChatMode.field4597); // L: 3327 - var13.packetBuffer.writeByte(Client.tradeChatMode); // L: 3328 - Client.packetWriter.addNode(var13); // L: 3329 - return 1; // L: 3330 + Client.tradeChatMode = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; + PacketBufferNode var13 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2855, Client.packetWriter.isaacCipher); + var13.packetBuffer.writeByte(Client.publicChatMode); + var13.packetBuffer.writeByte(Projectile.privateChatMode.field4597); + var13.packetBuffer.writeByte(Client.tradeChatMode); + Client.packetWriter.addNode(var13); + return 1; } else { PacketBufferNode var6; int var7; String var8; int var9; - if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { // L: 3332 - var8 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3333 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 3334 - var7 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3335 - var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3336 - var6 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2851, Client.packetWriter.isaacCipher); // L: 3338 - var6.packetBuffer.writeByte(class116.stringCp1252NullTerminatedByteSize(var8) + 2); // L: 3339 - var6.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3340 - var6.packetBuffer.writeByte(var7 - 1); // L: 3341 - var6.packetBuffer.writeByte(var9); // L: 3342 - Client.packetWriter.addNode(var6); // L: 3343 - return 1; // L: 3344 + if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { + var8 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + IsaacCipher.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + var6 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2851, Client.packetWriter.isaacCipher); + var6.packetBuffer.writeByte(class116.stringCp1252NullTerminatedByteSize(var8) + 2); + var6.packetBuffer.writeStringCp1252NullTerminated(var8); + var6.packetBuffer.writeByte(var7 - 1); + var6.packetBuffer.writeByte(var9); + Client.packetWriter.addNode(var6); + return 1; } else { int var3; Message var5; - if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { // L: 3346 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 3347 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3348 - var7 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3349 - var5 = ItemComposition.Messages_getByChannelAndID(var3, var7); // L: 3350 - if (var5 != null) { // L: 3351 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.count; // L: 3352 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.cycle; // L: 3353 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3354 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3355 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3356 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3357 + if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + var5 = ItemComposition.Messages_getByChannelAndID(var3, var7); + if (var5 != null) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.count; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.cycle; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 3360 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3361 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3362 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3363 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3364 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3365 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; } - return 1; // L: 3367 + return 1; } else { Message var4; - if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { // L: 3369 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3370 - var4 = class139.Messages_getMessage(var3); // L: 3371 - if (var4 != null) { // L: 3372 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.type; // L: 3373 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.cycle; // L: 3374 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3375 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3376 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3377 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3378 + if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + var4 = class139.Messages_getMessage(var3); + if (var4 != null) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.type; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.cycle; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 3381 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3382 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3383 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3384 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3385 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3386 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; } - return 1; // L: 3388 - } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { // L: 3390 - if (Projectile.privateChatMode == null) { // L: 3391 + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { + if (Projectile.privateChatMode == null) { Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Projectile.privateChatMode.field4597; // L: 3392 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Projectile.privateChatMode.field4597; } - return 1; // L: 3393 + return 1; } else { PacketBufferNode var12; - if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { // L: 3395 - var8 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3396 - var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3397 - var12 = BufferedSource.method6527(var7, var8, ScriptFrame.clientLanguage, -1); // L: 3398 - Client.packetWriter.addNode(var12); // L: 3399 - return 1; // L: 3400 - } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { // L: 3402 - class13.Interpreter_stringStackSize -= 2; // L: 3403 - var8 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; // L: 3404 - String var11 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; // L: 3405 - var12 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2849, Client.packetWriter.isaacCipher); // L: 3407 - var12.packetBuffer.writeShort(0); // L: 3408 - int var10 = var12.packetBuffer.offset; // L: 3409 - var12.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3410 - class370.method6755(var12.packetBuffer, var11); // L: 3411 - var12.packetBuffer.writeLengthShort(var12.packetBuffer.offset - var10); // L: 3412 - Client.packetWriter.addNode(var12); // L: 3413 - return 1; // L: 3414 - } else if (var0 == ScriptOpcodes.CHAT_SENDCLAN) { // L: 3416 - var8 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3417 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 3418 - var7 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3419 - var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3420 - var6 = BufferedSource.method6527(var7, var8, ScriptFrame.clientLanguage, var9); // L: 3421 - Client.packetWriter.addNode(var6); // L: 3422 - return 1; // L: 3423 - } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { // L: 3425 - if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { // L: 3432 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.tradeChatMode; // L: 3433 - return 1; // L: 3434 - } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { // L: 3436 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3437 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = PlayerComposition.Messages_getHistorySize(var3); // L: 3438 - return 1; // L: 3439 - } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { // L: 3441 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3442 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = VertexNormal.Messages_getLastChatID(var3); // L: 3443 - return 1; // L: 3444 - } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { // L: 3446 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3447 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Actor.method2233(var3); // L: 3448 - return 1; // L: 3449 - } else if (var0 == ScriptOpcodes.DOCHEAT) { // L: 3451 - var8 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3452 - RouteStrategy.doCheat(var8); // L: 3453 - return 1; // L: 3454 - } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { // L: 3456 - Client.field645 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize].toLowerCase().trim(); // L: 3457 - return 1; // L: 3458 - } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { // L: 3460 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Client.field645; // L: 3461 - return 1; // L: 3462 - } else if (var0 == ScriptOpcodes.WRITECONSOLE) { // L: 3464 - var8 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3465 - System.out.println(var8); // L: 3466 - return 1; // L: 3467 - } else if (var0 == 5024) { // L: 3469 - --IsaacCipher.Interpreter_intStackSize; // L: 3470 - return 1; // L: 3471 - } else if (var0 == 5025) { // L: 3473 - ++IsaacCipher.Interpreter_intStackSize; // L: 3474 - return 1; // L: 3475 - } else if (var0 == 5030) { // L: 3477 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 3478 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3479 - var7 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3480 - var5 = ItemComposition.Messages_getByChannelAndID(var3, var7); // L: 3481 - if (var5 != null) { // L: 3482 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.count; // L: 3483 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.cycle; // L: 3484 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3485 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3486 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3487 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3488 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3489 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3490 + if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { + var8 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + var12 = BufferedSource.method6527(var7, var8, ScriptFrame.clientLanguage, -1); + Client.packetWriter.addNode(var12); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { + class13.Interpreter_stringStackSize -= 2; + var8 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; + String var11 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; + var12 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2849, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeShort(0); + int var10 = var12.packetBuffer.offset; + var12.packetBuffer.writeStringCp1252NullTerminated(var8); + class370.method6755(var12.packetBuffer, var11); + var12.packetBuffer.writeLengthShort(var12.packetBuffer.offset - var10); + Client.packetWriter.addNode(var12); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_SENDCLAN) { + var8 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + IsaacCipher.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + var6 = BufferedSource.method6527(var7, var8, ScriptFrame.clientLanguage, var9); + Client.packetWriter.addNode(var6); + return 1; + } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { + if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.tradeChatMode; + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = PlayerComposition.Messages_getHistorySize(var3); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = VertexNormal.Messages_getLastChatID(var3); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Actor.method2233(var3); + return 1; + } else if (var0 == ScriptOpcodes.DOCHEAT) { + var8 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + RouteStrategy.doCheat(var8); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { + Client.field645 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize].toLowerCase().trim(); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Client.field645; + return 1; + } else if (var0 == ScriptOpcodes.WRITECONSOLE) { + var8 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; + System.out.println(var8); + return 1; + } else if (var0 == 5024) { + --IsaacCipher.Interpreter_intStackSize; + return 1; + } else if (var0 == 5025) { + ++IsaacCipher.Interpreter_intStackSize; + return 1; + } else if (var0 == 5030) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + var5 = ItemComposition.Messages_getByChannelAndID(var3, var7); + if (var5 != null) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.count; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.cycle; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 3493 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3494 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3495 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3496 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3497 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3498 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3499 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3500 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; } - return 1; // L: 3502 - } else if (var0 == 5031) { // L: 3504 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3505 - var4 = class139.Messages_getMessage(var3); // L: 3506 - if (var4 != null) { // L: 3507 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.type; // L: 3508 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.cycle; // L: 3509 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3510 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3511 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3512 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3513 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3514 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3515 + return 1; + } else if (var0 == 5031) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + var4 = class139.Messages_getMessage(var3); + if (var4 != null) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.type; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.cycle; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 3518 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3519 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3520 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3521 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3522 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3523 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3524 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3525 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; } - return 1; // L: 3527 + return 1; } else { - return 2; // L: 3529 + return 2; } } else { - if (class340.localPlayer != null && class340.localPlayer.username != null) { // L: 3427 + if (class340.localPlayer != null && class340.localPlayer.username != null) { var8 = class340.localPlayer.username.getName(); } else { - var8 = ""; // L: 3428 + var8 = ""; } - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var8; // L: 3429 - return 1; // L: 3430 + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var8; + return 1; } } } diff --git a/runescape-client/src/main/java/class17.java b/runescape-client/src/main/java/class17.java index 573eb8e33b..10580748b3 100644 --- a/runescape-client/src/main/java/class17.java +++ b/runescape-client/src/main/java/class17.java @@ -37,91 +37,91 @@ class class17 implements SSLSession { descriptor = "(Ld;)V" ) class17(class12 var1) { - this.this$1 = var1; // L: 133 + this.this$1 = var1; } public int getApplicationBufferSize() { - return 0; // L: 136 + return 0; } public void invalidate() { - throw new UnsupportedOperationException(); // L: 221 + throw new UnsupportedOperationException(); } public long getCreationTime() { - throw new UnsupportedOperationException(); // L: 146 + throw new UnsupportedOperationException(); } public byte[] getId() { - throw new UnsupportedOperationException(); // L: 151 + throw new UnsupportedOperationException(); } public long getLastAccessedTime() { - throw new UnsupportedOperationException(); // L: 156 + throw new UnsupportedOperationException(); } public Certificate[] getLocalCertificates() { - throw new UnsupportedOperationException(); // L: 161 + throw new UnsupportedOperationException(); } public void putValue(String var1, Object var2) { - throw new UnsupportedOperationException(); // L: 231 + throw new UnsupportedOperationException(); } public int getPacketBufferSize() { - throw new UnsupportedOperationException(); // L: 171 + throw new UnsupportedOperationException(); } public Certificate[] getPeerCertificates() throws SSLPeerUnverifiedException { - return this.this$1.field67; // L: 181 + return this.this$1.field67; } public int getPeerPort() { - return 0; // L: 191 + return 0; } public String getProtocol() { - throw new UnsupportedOperationException(); // L: 201 + throw new UnsupportedOperationException(); } public SSLSessionContext getSessionContext() { - throw new UnsupportedOperationException(); // L: 206 + throw new UnsupportedOperationException(); } public Object getValue(String var1) { - throw new UnsupportedOperationException(); // L: 211 + throw new UnsupportedOperationException(); } public String[] getValueNames() { - throw new UnsupportedOperationException(); // L: 216 + throw new UnsupportedOperationException(); } public Principal getLocalPrincipal() { - throw new UnsupportedOperationException(); // L: 166 + throw new UnsupportedOperationException(); } public boolean isValid() { - throw new UnsupportedOperationException(); // L: 226 + throw new UnsupportedOperationException(); } public String getPeerHost() { - throw new UnsupportedOperationException(); // L: 186 + throw new UnsupportedOperationException(); } public X509Certificate[] getPeerCertificateChain() throws SSLPeerUnverifiedException { - return null; // L: 176 + return null; } public void removeValue(String var1) { - throw new UnsupportedOperationException(); // L: 236 + throw new UnsupportedOperationException(); } public Principal getPeerPrincipal() throws SSLPeerUnverifiedException { - return null; // L: 196 + return null; } public String getCipherSuite() { - throw new UnsupportedOperationException(); // L: 141 + throw new UnsupportedOperationException(); } @ObfuscatedName("x") @@ -130,19 +130,19 @@ class class17 implements SSLSession { garbageValue = "-1239241420" ) protected static final void method292() { - class91.clock.mark(); // L: 405 + class91.clock.mark(); int var0; - for (var0 = 0; var0 < 32; ++var0) { // L: 406 + for (var0 = 0; var0 < 32; ++var0) { GameEngine.graphicsTickTimes[var0] = 0L; } - for (var0 = 0; var0 < 32; ++var0) { // L: 407 + for (var0 = 0; var0 < 32; ++var0) { GameEngine.clientTickTimes[var0] = 0L; } - GameEngine.gameCyclesToDo = 0; // L: 408 - } // L: 409 + GameEngine.gameCyclesToDo = 0; + } @ObfuscatedName("ik") @ObfuscatedSignature( @@ -150,14 +150,14 @@ class class17 implements SSLSession { garbageValue = "40" ) static final void method291(int var0) { - if (var0 >= 0) { // L: 9004 - int var1 = Client.menuArguments1[var0]; // L: 9005 - int var2 = Client.menuArguments2[var0]; // L: 9006 - int var3 = Client.menuOpcodes[var0]; // L: 9007 - int var4 = Client.menuIdentifiers[var0]; // L: 9008 - String var5 = Client.menuActions[var0]; // L: 9009 - String var6 = Client.menuTargets[var0]; // L: 9010 - Decimator.menuAction(var1, var2, var3, var4, var5, var6, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 9011 + if (var0 >= 0) { + int var1 = Client.menuArguments1[var0]; + int var2 = Client.menuArguments2[var0]; + int var3 = Client.menuOpcodes[var0]; + int var4 = Client.menuIdentifiers[var0]; + String var5 = Client.menuActions[var0]; + String var6 = Client.menuTargets[var0]; + Decimator.menuAction(var1, var2, var3, var4, var5, var6, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); } - } // L: 9012 + } } diff --git a/runescape-client/src/main/java/class174.java b/runescape-client/src/main/java/class174.java index bbfa644b79..622aa0873c 100644 --- a/runescape-client/src/main/java/class174.java +++ b/runescape-client/src/main/java/class174.java @@ -4,8 +4,8 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("fy") public class class174 extends DualNode { static { - new EvictingDualNodeHashTable(64); // L: 9 - } // L: 10 + new EvictingDualNodeHashTable(64); + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -13,17 +13,17 @@ public class class174 extends DualNode { garbageValue = "1822723426" ) static void method3383() { - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 48 - if (ArchiveDiskActionHandler.field3815 == 0) { // L: 49 - KeyHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 50 - KeyHandler.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 51 - KeyHandler.ArchiveDiskActionHandler_thread.start(); // L: 52 - KeyHandler.ArchiveDiskActionHandler_thread.setPriority(5); // L: 53 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { + if (ArchiveDiskActionHandler.field3815 == 0) { + KeyHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); + KeyHandler.ArchiveDiskActionHandler_thread.setDaemon(true); + KeyHandler.ArchiveDiskActionHandler_thread.start(); + KeyHandler.ArchiveDiskActionHandler_thread.setPriority(5); } - ArchiveDiskActionHandler.field3815 = 600; // L: 55 + ArchiveDiskActionHandler.field3815 = 600; } - } // L: 57 + } @ObfuscatedName("j") @ObfuscatedSignature( @@ -31,12 +31,12 @@ public class class174 extends DualNode { garbageValue = "97" ) static boolean method3382(AbstractArchive var0, int var1) { - byte[] var2 = var0.takeFileFlat(var1); // L: 95 - if (var2 == null) { // L: 96 + byte[] var2 = var0.takeFileFlat(var1); + if (var2 == null) { return false; } else { - WorldMapSection0.SpriteBuffer_decode(var2); // L: 97 - return true; // L: 98 + WorldMapSection0.SpriteBuffer_decode(var2); + return true; } } } diff --git a/runescape-client/src/main/java/class18.java b/runescape-client/src/main/java/class18.java index 2df7868f3e..91b6f84a82 100644 --- a/runescape-client/src/main/java/class18.java +++ b/runescape-client/src/main/java/class18.java @@ -19,7 +19,7 @@ class class18 implements Comparator { descriptor = "(Lo;)V" ) class18(class10 var1) { - this.this$0 = var1; // L: 40 + this.this$0 = var1; } @ObfuscatedName("c") @@ -28,15 +28,15 @@ class class18 implements Comparator { garbageValue = "661952074" ) int method294(Entry var1, Entry var2) { - return ((Float)var2.getValue()).compareTo((Float)var1.getValue()); // L: 42 + return ((Float)var2.getValue()).compareTo((Float)var1.getValue()); } public boolean equals(Object var1) { - return super.equals(var1); // L: 50 + return super.equals(var1); } public int compare(Object var1, Object var2) { - return this.method294((Entry)var1, (Entry)var2); // L: 46 + return this.method294((Entry)var1, (Entry)var2); } @ObfuscatedName("c") @@ -55,9 +55,9 @@ class class18 implements Comparator { var1.decode(new Buffer(var2), var0); } - var1.postDecode(); // L: 31 - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0); // L: 32 - return var1; // L: 33 + var1.postDecode(); + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0); + return var1; } } @@ -68,19 +68,19 @@ class class18 implements Comparator { ) @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 + StructComposition var1 = (StructComposition)StructComposition.StructDefinition_cached.get((long)var0); + if (var1 != null) { return var1; } else { - byte[] var2 = class17.StructDefinition_archive.takeFile(34, var0); // L: 25 - var1 = new StructComposition(); // L: 26 - if (var2 != null) { // L: 27 + byte[] var2 = class17.StructDefinition_archive.takeFile(34, var0); + var1 = new StructComposition(); + if (var2 != null) { var1.decode(new Buffer(var2)); } - var1.postDecode(); // L: 28 - StructComposition.StructDefinition_cached.put(var1, (long)var0); // L: 29 - return var1; // L: 30 + var1.postDecode(); + StructComposition.StructDefinition_cached.put(var1, (long)var0); + return var1; } } @@ -91,22 +91,22 @@ class class18 implements Comparator { ) @Export("playSong") static void playSong(int var0) { - if (var0 == -1 && !Client.field743) { // L: 4341 - StructComposition.method3444(); // L: 4342 - } else if (var0 != -1 && var0 != Client.currentTrackGroupId && SecureRandomFuture.clientPreferences.musicVolume != 0 && !Client.field743) { // L: 4344 - Archive var1 = WorldMapScaleHandler.archive6; // L: 4345 - int var2 = SecureRandomFuture.clientPreferences.musicVolume; // L: 4346 - class260.musicPlayerStatus = 1; // L: 4348 - class124.musicTrackArchive = var1; // L: 4349 - VarcInt.musicTrackGroupId = var0; // L: 4350 - class260.musicTrackFileId = 0; // L: 4351 - ChatChannel.musicTrackVolume = var2; // L: 4352 - DynamicObject.musicTrackBoolean = false; // L: 4353 - class260.pcmSampleLength = 2; // L: 4354 + if (var0 == -1 && !Client.field743) { + StructComposition.method3444(); + } else if (var0 != -1 && var0 != Client.currentTrackGroupId && SecureRandomFuture.clientPreferences.musicVolume != 0 && !Client.field743) { + Archive var1 = WorldMapScaleHandler.archive6; + int var2 = SecureRandomFuture.clientPreferences.musicVolume; + class260.musicPlayerStatus = 1; + class124.musicTrackArchive = var1; + VarcInt.musicTrackGroupId = var0; + class260.musicTrackFileId = 0; + ChatChannel.musicTrackVolume = var2; + DynamicObject.musicTrackBoolean = false; + class260.pcmSampleLength = 2; } - Client.currentTrackGroupId = var0; // L: 4357 - } // L: 4358 + Client.currentTrackGroupId = var0; + } @ObfuscatedName("gb") @ObfuscatedSignature( @@ -114,21 +114,21 @@ class class18 implements Comparator { garbageValue = "-1637898710" ) static final void method293(Actor var0) { - if (var0.field1157 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > UserComparator5.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { // L: 4810 - int var1 = var0.field1157 - var0.field1136; // L: 4811 - int var2 = Client.cycle - var0.field1136; // L: 4812 - int var3 = var0.field1120 * 64 + var0.field1132 * 128; // L: 4813 - int var4 = var0.field1120 * 64 + var0.field1134 * 128; // L: 4814 - int var5 = var0.field1120 * 64 + var0.field1133 * 128; // L: 4815 - int var6 = var0.field1120 * 64 + var0.field1135 * 128; // L: 4816 - var0.x = (var5 * var2 + var3 * (var1 - var2)) / var1; // L: 4817 - var0.y = (var6 * var2 + var4 * (var1 - var2)) / var1; // L: 4818 + if (var0.field1157 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > UserComparator5.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { + int var1 = var0.field1157 - var0.field1136; + int var2 = Client.cycle - var0.field1136; + int var3 = var0.field1120 * 64 + var0.field1132 * 128; + int var4 = var0.field1120 * 64 + var0.field1134 * 128; + int var5 = var0.field1120 * 64 + var0.field1133 * 128; + int var6 = var0.field1120 * 64 + var0.field1135 * 128; + var0.x = (var5 * var2 + var3 * (var1 - var2)) / var1; + var0.y = (var6 * var2 + var4 * (var1 - var2)) / var1; } - var0.field1117 = 0; // L: 4820 - var0.orientation = var0.field1138; // L: 4821 - var0.rotation = var0.orientation; // L: 4822 - } // L: 4823 + var0.field1117 = 0; + var0.orientation = var0.field1138; + var0.rotation = var0.orientation; + } @ObfuscatedName("jh") @ObfuscatedSignature( @@ -136,8 +136,8 @@ class class18 implements Comparator { garbageValue = "-1056239746" ) static final void method297(int var0, int var1, int var2, boolean var3) { - if (class242.loadInterface(var0)) { // L: 10935 - class92.resizeInterface(MouseRecorder.Widget_interfaceComponents[var0], -1, var1, var2, var3); // L: 10936 + if (class242.loadInterface(var0)) { + class92.resizeInterface(MouseRecorder.Widget_interfaceComponents[var0], -1, var1, var2, var3); } - } // L: 10937 + } } diff --git a/runescape-client/src/main/java/class185.java b/runescape-client/src/main/java/class185.java index a2c039791f..a930e31971 100644 --- a/runescape-client/src/main/java/class185.java +++ b/runescape-client/src/main/java/class185.java @@ -32,8 +32,8 @@ public enum class185 implements MouseWheel { public byte field2121; class185(byte var3) { - this.field2121 = var3; // L: 14 - } // L: 15 + this.field2121 = var3; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -42,7 +42,7 @@ public enum class185 implements MouseWheel { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field2121; // L: 19 + return this.field2121; } @ObfuscatedName("w") @@ -51,22 +51,22 @@ public enum class185 implements MouseWheel { garbageValue = "964558054" ) static void method3731(boolean var0) { - byte var1 = 0; // L: 1047 - if (!AttackOption.method2356()) { // L: 1048 - var1 = 12; // L: 1049 - } else if (class295.client.method1154()) { // L: 1051 - var1 = 10; // L: 1052 + byte var1 = 0; + if (!AttackOption.method2356()) { + var1 = 12; + } else if (class295.client.method1154()) { + var1 = 10; } - PlayerType.method5521(var1); // L: 1054 - if (var0) { // L: 1055 - Login.Login_username = ""; // L: 1056 - Login.Login_password = ""; // L: 1057 - class148.field1651 = 0; // L: 1058 - BufferedSource.otp = ""; // L: 1059 + PlayerType.method5521(var1); + if (var0) { + Login.Login_username = ""; + Login.Login_password = ""; + class148.field1651 = 0; + BufferedSource.otp = ""; } - HealthBar.method2311(); // L: 1061 - WorldMapID.method4805(); // L: 1062 - } // L: 1063 + HealthBar.method2311(); + WorldMapID.method4805(); + } } diff --git a/runescape-client/src/main/java/class186.java b/runescape-client/src/main/java/class186.java index 2bbc5b6411..c47f87a806 100644 --- a/runescape-client/src/main/java/class186.java +++ b/runescape-client/src/main/java/class186.java @@ -40,10 +40,10 @@ public class class186 { public static int canvasWidth; static { - directions = new int[128][128]; // L: 6 - distances = new int[128][128]; // L: 7 - bufferX = new int[4096]; // L: 11 - bufferY = new int[4096]; // L: 12 + directions = new int[128][128]; + distances = new int[128][128]; + bufferX = new int[4096]; + bufferY = new int[4096]; } @ObfuscatedName("c") @@ -52,7 +52,7 @@ public class class186 { garbageValue = "45" ) static HorizontalAlignment[] method3739() { - return new HorizontalAlignment[]{HorizontalAlignment.field1829, HorizontalAlignment.field1826, HorizontalAlignment.HorizontalAlignment_centered}; // L: 14 + return new HorizontalAlignment[]{HorizontalAlignment.field1829, HorizontalAlignment.field1826, HorizontalAlignment.HorizontalAlignment_centered}; } @ObfuscatedName("c") @@ -61,8 +61,8 @@ public class class186 { garbageValue = "19498859" ) public static void method3740(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 + ObjectComposition.ObjectDefinition_archive = var0; + ObjectComposition.ObjectDefinition_modelsArchive = var1; + ObjectComposition.ObjectDefinition_isLowDetail = var2; + } } diff --git a/runescape-client/src/main/java/class19.java b/runescape-client/src/main/java/class19.java index 6fda49d4fa..0f4c226433 100644 --- a/runescape-client/src/main/java/class19.java +++ b/runescape-client/src/main/java/class19.java @@ -33,12 +33,12 @@ public class class19 { String field101; class19(Future var1) { - this.field100 = var1; // L: 10 - } // L: 11 + this.field100 = var1; + } class19(String var1) { - this.method306(var1); // L: 14 - } // L: 15 + this.method306(var1); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -46,17 +46,17 @@ public class class19 { garbageValue = "-1875205384" ) void method306(String var1) { - if (var1 == null) { // L: 18 + if (var1 == null) { var1 = ""; } - this.field101 = var1; // L: 19 - if (this.field100 != null) { // L: 20 + this.field101 = var1; + if (this.field100 != null) { this.field100.cancel(true); this.field100 = null; } - } // L: 24 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -64,7 +64,7 @@ public class class19 { garbageValue = "-1673495368" ) public final String method307() { - return this.field101; // L: 27 + return this.field101; } @ObfuscatedName("p") @@ -73,7 +73,7 @@ public class class19 { garbageValue = "-274193431" ) public boolean method331() { - return this.field101 != null || this.field100 == null; // L: 31 + return this.field101 != null || this.field100 == null; } @ObfuscatedName("m") @@ -82,7 +82,7 @@ public class class19 { garbageValue = "1434821214" ) public final boolean method309() { - return this.method331() ? true : this.field100.isDone(); // L: 35 36 + return this.method331() ? true : this.field100.isDone(); } @ObfuscatedName("t") @@ -91,18 +91,18 @@ public class class19 { garbageValue = "-45" ) public final class21 method310() { - if (this.method331()) { // L: 40 + if (this.method331()) { return new class21(this.field101); - } else if (!this.method309()) { // L: 41 + } else if (!this.method309()) { return null; } else { try { - return (class21)this.field100.get(); // L: 43 - } catch (Exception var3) { // L: 45 - String var2 = "Error retrieving REST request reply"; // L: 46 - System.err.println(var2 + "\r\n" + var3); // L: 47 - this.method306(var2); // L: 48 - return new class21(var2); // L: 49 + return (class21)this.field100.get(); + } catch (Exception var3) { + String var2 = "Error retrieving REST request reply"; + System.err.println(var2 + "\r\n" + var3); + this.method306(var2); + return new class21(var2); } } } @@ -113,8 +113,8 @@ public class class19 { garbageValue = "1773955351" ) public static void method330(AbstractArchive var0) { - FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0; // L: 21 - } // L: 22 + FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0; + } @ObfuscatedName("o") @ObfuscatedSignature( @@ -123,10 +123,10 @@ public class class19 { ) @Export("setLoginResponseString") static void setLoginResponseString(String var0, String var1, String var2) { - Login.Login_response1 = var0; // L: 1665 - Login.Login_response2 = var1; // L: 1666 - Login.Login_response3 = var2; // L: 1667 - } // L: 1668 + Login.Login_response1 = var0; + Login.Login_response2 = var1; + Login.Login_response3 = var2; + } @ObfuscatedName("ki") @ObfuscatedSignature( @@ -134,40 +134,40 @@ public class class19 { garbageValue = "111761811" ) static final boolean method329(Widget var0) { - int var1 = var0.contentType; // L: 12296 - if (var1 == 205) { // L: 12297 - Client.logoutTimer = 250; // L: 12298 - return true; // L: 12299 + int var1 = var0.contentType; + if (var1 == 205) { + Client.logoutTimer = 250; + return true; } else { int var2; int var3; - if (var1 >= 300 && var1 <= 313) { // L: 12301 - var2 = (var1 - 300) / 2; // L: 12302 - var3 = var1 & 1; // L: 12303 - Client.playerAppearance.changeAppearance(var2, var3 == 1); // L: 12304 + if (var1 >= 300 && var1 <= 313) { + var2 = (var1 - 300) / 2; + var3 = var1 & 1; + Client.playerAppearance.changeAppearance(var2, var3 == 1); } - if (var1 >= 314 && var1 <= 323) { // L: 12306 - var2 = (var1 - 314) / 2; // L: 12307 - var3 = var1 & 1; // L: 12308 - Client.playerAppearance.method5391(var2, var3 == 1); // L: 12309 + if (var1 >= 314 && var1 <= 323) { + var2 = (var1 - 314) / 2; + var3 = var1 & 1; + Client.playerAppearance.method5391(var2, var3 == 1); } if (var1 == 324) { - Client.playerAppearance.changeSex(false); // L: 12311 + Client.playerAppearance.changeSex(false); } - if (var1 == 325) { // L: 12312 + if (var1 == 325) { Client.playerAppearance.changeSex(true); } - if (var1 == 326) { // L: 12313 - PacketBufferNode var4 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2904, Client.packetWriter.isaacCipher); // L: 12315 - Client.playerAppearance.write(var4.packetBuffer); // L: 12316 - Client.packetWriter.addNode(var4); // L: 12317 - return true; // L: 12318 + if (var1 == 326) { + PacketBufferNode var4 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2904, Client.packetWriter.isaacCipher); + Client.playerAppearance.write(var4.packetBuffer); + Client.packetWriter.addNode(var4); + return true; } else { - return false; // L: 12320 + return false; } } } diff --git a/runescape-client/src/main/java/class194.java b/runescape-client/src/main/java/class194.java index 154ea4cf42..b3f108a68a 100644 --- a/runescape-client/src/main/java/class194.java +++ b/runescape-client/src/main/java/class194.java @@ -28,12 +28,12 @@ public class class194 { descriptor = "(Lpi;I)V" ) class194(Buffer var1, int var2) { - this.field2278 = new class113[var2]; // L: 13 - this.field2279 = var1.readUnsignedByte(); // L: 14 + this.field2278 = new class113[var2]; + this.field2279 = var1.readUnsignedByte(); - for (int var3 = 0; var3 < this.field2278.length; ++var3) { // L: 15 - class113 var4 = new class113(this.field2279, var1, false); // L: 16 - this.field2278[var3] = var4; // L: 17 + for (int var3 = 0; var3 < this.field2278.length; ++var3) { + class113 var4 = new class113(this.field2279, var1, false); + this.field2278[var3] = var4; } this.method3921(); @@ -45,16 +45,16 @@ public class class194 { garbageValue = "-1651999275" ) void method3921() { - class113[] var1 = this.field2278; // L: 24 + class113[] var1 = this.field2278; - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 25 - class113 var3 = var1[var2]; // L: 26 - if (var3.field1377 >= 0) { // L: 28 - var3.field1366 = this.field2278[var3.field1377]; // L: 29 + for (int var2 = 0; var2 < var1.length; ++var2) { + class113 var3 = var1[var2]; + if (var3.field1377 >= 0) { + var3.field1366 = this.field2278[var3.field1377]; } } - } // L: 34 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -62,7 +62,7 @@ public class class194 { garbageValue = "-18164" ) public int method3935() { - return this.field2278.length; // L: 37 + return this.field2278.length; } @ObfuscatedName("p") @@ -71,7 +71,7 @@ public class class194 { garbageValue = "-989126871" ) class113 method3923(int var1) { - return this.field2278[var1]; // L: 41 + return this.field2278[var1]; } @ObfuscatedName("m") @@ -80,7 +80,7 @@ public class class194 { garbageValue = "-59" ) class113[] method3924() { - return this.field2278; // L: 45 + return this.field2278; } @ObfuscatedName("t") @@ -89,8 +89,8 @@ public class class194 { garbageValue = "-1934519141" ) void method3939(class120 var1, int var2) { - this.method3940(var1, var2, (boolean[])null, false); // L: 49 - } // L: 50 + this.method3940(var1, var2, (boolean[])null, false); + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -98,20 +98,20 @@ public class class194 { garbageValue = "-2019767334" ) void method3940(class120 var1, int var2, boolean[] var3, boolean var4) { - int var5 = var1.method2694(); // L: 53 - int var6 = 0; // L: 54 - class113[] var7 = this.method3924(); // L: 56 + int var5 = var1.method2694(); + int var6 = 0; + class113[] var7 = this.method3924(); - for (int var8 = 0; var8 < var7.length; ++var8) { // L: 57 - class113 var9 = var7[var8]; // L: 58 - if (var3 == null || var4 == var3[var6]) { // L: 60 - var1.method2700(var2, var9, var6, var5); // L: 61 + for (int var8 = 0; var8 < var7.length; ++var8) { + class113 var9 = var7[var8]; + if (var3 == null || var4 == var3[var6]) { + var1.method2700(var2, var9, var6, var5); } - ++var6; // L: 63 + ++var6; } - } // L: 67 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -120,8 +120,8 @@ public class class194 { ) @Export("addGameMessage") static void addGameMessage(int var0, String var1, String var2) { - DevicePcmPlayerProvider.addChatMessage(var0, var1, var2, (String)null); // L: 19 - } // L: 20 + DevicePcmPlayerProvider.addChatMessage(var0, var1, var2, (String)null); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -129,13 +129,13 @@ public class class194 { garbageValue = "-1945600553" ) public static void method3937(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, AbstractArchive var3) { - CollisionMap.Widget_archive = var0; // L: 190 - Widget.Widget_modelsArchive = var1; // L: 191 - GraphicsObject.Widget_spritesArchive = var2; // L: 192 + CollisionMap.Widget_archive = var0; + Widget.Widget_modelsArchive = var1; + GraphicsObject.Widget_spritesArchive = var2; NPC.Widget_fontsArchive = var3; MouseRecorder.Widget_interfaceComponents = new Widget[CollisionMap.Widget_archive.getGroupCount()][]; Widget.Widget_loadedInterfaces = new boolean[CollisionMap.Widget_archive.getGroupCount()]; - } // L: 196 + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -143,73 +143,73 @@ public class class194 { garbageValue = "16" ) public static byte[] method3933(CharSequence var0) { - int var1 = var0.length(); // L: 77 - byte[] var2 = new byte[var1]; // L: 78 + int var1 = var0.length(); + byte[] var2 = new byte[var1]; - for (int var3 = 0; var3 < var1; ++var3) { // L: 79 - char var4 = var0.charAt(var3); // L: 80 - if (var4 > 0 && var4 < 128 || var4 >= 160 && var4 <= 255) { // L: 81 + for (int var3 = 0; var3 < var1; ++var3) { + char var4 = var0.charAt(var3); + if (var4 > 0 && var4 < 128 || var4 >= 160 && var4 <= 255) { var2[var3] = (byte)var4; - } else if (var4 == 8364) { // L: 82 + } else if (var4 == 8364) { var2[var3] = -128; - } else if (var4 == 8218) { // L: 83 + } else if (var4 == 8218) { var2[var3] = -126; - } else if (var4 == 402) { // L: 84 + } else if (var4 == 402) { var2[var3] = -125; - } else if (var4 == 8222) { // L: 85 + } else if (var4 == 8222) { var2[var3] = -124; - } else if (var4 == 8230) { // L: 86 + } else if (var4 == 8230) { var2[var3] = -123; - } else if (var4 == 8224) { // L: 87 + } else if (var4 == 8224) { var2[var3] = -122; - } else if (var4 == 8225) { // L: 88 + } else if (var4 == 8225) { var2[var3] = -121; - } else if (var4 == 710) { // L: 89 + } else if (var4 == 710) { var2[var3] = -120; - } else if (var4 == 8240) { // L: 90 + } else if (var4 == 8240) { var2[var3] = -119; } else if (var4 == 352) { - var2[var3] = -118; // L: 91 - } else if (var4 == 8249) { // L: 92 + var2[var3] = -118; + } else if (var4 == 8249) { var2[var3] = -117; - } else if (var4 == 338) { // L: 93 + } else if (var4 == 338) { var2[var3] = -116; - } else if (var4 == 381) { // L: 94 + } else if (var4 == 381) { var2[var3] = -114; - } else if (var4 == 8216) { // L: 95 + } else if (var4 == 8216) { var2[var3] = -111; - } else if (var4 == 8217) { // L: 96 + } else if (var4 == 8217) { var2[var3] = -110; - } else if (var4 == 8220) { // L: 97 + } else if (var4 == 8220) { var2[var3] = -109; - } else if (var4 == 8221) { // L: 98 + } else if (var4 == 8221) { var2[var3] = -108; - } else if (var4 == 8226) { // L: 99 + } else if (var4 == 8226) { var2[var3] = -107; - } else if (var4 == 8211) { // L: 100 + } else if (var4 == 8211) { var2[var3] = -106; - } else if (var4 == 8212) { // L: 101 + } else if (var4 == 8212) { var2[var3] = -105; - } else if (var4 == 732) { // L: 102 + } else if (var4 == 732) { var2[var3] = -104; - } else if (var4 == 8482) { // L: 103 + } else if (var4 == 8482) { var2[var3] = -103; - } else if (var4 == 353) { // L: 104 + } else if (var4 == 353) { var2[var3] = -102; } else if (var4 == 8250) { - var2[var3] = -101; // L: 105 - } else if (var4 == 339) { // L: 106 + var2[var3] = -101; + } else if (var4 == 339) { var2[var3] = -100; - } else if (var4 == 382) { // L: 107 + } else if (var4 == 382) { var2[var3] = -98; - } else if (var4 == 376) { // L: 108 + } else if (var4 == 376) { var2[var3] = -97; } else { - var2[var3] = 63; // L: 109 + var2[var3] = 63; } } - return var2; // L: 111 + return var2; } @ObfuscatedName("h") @@ -218,10 +218,10 @@ public class class194 { garbageValue = "-13840" ) public static int method3926(int var0) { - if (var0 > 0) { // L: 193 + if (var0 > 0) { return 1; } else { - return var0 < 0 ? -1 : 0; // L: 194 195 + return var0 < 0 ? -1 : 0; } } } diff --git a/runescape-client/src/main/java/class20.java b/runescape-client/src/main/java/class20.java index f16daf160d..760edba396 100644 --- a/runescape-client/src/main/java/class20.java +++ b/runescape-client/src/main/java/class20.java @@ -34,20 +34,20 @@ public class class20 implements Callable { descriptor = "(Lg;Lo;)V" ) class20(class14 var1, class10 var2) { - this.this$0 = var1; // L: 46 - this.field110 = var2; // L: 47 - } // L: 48 + this.this$0 = var1; + this.field110 = var2; + } public Object call() throws Exception { try { - while (this.field110.method105()) { // L: 53 - Bounds.method6608(10L); // L: 54 + while (this.field110.method105()) { + Bounds.method6608(10L); } - } catch (IOException var2) { // L: 57 - return new class21("Error servicing REST query: " + var2.getMessage()); // L: 58 + } catch (IOException var2) { + return new class21("Error servicing REST query: " + var2.getMessage()); } - return this.field110.method106(); // L: 60 + return this.field110.method106(); } @ObfuscatedName("c") @@ -56,7 +56,7 @@ public class class20 implements Callable { garbageValue = "-76614425" ) public static boolean method332(int var0) { - return (var0 & 1) != 0; // L: 9 + return (var0 & 1) != 0; } @ObfuscatedName("ke") @@ -66,8 +66,8 @@ public class class20 implements Callable { ) @Export("updateSoundEffectVolume") static final void updateSoundEffectVolume(int var0) { - var0 = Math.min(Math.max(var0, 0), 127); // L: 12149 - SecureRandomFuture.clientPreferences.soundEffectsVolume = var0; // L: 12150 - class127.savePreferences(); // L: 12151 - } // L: 12152 + var0 = Math.min(Math.max(var0, 0), 127); + SecureRandomFuture.clientPreferences.soundEffectsVolume = var0; + class127.savePreferences(); + } } diff --git a/runescape-client/src/main/java/class21.java b/runescape-client/src/main/java/class21.java index 9fe0be4757..79b050dd9e 100644 --- a/runescape-client/src/main/java/class21.java +++ b/runescape-client/src/main/java/class21.java @@ -32,30 +32,30 @@ public class class21 { final String field114; class21(String var1) { - this.field115 = 400; // L: 32 - this.field114 = ""; // L: 33 - } // L: 34 + this.field115 = 400; + this.field114 = ""; + } class21(HttpURLConnection var1) throws IOException { - this.field115 = var1.getResponseCode(); // L: 14 - var1.getResponseMessage(); // L: 15 - var1.getHeaderFields(); // L: 16 - StringBuilder var2 = new StringBuilder(); // L: 17 - InputStream var3 = this.field115 >= 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 + this.field115 = var1.getResponseCode(); + var1.getResponseMessage(); + var1.getHeaderFields(); + StringBuilder var2 = new StringBuilder(); + InputStream var3 = this.field115 >= 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 + var3.close(); } - this.field114 = var2.toString(); // L: 28 - } // L: 29 + this.field114 = var2.toString(); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -63,7 +63,7 @@ public class class21 { garbageValue = "1543760704" ) public int method338() { - return this.field115; // L: 37 + return this.field115; } @ObfuscatedName("b") @@ -72,7 +72,7 @@ public class class21 { garbageValue = "128" ) public String method339() { - return this.field114; // L: 41 + return this.field114; } @ObfuscatedName("if") @@ -82,18 +82,18 @@ public class class21 { ) @Export("insertMenuItem") static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) { - if (!Client.isMenuOpen) { // L: 10045 - if (Client.menuOptionsCount < 500) { // L: 10046 - Client.menuActions[Client.menuOptionsCount] = var0; // L: 10047 - Client.menuTargets[Client.menuOptionsCount] = var1; // L: 10048 - Client.menuOpcodes[Client.menuOptionsCount] = var2; // L: 10049 - Client.menuIdentifiers[Client.menuOptionsCount] = var3; // L: 10050 - Client.menuArguments1[Client.menuOptionsCount] = var4; // L: 10051 - Client.menuArguments2[Client.menuOptionsCount] = var5; // L: 10052 - Client.menuShiftClick[Client.menuOptionsCount] = var6; // L: 10053 - ++Client.menuOptionsCount; // L: 10054 + if (!Client.isMenuOpen) { + if (Client.menuOptionsCount < 500) { + Client.menuActions[Client.menuOptionsCount] = var0; + Client.menuTargets[Client.menuOptionsCount] = var1; + Client.menuOpcodes[Client.menuOptionsCount] = var2; + Client.menuIdentifiers[Client.menuOptionsCount] = var3; + Client.menuArguments1[Client.menuOptionsCount] = var4; + Client.menuArguments2[Client.menuOptionsCount] = var5; + Client.menuShiftClick[Client.menuOptionsCount] = var6; + ++Client.menuOptionsCount; } } - } // L: 10056 + } } diff --git a/runescape-client/src/main/java/class213.java b/runescape-client/src/main/java/class213.java index 8e68dfc040..3d2bb7a808 100644 --- a/runescape-client/src/main/java/class213.java +++ b/runescape-client/src/main/java/class213.java @@ -9,7 +9,7 @@ public class class213 { garbageValue = "1655670329" ) static class288[] method4355() { - return new class288[]{class288.field3436, class288.field3438}; // L: 35 + return new class288[]{class288.field3436, class288.field3438}; } @ObfuscatedName("b") @@ -18,88 +18,88 @@ public class class213 { garbageValue = "244172504" ) static float method4354(class115 var0, float var1, boolean var2) { - float var3 = 0.0F; // L: 138 - if (var0 != null && var0.method2637() != 0) { // L: 139 - float var4 = (float)var0.field1393[0].field1359; // L: 142 - float var5 = (float)var0.field1393[var0.method2637() - 1].field1359; // L: 143 - float var6 = var5 - var4; // L: 144 - if (0.0D == (double)var6) { // L: 145 - return var0.field1393[0].field1349; // L: 146 + float var3 = 0.0F; + if (var0 != null && var0.method2637() != 0) { + float var4 = (float)var0.field1393[0].field1359; + float var5 = (float)var0.field1393[var0.method2637() - 1].field1359; + float var6 = var5 - var4; + if (0.0D == (double)var6) { + return var0.field1393[0].field1349; } else { - float var7 = 0.0F; // L: 148 - if (var1 > var5) { // L: 149 - var7 = (var1 - var5) / var6; // L: 150 + float var7 = 0.0F; + if (var1 > var5) { + var7 = (var1 - var5) / var6; } else { - var7 = (var1 - var4) / var6; // L: 153 + var7 = (var1 - var4) / var6; } - double var8 = (double)((int)var7); // L: 155 - float var10 = Math.abs((float)((double)var7 - var8)); // L: 156 - float var11 = var10 * var6; // L: 157 - var8 = Math.abs(var8 + 1.0D); // L: 158 - double var12 = var8 / 2.0D; // L: 159 - double var14 = (double)((int)var12); // L: 160 - var10 = (float)(var12 - var14); // L: 161 + double var8 = (double)((int)var7); + float var10 = Math.abs((float)((double)var7 - var8)); + float var11 = var10 * var6; + var8 = Math.abs(var8 + 1.0D); + double var12 = var8 / 2.0D; + double var14 = (double)((int)var12); + var10 = (float)(var12 - var14); float var16; float var17; - if (var2) { // L: 164 - if (var0.field1410 == class114.field1386) { // L: 165 - if ((double)var10 != 0.0D) { // L: 166 - var11 += var4; // L: 167 + if (var2) { + if (var0.field1410 == class114.field1386) { + if ((double)var10 != 0.0D) { + var11 += var4; } else { - var11 = var5 - var11; // L: 170 + var11 = var5 - var11; } - } else if (var0.field1410 != class114.field1384 && var0.field1410 != class114.field1391) { // L: 173 - if (var0.field1410 == class114.field1383) { // L: 176 - var11 = var4 - var1; // L: 177 - var16 = var0.field1393[0].field1350; // L: 178 - var17 = var0.field1393[0].field1351; // L: 179 - var3 = var0.field1393[0].field1349; // L: 180 - if (0.0D != (double)var16) { // L: 181 - var3 -= var11 * var17 / var16; // L: 182 + } else if (var0.field1410 != class114.field1384 && var0.field1410 != class114.field1391) { + if (var0.field1410 == class114.field1383) { + var11 = var4 - var1; + var16 = var0.field1393[0].field1350; + var17 = var0.field1393[0].field1351; + var3 = var0.field1393[0].field1349; + if (0.0D != (double)var16) { + var3 -= var11 * var17 / var16; } - return var3; // L: 184 + return var3; } } else { - var11 = var5 - var11; // L: 174 + var11 = var5 - var11; } - } else if (var0.field1396 == class114.field1386) { // L: 188 - if ((double)var10 != 0.0D) { // L: 189 - var11 = var5 - var11; // L: 190 + } else if (var0.field1396 == class114.field1386) { + if ((double)var10 != 0.0D) { + var11 = var5 - var11; } else { - var11 += var4; // L: 193 + var11 += var4; } - } else if (var0.field1396 != class114.field1384 && var0.field1396 != class114.field1391) { // L: 196 - if (var0.field1396 == class114.field1383) { // L: 199 - var11 = var1 - var5; // L: 200 - var16 = var0.field1393[var0.method2637() - 1].field1352; // L: 201 - var17 = var0.field1393[var0.method2637() - 1].field1357; // L: 202 - var3 = var0.field1393[var0.method2637() - 1].field1349; // L: 203 - if (0.0D != (double)var16) { // L: 204 - var3 += var17 * var11 / var16; // L: 205 + } else if (var0.field1396 != class114.field1384 && var0.field1396 != class114.field1391) { + if (var0.field1396 == class114.field1383) { + var11 = var1 - var5; + var16 = var0.field1393[var0.method2637() - 1].field1352; + var17 = var0.field1393[var0.method2637() - 1].field1357; + var3 = var0.field1393[var0.method2637() - 1].field1349; + if (0.0D != (double)var16) { + var3 += var17 * var11 / var16; } - return var3; // L: 207 + return var3; } } else { - var11 += var4; // L: 197 + var11 += var4; } - var3 = class14.method210(var0, var11); // L: 210 + var3 = class14.method210(var0, var11); float var18; - if (var2 && var0.field1410 == class114.field1391) { // L: 212 - var18 = var0.field1393[var0.method2637() - 1].field1349 - var0.field1393[0].field1349; // L: 213 - var3 = (float)((double)var3 - var8 * (double)var18); // L: 214 - } else if (!var2 && var0.field1396 == class114.field1391) { // L: 216 - var18 = var0.field1393[var0.method2637() - 1].field1349 - var0.field1393[0].field1349; // L: 217 - var3 = (float)((double)var3 + (double)var18 * var8); // L: 218 + if (var2 && var0.field1410 == class114.field1391) { + var18 = var0.field1393[var0.method2637() - 1].field1349 - var0.field1393[0].field1349; + var3 = (float)((double)var3 - var8 * (double)var18); + } else if (!var2 && var0.field1396 == class114.field1391) { + var18 = var0.field1393[var0.method2637() - 1].field1349 - var0.field1393[0].field1349; + var3 = (float)((double)var3 + (double)var18 * var8); } - return var3; // L: 220 + return var3; } } else { - return var3; // L: 140 + return var3; } } @@ -109,16 +109,16 @@ public class class213 { garbageValue = "1639930062" ) public static void method4356() { - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 107 - if (ArchiveDiskActionHandler.field3815 != 0) { // L: 108 - ArchiveDiskActionHandler.field3815 = 1; // L: 109 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { + if (ArchiveDiskActionHandler.field3815 != 0) { + ArchiveDiskActionHandler.field3815 = 1; try { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); // L: 111 - } catch (InterruptedException var3) { // L: 113 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); + } catch (InterruptedException var3) { } } } - } // L: 116 + } } diff --git a/runescape-client/src/main/java/class221.java b/runescape-client/src/main/java/class221.java index 72cbf95fa4..e7860d8c82 100644 --- a/runescape-client/src/main/java/class221.java +++ b/runescape-client/src/main/java/class221.java @@ -66,23 +66,23 @@ public class class221 implements WorldMapSection { ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field2659) { // L: 22 + if (var1.regionLowX > this.field2659) { var1.regionLowX = this.field2659; } if (var1.regionHighX < this.field2659) { - var1.regionHighX = this.field2659; // L: 23 + var1.regionHighX = this.field2659; } - if (var1.regionLowY > this.field2660) { // L: 24 + if (var1.regionLowY > this.field2660) { var1.regionLowY = this.field2660; } - if (var1.regionHighY < this.field2660) { // L: 25 + if (var1.regionHighY < this.field2660) { var1.regionHighY = this.field2660; } - } // L: 26 + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -91,10 +91,10 @@ public class class221 implements WorldMapSection { ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.field2658 && var1 < this.field2664 + this.field2658) { // L: 30 - return var2 >= (this.field2657 << 6) + (this.field2661 << 3) && var2 <= (this.field2657 << 6) + (this.field2661 << 3) + 7 && var3 >= (this.field2662 << 6) + (this.field2656 << 3) && var3 <= (this.field2662 << 6) + (this.field2656 << 3) + 7; // L: 33 + if (var1 >= this.field2658 && var1 < this.field2664 + this.field2658) { + return var2 >= (this.field2657 << 6) + (this.field2661 << 3) && var2 <= (this.field2657 << 6) + (this.field2661 << 3) + 7 && var3 >= (this.field2662 << 6) + (this.field2656 << 3) && var3 <= (this.field2662 << 6) + (this.field2656 << 3) + 7; } else { - return false; // L: 31 + return false; } } @@ -105,7 +105,7 @@ public class class221 implements WorldMapSection { ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >= (this.field2659 << 6) + (this.field2663 << 3) && var1 <= (this.field2659 << 6) + (this.field2663 << 3) + 7 && var2 >= (this.field2660 << 6) + (this.field2655 << 3) && var2 <= (this.field2660 << 6) + (this.field2655 << 3) + 7; // L: 38 + return var1 >= (this.field2659 << 6) + (this.field2663 << 3) && var1 <= (this.field2659 << 6) + (this.field2663 << 3) + 7 && var2 >= (this.field2660 << 6) + (this.field2655 << 3) && var2 <= (this.field2660 << 6) + (this.field2655 << 3) + 7; } @ObfuscatedName("m") @@ -115,11 +115,11 @@ public class class221 implements WorldMapSection { ) @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)) { + return null; } else { - int[] var4 = new int[]{var2 + (this.field2659 * 64 - this.field2657 * 64) + (this.field2663 * 8 - this.field2661 * 8), var3 + (this.field2660 * 64 - this.field2662 * 64) + (this.field2655 * 8 - this.field2656 * 8)}; // L: 46 47 48 - return var4; // L: 49 + int[] var4 = new int[]{var2 + (this.field2659 * 64 - this.field2657 * 64) + (this.field2663 * 8 - this.field2661 * 8), var3 + (this.field2660 * 64 - this.field2662 * 64) + (this.field2655 * 8 - this.field2656 * 8)}; + return var4; } } @@ -130,12 +130,12 @@ public class class221 implements WorldMapSection { ) @Export("coord") public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { // L: 54 - return null; // L: 55 + if (!this.containsPosition(var1, var2)) { + return null; } else { - int var3 = this.field2657 * 64 - this.field2659 * 64 + (this.field2661 * 8 - this.field2663 * 8) + var1; // L: 57 - int var4 = var2 + (this.field2662 * 64 - this.field2660 * 64) + (this.field2656 * 8 - this.field2655 * 8); // L: 58 - return new Coord(this.field2658, var3, var4); // L: 59 + int var3 = this.field2657 * 64 - this.field2659 * 64 + (this.field2661 * 8 - this.field2663 * 8) + var1; + int var4 = var2 + (this.field2662 * 64 - this.field2660 * 64) + (this.field2656 * 8 - this.field2655 * 8); + return new Coord(this.field2658, var3, var4); } } @@ -146,18 +146,18 @@ public class class221 implements WorldMapSection { ) @Export("read") public void read(Buffer var1) { - this.field2658 = var1.readUnsignedByte(); // L: 64 - this.field2664 = var1.readUnsignedByte(); // L: 65 - this.field2657 = var1.readUnsignedShort(); // L: 66 - this.field2661 = var1.readUnsignedByte(); // L: 67 - this.field2662 = var1.readUnsignedShort(); // L: 68 - this.field2656 = var1.readUnsignedByte(); // L: 69 - this.field2659 = var1.readUnsignedShort(); // L: 70 - this.field2663 = var1.readUnsignedByte(); // L: 71 - this.field2660 = var1.readUnsignedShort(); // L: 72 - this.field2655 = var1.readUnsignedByte(); // L: 73 - this.method4678(); // L: 74 - } // L: 75 + this.field2658 = var1.readUnsignedByte(); + this.field2664 = var1.readUnsignedByte(); + this.field2657 = var1.readUnsignedShort(); + this.field2661 = var1.readUnsignedByte(); + this.field2662 = var1.readUnsignedShort(); + this.field2656 = var1.readUnsignedByte(); + this.field2659 = var1.readUnsignedShort(); + this.field2663 = var1.readUnsignedByte(); + this.field2660 = var1.readUnsignedShort(); + this.field2655 = var1.readUnsignedByte(); + this.method4678(); + } @ObfuscatedName("j") @ObfuscatedSignature( @@ -165,7 +165,7 @@ public class class221 implements WorldMapSection { garbageValue = "1997336841" ) void method4678() { - } // L: 77 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -173,7 +173,7 @@ public class class221 implements WorldMapSection { garbageValue = "34" ) static String method4705(int var0) { - return ""; // L: 18 + return ""; } @ObfuscatedName("c") @@ -182,6 +182,6 @@ public class class221 implements WorldMapSection { garbageValue = "-91" ) public static void method4700(AbstractArchive var0) { - class17.StructDefinition_archive = var0; // L: 19 - } // L: 20 + class17.StructDefinition_archive = var0; + } } diff --git a/runescape-client/src/main/java/class231.java b/runescape-client/src/main/java/class231.java index 386b1d3f11..aaf22494a6 100644 --- a/runescape-client/src/main/java/class231.java +++ b/runescape-client/src/main/java/class231.java @@ -25,13 +25,13 @@ public class class231 { final int value; static { - field2736 = new class231(0); // L: 4 - field2735 = new class231(1); // L: 5 + field2736 = new class231(0); + field2735 = new class231(1); } class231(int var1) { - this.value = var1; // L: 9 - } // L: 10 + this.value = var1; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -40,16 +40,16 @@ public class class231 { ) public static PacketBufferNode method4802() { PacketBufferNode var0; - if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { // L: 47 - var0 = new PacketBufferNode(); // L: 48 + if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { + var0 = new PacketBufferNode(); } else { - var0 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 51 + var0 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; } - var0.clientPacket = null; // L: 54 - var0.clientPacketLength = 0; // L: 55 - var0.packetBuffer = new PacketBuffer(5000); // L: 56 - return var0; // L: 57 + var0.clientPacket = null; + var0.clientPacketLength = 0; + var0.packetBuffer = new PacketBuffer(5000); + return var0; } @ObfuscatedName("p") @@ -59,37 +59,37 @@ public class class231 { ) @Export("getPreferencesFile") public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { - File var3 = new File(class13.cacheDir, "preferences" + var0 + ".dat"); // L: 73 - if (var3.exists()) { // L: 74 + File var3 = new File(class13.cacheDir, "preferences" + var0 + ".dat"); + if (var3.exists()) { try { - AccessFile var10 = new AccessFile(var3, "rw", 10000L); // L: 76 - return var10; // L: 77 - } catch (IOException var9) { // L: 79 + AccessFile var10 = new AccessFile(var3, "rw", 10000L); + return var10; + } catch (IOException var9) { } } - String var4 = ""; // L: 81 - if (UserComparator3.cacheGamebuild == 33) { // L: 82 + String var4 = ""; + if (UserComparator3.cacheGamebuild == 33) { var4 = "_rc"; - } else if (UserComparator3.cacheGamebuild == 34) { // L: 83 + } else if (UserComparator3.cacheGamebuild == 34) { var4 = "_wip"; } - File var5 = new File(class409.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); // L: 84 + File var5 = new File(class409.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); AccessFile var6; - if (!var2 && var5.exists()) { // L: 85 + if (!var2 && var5.exists()) { try { - var6 = new AccessFile(var5, "rw", 10000L); // L: 87 - return var6; // L: 88 - } catch (IOException var8) { // L: 90 + var6 = new AccessFile(var5, "rw", 10000L); + return var6; + } catch (IOException var8) { } } try { - var6 = new AccessFile(var3, "rw", 10000L); // L: 93 - return var6; // L: 94 - } catch (IOException var7) { // L: 96 - throw new RuntimeException(); // L: 97 + var6 = new AccessFile(var3, "rw", 10000L); + return var6; + } catch (IOException var7) { + throw new RuntimeException(); } } @@ -100,29 +100,29 @@ public class class231 { ) @Export("readPlayerUpdate") static void readPlayerUpdate(PacketBuffer var0, int var1) { - boolean var2 = var0.readBits(1) == 1; // L: 197 - if (var2) { // L: 198 + boolean var2 = var0.readBits(1) == 1; + if (var2) { 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.field1055 = false; // L: 203 - } else if (Client.localPlayerIndex == var1) { // L: 206 + int var3 = var0.readBits(2); + Player var4 = Client.players[var1]; + if (var3 == 0) { + if (var2) { + var4.field1055 = false; + } else if (Client.localPlayerIndex == var1) { throw new RuntimeException(); } else { - Players.Players_regions[var1] = (var4.plane << 28) + (TileItem.baseY + var4.pathY[0] >> 13) + (class131.baseX + var4.pathX[0] >> 13 << 14); // L: 207 - if (var4.field1122 != -1) { // L: 208 + Players.Players_regions[var1] = (var4.plane << 28) + (TileItem.baseY + var4.pathY[0] >> 13) + (class131.baseX + var4.pathX[0] >> 13 << 14); + if (var4.field1122 != -1) { Players.Players_orientations[var1] = var4.field1122; } else { - Players.Players_orientations[var1] = var4.orientation; // L: 209 + Players.Players_orientations[var1] = var4.orientation; } - Players.Players_targetIndices[var1] = var4.targetIndex; // L: 210 - Client.players[var1] = null; // L: 211 - if (var0.readBits(1) != 0) { // L: 212 + Players.Players_targetIndices[var1] = var4.targetIndex; + Client.players[var1] = null; + if (var0.readBits(1) != 0) { Decimator.updateExternalPlayer(var0, var1); } @@ -131,174 +131,174 @@ public class class231 { 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 + if (var3 == 1) { + var5 = var0.readBits(3); + var6 = var4.pathX[0]; + var7 = var4.pathY[0]; + if (var5 == 0) { --var6; - } else if (var5 == 4) { // L: 229 + --var7; + } else if (var5 == 1) { + --var7; + } else if (var5 == 2) { + ++var6; + --var7; + } else if (var5 == 3) { + --var6; + } else if (var5 == 4) { + ++var6; + } else if (var5 == 5) { + --var6; + ++var7; + } else if (var5 == 6) { + ++var7; + } else if (var5 == 7) { ++var6; - } 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.field1055 = false; // L: 241 - } else if (var2) { // L: 243 - var4.field1055 = true; // L: 244 - var4.tileX = var6; // L: 245 - var4.tileY = var7; // L: 246 + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { + var4.resetPath(var6, var7); + var4.field1055 = false; + } else if (var2) { + var4.field1055 = true; + var4.tileX = var6; + var4.tileY = var7; } else { - var4.field1055 = false; // L: 249 - var4.method2175(var6, var7, Players.field1246[var1]); // L: 250 + var4.field1055 = false; + var4.method2175(var6, var7, Players.field1246[var1]); } - } 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 + } else if (var3 == 2) { + var5 = var0.readBits(4); + var6 = var4.pathX[0]; + var7 = var4.pathY[0]; + if (var5 == 0) { var6 -= 2; - } else if (var5 == 8) { // L: 284 + var7 -= 2; + } else if (var5 == 1) { + --var6; + var7 -= 2; + } else if (var5 == 2) { + var7 -= 2; + } else if (var5 == 3) { + ++var6; + var7 -= 2; + } else if (var5 == 4) { + var6 += 2; + var7 -= 2; + } else if (var5 == 5) { + var6 -= 2; + --var7; + } else if (var5 == 6) { + var6 += 2; + --var7; + } else if (var5 == 7) { + var6 -= 2; + } else if (var5 == 8) { + var6 += 2; + } else if (var5 == 9) { + var6 -= 2; + ++var7; + } else if (var5 == 10) { + var6 += 2; + ++var7; + } else if (var5 == 11) { + var6 -= 2; + var7 += 2; + } else if (var5 == 12) { + --var6; + var7 += 2; + } else if (var5 == 13) { + var7 += 2; + } else if (var5 == 14) { + ++var6; + var7 += 2; + } else if (var5 == 15) { var6 += 2; - } 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.field1055 = false; // L: 312 - } else if (var2) { // L: 314 - var4.field1055 = true; // L: 315 - var4.tileX = var6; // L: 316 - var4.tileY = var7; // L: 317 + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { + var4.resetPath(var6, var7); + var4.field1055 = false; + } else if (var2) { + var4.field1055 = true; + var4.tileX = var6; + var4.tileY = var7; } else { - var4.field1055 = false; // L: 320 - var4.method2175(var6, var7, Players.field1246[var1]); // L: 321 + var4.field1055 = false; + var4.method2175(var6, var7, Players.field1246[var1]); } } else { - var5 = var0.readBits(1); // L: 325 + var5 = var0.readBits(1); 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 + if (var5 == 0) { + var6 = var0.readBits(12); + var7 = var6 >> 10; + var8 = var6 >> 5 & 31; + if (var8 > 15) { var8 -= 32; } - var9 = var6 & 31; // L: 331 - if (var9 > 15) { // L: 332 + var9 = var6 & 31; + if (var9 > 15) { 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.field1055 = true; // L: 340 - var4.tileX = var10; // L: 341 - var4.tileY = var11; // L: 342 + var10 = var8 + var4.pathX[0]; + var11 = var9 + var4.pathY[0]; + if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { + if (var2) { + var4.field1055 = true; + var4.tileX = var10; + var4.tileY = var11; } else { - var4.field1055 = false; // L: 345 - var4.method2175(var10, var11, Players.field1246[var1]); // L: 346 + var4.field1055 = false; + var4.method2175(var10, var11, Players.field1246[var1]); } } else { - var4.resetPath(var10, var11); // L: 336 - var4.field1055 = false; // L: 337 + var4.resetPath(var10, var11); + var4.field1055 = false; } - var4.plane = (byte)(var7 + var4.plane & 3); // L: 348 - if (Client.localPlayerIndex == var1) { // L: 349 + var4.plane = (byte)(var7 + var4.plane & 3); + if (Client.localPlayerIndex == var1) { class20.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 + class131.baseX + var4.pathX[0] & 16383) - class131.baseX; // L: 356 - var11 = (var9 + TileItem.baseY + var4.pathY[0] & 16383) - TileItem.baseY; // L: 357 - if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { // L: 358 - if (var2) { // L: 362 - var4.field1055 = true; // L: 363 - var4.tileX = var10; // L: 364 - var4.tileY = var11; // L: 365 + var6 = var0.readBits(30); + var7 = var6 >> 28; + var8 = var6 >> 14 & 16383; + var9 = var6 & 16383; + var10 = (var8 + class131.baseX + var4.pathX[0] & 16383) - class131.baseX; + var11 = (var9 + TileItem.baseY + var4.pathY[0] & 16383) - TileItem.baseY; + if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { + if (var2) { + var4.field1055 = true; + var4.tileX = var10; + var4.tileY = var11; } else { - var4.field1055 = false; // L: 368 - var4.method2175(var10, var11, Players.field1246[var1]); // L: 369 + var4.field1055 = false; + var4.method2175(var10, var11, Players.field1246[var1]); } } else { - var4.resetPath(var10, var11); // L: 359 - var4.field1055 = false; // L: 360 + var4.resetPath(var10, var11); + var4.field1055 = false; } - var4.plane = (byte)(var7 + var4.plane & 3); // L: 371 - if (Client.localPlayerIndex == var1) { // L: 372 + var4.plane = (byte)(var7 + var4.plane & 3); + if (Client.localPlayerIndex == var1) { class20.Client_plane = var4.plane; } } } } - } // L: 204 213 252 323 350 373 + } } diff --git a/runescape-client/src/main/java/class233.java b/runescape-client/src/main/java/class233.java index 0d8824e214..b68e9df03e 100644 --- a/runescape-client/src/main/java/class233.java +++ b/runescape-client/src/main/java/class233.java @@ -11,63 +11,63 @@ public class class233 { ) @Export("addPlayerToMenu") static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { - if (class340.localPlayer != var0) { // L: 10310 - if (Client.menuOptionsCount < 400) { // L: 10311 + if (class340.localPlayer != var0) { + if (Client.menuOptionsCount < 400) { String var4; - if (var0.skillLevel == 0) { // L: 10313 + if (var0.skillLevel == 0) { var4 = var0.actions[0] + var0.username + var0.actions[1] + Tiles.method2108(var0.combatLevel, class340.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: 10314 + var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; } int var5; - if (Client.isItemSelected == 1) { // L: 10315 - class11.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator5.colorStartTag(16777215) + var4, 14, var1, var2, var3); // L: 10316 - } else if (Client.isSpellSelected) { // L: 10319 - if ((class91.selectedSpellFlags & 8) == 8) { // L: 10320 - class11.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator5.colorStartTag(16777215) + var4, 15, var1, var2, var3); // L: 10321 + if (Client.isItemSelected == 1) { + class11.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator5.colorStartTag(16777215) + var4, 14, var1, var2, var3); + } else if (Client.isSpellSelected) { + if ((class91.selectedSpellFlags & 8) == 8) { + class11.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator5.colorStartTag(16777215) + var4, 15, var1, var2, var3); } } else { - for (var5 = 7; var5 >= 0; --var5) { // L: 10326 - if (Client.playerMenuActions[var5] != null) { // L: 10327 - short var6 = 0; // L: 10328 - if (Client.playerMenuActions[var5].equalsIgnoreCase("Attack")) { // L: 10329 - if (Client.playerAttackOption == AttackOption.AttackOption_hidden) { // L: 10330 + for (var5 = 7; var5 >= 0; --var5) { + if (Client.playerMenuActions[var5] != null) { + short var6 = 0; + if (Client.playerMenuActions[var5].equalsIgnoreCase("Attack")) { + if (Client.playerAttackOption == AttackOption.AttackOption_hidden) { continue; } - if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class340.localPlayer.combatLevel) { // L: 10331 - var6 = 2000; // L: 10332 + if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class340.localPlayer.combatLevel) { + var6 = 2000; } - if (class340.localPlayer.team != 0 && var0.team != 0) { // L: 10334 - if (var0.team == class340.localPlayer.team) { // L: 10335 + if (class340.localPlayer.team != 0 && var0.team != 0) { + if (var0.team == class340.localPlayer.team) { var6 = 2000; } else { - var6 = 0; // L: 10336 + var6 = 0; } - } else if (AttackOption.field1234 == Client.playerAttackOption && var0.isClanMember()) { // L: 10338 - var6 = 2000; // L: 10339 + } else if (AttackOption.field1234 == Client.playerAttackOption && var0.isClanMember()) { + var6 = 2000; } - } else if (Client.playerOptionsPriorities[var5]) { // L: 10342 + } else if (Client.playerOptionsPriorities[var5]) { var6 = 2000; } - boolean var7 = false; // L: 10343 - int var8 = Client.playerMenuOpcodes[var5] + var6; // L: 10344 - class11.insertMenuItemNoShift(Client.playerMenuActions[var5], UserComparator5.colorStartTag(16777215) + var4, var8, var1, var2, var3); // L: 10345 + boolean var7 = false; + int var8 = Client.playerMenuOpcodes[var5] + var6; + class11.insertMenuItemNoShift(Client.playerMenuActions[var5], UserComparator5.colorStartTag(16777215) + var4, var8, var1, var2, var3); } } } - for (var5 = 0; var5 < Client.menuOptionsCount; ++var5) { // L: 10350 - if (Client.menuOpcodes[var5] == 23) { // L: 10351 - Client.menuTargets[var5] = UserComparator5.colorStartTag(16777215) + var4; // L: 10352 + for (var5 = 0; var5 < Client.menuOptionsCount; ++var5) { + if (Client.menuOpcodes[var5] == 23) { + Client.menuTargets[var5] = UserComparator5.colorStartTag(16777215) + var4; break; } } } } - } // L: 10356 + } } diff --git a/runescape-client/src/main/java/class242.java b/runescape-client/src/main/java/class242.java index 6762867347..a9e5cd63d3 100644 --- a/runescape-client/src/main/java/class242.java +++ b/runescape-client/src/main/java/class242.java @@ -15,8 +15,8 @@ public abstract class class242 implements class244 { descriptor = "(Lko;Llf;I)V" ) protected class242(StudioGame var1, Language var2, int var3) { - this.field2787 = var3; // L: 10 - } // L: 11 + this.field2787 = var3; + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -25,37 +25,37 @@ public abstract class class242 implements class244 { ) @Export("loadInterface") public static boolean loadInterface(int var0) { - if (Widget.Widget_loadedInterfaces[var0]) { // L: 216 + if (Widget.Widget_loadedInterfaces[var0]) { return true; - } else if (!CollisionMap.Widget_archive.tryLoadGroup(var0)) { // L: 217 + } else if (!CollisionMap.Widget_archive.tryLoadGroup(var0)) { return false; } else { - int var1 = CollisionMap.Widget_archive.getGroupFileCount(var0); // L: 218 - if (var1 == 0) { // L: 219 - Widget.Widget_loadedInterfaces[var0] = true; // L: 220 - return true; // L: 221 + int var1 = CollisionMap.Widget_archive.getGroupFileCount(var0); + if (var1 == 0) { + Widget.Widget_loadedInterfaces[var0] = true; + return true; } else { - if (MouseRecorder.Widget_interfaceComponents[var0] == null) { // L: 223 + if (MouseRecorder.Widget_interfaceComponents[var0] == null) { MouseRecorder.Widget_interfaceComponents[var0] = new Widget[var1]; } - for (int var2 = 0; var2 < var1; ++var2) { // L: 224 - if (MouseRecorder.Widget_interfaceComponents[var0][var2] == null) { // L: 225 - byte[] var3 = CollisionMap.Widget_archive.takeFile(var0, var2); // L: 226 - if (var3 != null) { // L: 227 - MouseRecorder.Widget_interfaceComponents[var0][var2] = new Widget(); // L: 228 - MouseRecorder.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); // L: 229 - if (var3[0] == -1) { // L: 230 + for (int var2 = 0; var2 < var1; ++var2) { + if (MouseRecorder.Widget_interfaceComponents[var0][var2] == null) { + byte[] var3 = CollisionMap.Widget_archive.takeFile(var0, var2); + if (var3 != null) { + MouseRecorder.Widget_interfaceComponents[var0][var2] = new Widget(); + MouseRecorder.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); + if (var3[0] == -1) { MouseRecorder.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); } else { - MouseRecorder.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); // L: 231 + MouseRecorder.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); } } } } - Widget.Widget_loadedInterfaces[var0] = true; // L: 235 - return true; // L: 236 + Widget.Widget_loadedInterfaces[var0] = true; + return true; } } } diff --git a/runescape-client/src/main/java/class253.java b/runescape-client/src/main/java/class253.java index c2f18ca51f..8519ecc995 100644 --- a/runescape-client/src/main/java/class253.java +++ b/runescape-client/src/main/java/class253.java @@ -56,16 +56,16 @@ public class class253 { public static final class253 field2919; static { - field2918 = new class253(2); // L: 5 - field2911 = new class253(4); // L: 6 - field2912 = new class253(6); // L: 7 - field2913 = new class253(14); // L: 8 - field2914 = new class253(5); // L: 9 - field2915 = new class253(5); // L: 10 - field2916 = new class253(4); // L: 11 - field2917 = new class253(3); // L: 12 - field2920 = new class253(15); // L: 13 - field2919 = new class253(7); // L: 14 + field2918 = new class253(2); + field2911 = new class253(4); + field2912 = new class253(6); + field2913 = new class253(14); + field2914 = new class253(5); + field2915 = new class253(5); + field2916 = new class253(4); + field2917 = new class253(3); + field2920 = new class253(15); + field2919 = new class253(7); } @ObfuscatedSignature( @@ -73,7 +73,7 @@ public class class253 { garbageValue = "2" ) class253(int var1) { - } // L: 20 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -81,8 +81,8 @@ public class class253 { garbageValue = "-850723008" ) @Export("FillMode_values") - public static FillMode[] FillMode_values() { - return new FillMode[]{FillMode.SOLID, FillMode.field4552, FillMode.field4553}; // L: 15 + public static class429[] FillMode_values() { + return new class429[]{class429.SOLID, class429.field4552, class429.field4553}; } @ObfuscatedName("r") @@ -92,25 +92,25 @@ public class class253 { ) @Export("drawTitle") static void drawTitle(Font var0, Font var1, Font var2) { - Login.xPadding = (class186.canvasWidth - 765) / 2; // L: 1254 - Login.loginBoxX = Login.xPadding + 202; // L: 1255 - class138.loginBoxCenter = Login.loginBoxX + 180; // L: 1256 - if (Login.worldSelectOpen) { // L: 1257 - Language.method5841(var0, var1); // L: 1258 + Login.xPadding = (class186.canvasWidth - 765) / 2; + Login.loginBoxX = Login.xPadding + 202; + class138.loginBoxCenter = Login.loginBoxX + 180; + if (Login.worldSelectOpen) { + Language.method5841(var0, var1); } else { - WorldMapCacheName.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1261 - NPC.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1262 - Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); // L: 1263 + WorldMapCacheName.leftTitleSprite.drawAt(Login.xPadding, 0); + NPC.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); int var4; - if (Client.gameState == 0 || Client.gameState == 5) { // L: 1264 - byte var3 = 20; // L: 1265 - var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); // L: 1266 - var4 = 253 - var3; // L: 1267 - Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); // L: 1268 - Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); // L: 1269 - Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); // L: 1270 - Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); // L: 1271 - var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); // L: 1272 + if (Client.gameState == 0 || Client.gameState == 5) { + byte var3 = 20; + var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); + var4 = 253 - var3; + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); + var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); } String var5; @@ -119,368 +119,368 @@ public class class253 { short var23; int var24; short var25; - if (Client.gameState == 20) { // L: 1274 - AbstractByteArrayCopier.titleboxSprite.drawAt(Login.loginBoxX + 180 - AbstractByteArrayCopier.titleboxSprite.subWidth / 2, 271 - AbstractByteArrayCopier.titleboxSprite.subHeight / 2); // L: 1275 - var23 = 201; // L: 1276 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1277 - var24 = var23 + 15; // L: 1278 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16776960, 0); // L: 1279 - var24 += 15; // L: 1280 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16776960, 0); // L: 1281 - var24 += 15; // L: 1282 - var24 += 7; // L: 1283 - if (Login.loginIndex != 4 && Login.loginIndex != 10) { // L: 1284 - var0.draw("Login: ", Login.loginBoxX + 180 - 110, var24, 16777215, 0); // L: 1285 - var25 = 200; // L: 1286 - var5 = SecureRandomFuture.clientPreferences.hideUsername ? LoginPacket.method5019(Login.Login_username) : Login.Login_username; // L: 1289 + if (Client.gameState == 20) { + AbstractByteArrayCopier.titleboxSprite.drawAt(Login.loginBoxX + 180 - AbstractByteArrayCopier.titleboxSprite.subWidth / 2, 271 - AbstractByteArrayCopier.titleboxSprite.subHeight / 2); + var23 = 201; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16776960, 0); + var24 = var23 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var24 += 7; + if (Login.loginIndex != 4 && Login.loginIndex != 10) { + var0.draw("Login: ", Login.loginBoxX + 180 - 110, var24, 16777215, 0); + var25 = 200; + var5 = SecureRandomFuture.clientPreferences.hideUsername ? LoginPacket.method5019(Login.Login_username) : Login.Login_username; - for (var6 = var5; var0.stringWidth(var6) > var25; var6 = var6.substring(0, var6.length() - 1)) { // L: 1291 1292 1293 + for (var6 = var5; var0.stringWidth(var6) > var25; var6 = var6.substring(0, var6.length() - 1)) { } - var0.draw(AbstractFont.escapeBrackets(var6), Login.loginBoxX + 180 - 70, var24, 16777215, 0); // L: 1295 - var24 += 15; // L: 1296 + var0.draw(AbstractFont.escapeBrackets(var6), Login.loginBoxX + 180 - 70, var24, 16777215, 0); + var24 += 15; - for (var7 = LoginPacket.method5019(Login.Login_password); var0.stringWidth(var7) > var25; var7 = var7.substring(1)) { // L: 1297 1298 1299 + for (var7 = LoginPacket.method5019(Login.Login_password); var0.stringWidth(var7) > var25; var7 = var7.substring(1)) { } - var0.draw("Password: " + var7, Login.loginBoxX + 180 - 108, var24, 16777215, 0); // L: 1301 - var24 += 15; // L: 1302 + var0.draw("Password: " + var7, Login.loginBoxX + 180 - 108, var24, 16777215, 0); + var24 += 15; } } - if (Client.gameState == 10 || Client.gameState == 11) { // L: 1305 - AbstractByteArrayCopier.titleboxSprite.drawAt(Login.loginBoxX, 171); // L: 1306 + if (Client.gameState == 10 || Client.gameState == 11) { + AbstractByteArrayCopier.titleboxSprite.drawAt(Login.loginBoxX, 171); short var18; - if (Login.loginIndex == 0) { // L: 1307 - var23 = 251; // L: 1308 - var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var23, 16776960, 0); // L: 1309 - var24 = var23 + 30; // L: 1310 - var4 = Login.loginBoxX + 180 - 80; // L: 1311 - var18 = 291; // L: 1312 - class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); // L: 1313 - var0.drawLines("New User", var4 - 73, var18 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1314 - var4 = Login.loginBoxX + 180 + 80; // L: 1315 - class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); // L: 1316 - var0.drawLines("Existing User", var4 - 73, var18 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1317 - } else if (Login.loginIndex == 1) { // L: 1319 - var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); // L: 1320 - var23 = 236; // L: 1321 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16777215, 0); // L: 1322 - var24 = var23 + 15; // L: 1323 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16777215, 0); // L: 1324 - var24 += 15; // L: 1325 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16777215, 0); // L: 1326 - var24 += 15; // L: 1327 - var4 = Login.loginBoxX + 180 - 80; // L: 1328 - var18 = 321; // L: 1329 - class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); // L: 1330 - var0.drawCentered("Continue", var4, var18 + 5, 16777215, 0); // L: 1331 - var4 = Login.loginBoxX + 180 + 80; // L: 1332 - class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); // L: 1333 - var0.drawCentered("Cancel", var4, var18 + 5, 16777215, 0); // L: 1334 - } else if (Login.loginIndex == 2) { // L: 1336 - var23 = 201; // L: 1337 - var0.drawCentered(Login.Login_response1, class138.loginBoxCenter, var23, 16776960, 0); // L: 1338 - var24 = var23 + 15; // L: 1339 - var0.drawCentered(Login.Login_response2, class138.loginBoxCenter, var24, 16776960, 0); // L: 1340 - var24 += 15; // L: 1341 - var0.drawCentered(Login.Login_response3, class138.loginBoxCenter, var24, 16776960, 0); // L: 1342 - var24 += 15; // L: 1343 - var24 += 7; // L: 1344 - var0.draw("Login: ", class138.loginBoxCenter - 110, var24, 16777215, 0); // L: 1345 - var25 = 200; // L: 1346 - var5 = SecureRandomFuture.clientPreferences.hideUsername ? LoginPacket.method5019(Login.Login_username) : Login.Login_username; // L: 1349 + if (Login.loginIndex == 0) { + var23 = 251; + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var23, 16776960, 0); + var24 = var23 + 30; + var4 = Login.loginBoxX + 180 - 80; + var18 = 291; + class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var0.drawLines("New User", var4 - 73, var18 - 20, 144, 40, 16777215, 0, 1, 1, 0); + var4 = Login.loginBoxX + 180 + 80; + class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var0.drawLines("Existing User", var4 - 73, var18 - 20, 144, 40, 16777215, 0, 1, 1, 0); + } else if (Login.loginIndex == 1) { + var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); + var23 = 236; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16777215, 0); + var24 = var23 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16777215, 0); + var24 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16777215, 0); + var24 += 15; + var4 = Login.loginBoxX + 180 - 80; + var18 = 321; + class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var0.drawCentered("Continue", var4, var18 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180 + 80; + class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var0.drawCentered("Cancel", var4, var18 + 5, 16777215, 0); + } else if (Login.loginIndex == 2) { + var23 = 201; + var0.drawCentered(Login.Login_response1, class138.loginBoxCenter, var23, 16776960, 0); + var24 = var23 + 15; + var0.drawCentered(Login.Login_response2, class138.loginBoxCenter, var24, 16776960, 0); + var24 += 15; + var0.drawCentered(Login.Login_response3, class138.loginBoxCenter, var24, 16776960, 0); + var24 += 15; + var24 += 7; + var0.draw("Login: ", class138.loginBoxCenter - 110, var24, 16777215, 0); + var25 = 200; + var5 = SecureRandomFuture.clientPreferences.hideUsername ? LoginPacket.method5019(Login.Login_username) : Login.Login_username; - for (var6 = var5; var0.stringWidth(var6) > var25; var6 = var6.substring(1)) { // L: 1351 1352 1353 + for (var6 = var5; var0.stringWidth(var6) > var25; var6 = var6.substring(1)) { } - var0.draw(AbstractFont.escapeBrackets(var6) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? UserComparator5.colorStartTag(16776960) + "|" : ""), class138.loginBoxCenter - 70, var24, 16777215, 0); // L: 1355 - var24 += 15; // L: 1356 + var0.draw(AbstractFont.escapeBrackets(var6) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? UserComparator5.colorStartTag(16776960) + "|" : ""), class138.loginBoxCenter - 70, var24, 16777215, 0); + var24 += 15; - for (var7 = LoginPacket.method5019(Login.Login_password); var0.stringWidth(var7) > var25; var7 = var7.substring(1)) { // L: 1357 1358 1359 + for (var7 = LoginPacket.method5019(Login.Login_password); var0.stringWidth(var7) > var25; var7 = var7.substring(1)) { } - var0.draw("Password: " + var7 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? UserComparator5.colorStartTag(16776960) + "|" : ""), class138.loginBoxCenter - 108, var24, 16777215, 0); // L: 1361 - var24 += 15; // L: 1362 - var23 = 277; // L: 1363 - int var8 = class138.loginBoxCenter + -117; // L: 1364 - boolean var10 = Client.Login_isUsernameRemembered; // L: 1366 - boolean var11 = Login.field880; // L: 1367 - IndexedSprite var9 = var10 ? (var11 ? Login.field888 : LoginType.options_buttons_2Sprite) : (var11 ? UserComparator9.field1336 : KeyHandler.options_buttons_0Sprite); // L: 1369 - var9.drawAt(var8, var23); // L: 1372 - var8 = var8 + var9.subWidth + 5; // L: 1373 - var1.draw("Remember username", var8, var23 + 13, 16776960, 0); // L: 1374 - var8 = class138.loginBoxCenter + 24; // L: 1375 - boolean var14 = SecureRandomFuture.clientPreferences.hideUsername; // L: 1377 - boolean var15 = Login.field881; // L: 1378 - IndexedSprite var13 = var14 ? (var15 ? Login.field888 : LoginType.options_buttons_2Sprite) : (var15 ? UserComparator9.field1336 : KeyHandler.options_buttons_0Sprite); // L: 1380 - var13.drawAt(var8, var23); // L: 1383 - var8 = var8 + var13.subWidth + 5; // L: 1384 - var1.draw("Hide username", var8, var23 + 13, 16776960, 0); // L: 1385 - var24 = var23 + 15; // L: 1386 - int var16 = class138.loginBoxCenter - 80; // L: 1387 - short var17 = 321; // L: 1388 - class19.titlebuttonSprite.drawAt(var16 - 73, var17 - 20); // L: 1389 - var0.drawCentered("Login", var16, var17 + 5, 16777215, 0); // L: 1390 - var16 = class138.loginBoxCenter + 80; // L: 1391 - class19.titlebuttonSprite.drawAt(var16 - 73, var17 - 20); // L: 1392 - var0.drawCentered("Cancel", var16, var17 + 5, 16777215, 0); // L: 1393 - var23 = 357; // L: 1394 - switch(Login.field872) { // L: 1395 + var0.draw("Password: " + var7 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? UserComparator5.colorStartTag(16776960) + "|" : ""), class138.loginBoxCenter - 108, var24, 16777215, 0); + var24 += 15; + var23 = 277; + int var8 = class138.loginBoxCenter + -117; + boolean var10 = Client.Login_isUsernameRemembered; + boolean var11 = Login.field880; + IndexedSprite var9 = var10 ? (var11 ? Login.field888 : LoginType.options_buttons_2Sprite) : (var11 ? UserComparator9.field1336 : KeyHandler.options_buttons_0Sprite); + var9.drawAt(var8, var23); + var8 = var8 + var9.subWidth + 5; + var1.draw("Remember username", var8, var23 + 13, 16776960, 0); + var8 = class138.loginBoxCenter + 24; + boolean var14 = SecureRandomFuture.clientPreferences.hideUsername; + boolean var15 = Login.field881; + IndexedSprite var13 = var14 ? (var15 ? Login.field888 : LoginType.options_buttons_2Sprite) : (var15 ? UserComparator9.field1336 : KeyHandler.options_buttons_0Sprite); + var13.drawAt(var8, var23); + var8 = var8 + var13.subWidth + 5; + var1.draw("Hide username", var8, var23 + 13, 16776960, 0); + var24 = var23 + 15; + int var16 = class138.loginBoxCenter - 80; + short var17 = 321; + class19.titlebuttonSprite.drawAt(var16 - 73, var17 - 20); + var0.drawCentered("Login", var16, var17 + 5, 16777215, 0); + var16 = class138.loginBoxCenter + 80; + class19.titlebuttonSprite.drawAt(var16 - 73, var17 - 20); + var0.drawCentered("Cancel", var16, var17 + 5, 16777215, 0); + var23 = 357; + switch(Login.field872) { case 2: - class10.field58 = "Having trouble logging in?"; // L: 1397 + class10.field58 = "Having trouble logging in?"; break; default: - class10.field58 = "Can't login? Click here."; // L: 1400 + class10.field58 = "Can't login? Click here."; } - WorldMapData_1.field2652 = new Bounds(class138.loginBoxCenter, var23, var1.stringWidth(class10.field58), 11); // L: 1403 - MouseRecorder.field1044 = new Bounds(class138.loginBoxCenter, var23, var1.stringWidth("Still having trouble logging in?"), 11); // L: 1404 - var1.drawCentered(class10.field58, class138.loginBoxCenter, var23, 16777215, 0); // L: 1405 - } else if (Login.loginIndex == 3) { // L: 1407 - var23 = 201; // L: 1408 - var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var23, 16776960, 0); // L: 1409 - var24 = var23 + 20; // L: 1410 - var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var24, 16776960, 0); // L: 1411 - var24 += 15; // L: 1412 - var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var24, 16776960, 0); // L: 1413 - var24 += 15; // L: 1414 - var4 = Login.loginBoxX + 180; // L: 1415 - var18 = 276; // L: 1416 - class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); // L: 1417 - var2.drawCentered("Try again", var4, var18 + 5, 16777215, 0); // L: 1418 - var4 = Login.loginBoxX + 180; // L: 1419 - var18 = 326; // L: 1420 - class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); // L: 1421 - var2.drawCentered("Forgotten password?", var4, var18 + 5, 16777215, 0); // L: 1422 + WorldMapData_1.field2652 = new Bounds(class138.loginBoxCenter, var23, var1.stringWidth(class10.field58), 11); + MouseRecorder.field1044 = new Bounds(class138.loginBoxCenter, var23, var1.stringWidth("Still having trouble logging in?"), 11); + var1.drawCentered(class10.field58, class138.loginBoxCenter, var23, 16777215, 0); + } else if (Login.loginIndex == 3) { + var23 = 201; + var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var23, 16776960, 0); + var24 = var23 + 20; + var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var4 = Login.loginBoxX + 180; + var18 = 276; + class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var2.drawCentered("Try again", var4, var18 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180; + var18 = 326; + class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var2.drawCentered("Forgotten password?", var4, var18 + 5, 16777215, 0); } else { int var20; short var27; - if (Login.loginIndex == 4) { // L: 1424 - var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1425 - var23 = 236; // L: 1426 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16777215, 0); // L: 1427 - var24 = var23 + 15; // L: 1428 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16777215, 0); // L: 1429 - var24 += 15; // L: 1430 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16777215, 0); // L: 1431 - var24 += 15; // L: 1432 - var0.draw("PIN: " + LoginPacket.method5019(BufferedSource.otp) + (Client.cycle % 40 < 20 ? UserComparator5.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var24, 16777215, 0); // L: 1433 - var24 -= 8; // L: 1434 - var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var24, 16776960, 0); // L: 1435 - var24 += 15; // L: 1436 - var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var24, 16776960, 0); // L: 1437 - var4 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; // L: 1438 - int var28 = var24 - var0.ascent; // L: 1439 + if (Login.loginIndex == 4) { + var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); + var23 = 236; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16777215, 0); + var24 = var23 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16777215, 0); + var24 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16777215, 0); + var24 += 15; + var0.draw("PIN: " + LoginPacket.method5019(BufferedSource.otp) + (Client.cycle % 40 < 20 ? UserComparator5.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var24, 16777215, 0); + var24 -= 8; + var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var24, 16776960, 0); + var24 += 15; + var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var24, 16776960, 0); + var4 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; + int var28 = var24 - var0.ascent; IndexedSprite var26; - if (Login.field882) { // L: 1441 - var26 = LoginType.options_buttons_2Sprite; // L: 1442 + if (Login.field882) { + var26 = LoginType.options_buttons_2Sprite; } else { - var26 = KeyHandler.options_buttons_0Sprite; // L: 1445 + var26 = KeyHandler.options_buttons_0Sprite; } - var26.drawAt(var4, var28); // L: 1447 - var24 += 15; // L: 1448 - var20 = Login.loginBoxX + 180 - 80; // L: 1449 - var27 = 321; // L: 1450 - class19.titlebuttonSprite.drawAt(var20 - 73, var27 - 20); // L: 1451 - var0.drawCentered("Continue", var20, var27 + 5, 16777215, 0); // L: 1452 - var20 = Login.loginBoxX + 180 + 80; // L: 1453 - class19.titlebuttonSprite.drawAt(var20 - 73, var27 - 20); // L: 1454 - var0.drawCentered("Cancel", var20, var27 + 5, 16777215, 0); // L: 1455 - var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var27 + 36, 255, 0); // L: 1456 - } else if (Login.loginIndex == 5) { // L: 1458 - var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1459 - var23 = 221; // L: 1460 - var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1461 - var24 = var23 + 15; // L: 1462 - var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16776960, 0); // L: 1463 - var24 += 15; // L: 1464 - var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16776960, 0); // L: 1465 - var24 += 15; // L: 1466 - var24 += 14; // L: 1467 - var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var24, 16777215, 0); // L: 1468 - var25 = 174; // L: 1469 - var5 = SecureRandomFuture.clientPreferences.hideUsername ? LoginPacket.method5019(Login.Login_username) : Login.Login_username; // L: 1472 + var26.drawAt(var4, var28); + var24 += 15; + var20 = Login.loginBoxX + 180 - 80; + var27 = 321; + class19.titlebuttonSprite.drawAt(var20 - 73, var27 - 20); + var0.drawCentered("Continue", var20, var27 + 5, 16777215, 0); + var20 = Login.loginBoxX + 180 + 80; + class19.titlebuttonSprite.drawAt(var20 - 73, var27 - 20); + var0.drawCentered("Cancel", var20, var27 + 5, 16777215, 0); + var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var27 + 36, 255, 0); + } else if (Login.loginIndex == 5) { + var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); + var23 = 221; + var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16776960, 0); + var24 = var23 + 15; + var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var24 += 14; + var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var24, 16777215, 0); + var25 = 174; + var5 = SecureRandomFuture.clientPreferences.hideUsername ? LoginPacket.method5019(Login.Login_username) : Login.Login_username; - for (var6 = var5; var0.stringWidth(var6) > var25; var6 = var6.substring(1)) { // L: 1474 1475 1476 + for (var6 = var5; var0.stringWidth(var6) > var25; var6 = var6.substring(1)) { } - var0.draw(AbstractFont.escapeBrackets(var6) + (Client.cycle % 40 < 20 ? UserComparator5.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var24, 16777215, 0); // L: 1478 - var24 += 15; // L: 1479 - var20 = Login.loginBoxX + 180 - 80; // L: 1480 - var27 = 321; // L: 1481 - class19.titlebuttonSprite.drawAt(var20 - 73, var27 - 20); // L: 1482 - var0.drawCentered("Recover", var20, var27 + 5, 16777215, 0); // L: 1483 - var20 = Login.loginBoxX + 180 + 80; // L: 1484 - class19.titlebuttonSprite.drawAt(var20 - 73, var27 - 20); // L: 1485 - var0.drawCentered("Back", var20, var27 + 5, 16777215, 0); // L: 1486 - var27 = 356; // L: 1487 - var1.drawCentered("Still having trouble logging in?", class138.loginBoxCenter, var27, 268435455, 0); // L: 1488 - } else if (Login.loginIndex == 6) { // L: 1490 - var23 = 201; // L: 1491 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1492 - var24 = var23 + 15; // L: 1493 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16776960, 0); // L: 1494 - var24 += 15; // L: 1495 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16776960, 0); // L: 1496 - var24 += 15; // L: 1497 - var4 = Login.loginBoxX + 180; // L: 1498 - var18 = 321; // L: 1499 - class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); // L: 1500 - var0.drawCentered("Back", var4, var18 + 5, 16777215, 0); // L: 1501 - } else if (Login.loginIndex == 7) { // L: 1503 - var23 = 216; // L: 1504 - var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var23, 16776960, 0); // L: 1505 - var24 = var23 + 15; // L: 1506 - var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var24, 16776960, 0); // L: 1507 - var24 += 15; // L: 1508 - var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var24, 16776960, 0); // L: 1509 - var24 += 15; // L: 1510 - var4 = Login.loginBoxX + 180 - 80; // L: 1511 - var18 = 321; // L: 1512 - class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); // L: 1513 - var0.drawCentered("Set Date of Birth", var4, var18 + 5, 16777215, 0); // L: 1514 - var4 = Login.loginBoxX + 180 + 80; // L: 1515 - class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); // L: 1516 - var0.drawCentered("Back", var4, var18 + 5, 16777215, 0); // L: 1517 - } else if (Login.loginIndex == 8) { // L: 1519 - var23 = 216; // L: 1520 - var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var23, 16776960, 0); // L: 1521 - var24 = var23 + 15; // L: 1522 - var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var24, 16776960, 0); // L: 1523 - var24 += 15; // L: 1524 - var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var24, 16776960, 0); // L: 1525 - var24 += 15; // L: 1526 - var4 = Login.loginBoxX + 180 - 80; // L: 1527 - var18 = 321; // L: 1528 - class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); // L: 1529 - var0.drawCentered("Privacy Policy", var4, var18 + 5, 16777215, 0); // L: 1530 - var4 = Login.loginBoxX + 180 + 80; // L: 1531 - class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); // L: 1532 - var0.drawCentered("Back", var4, var18 + 5, 16777215, 0); // L: 1533 - } else if (Login.loginIndex == 9) { // L: 1535 - var23 = 221; // L: 1536 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1537 - var24 = var23 + 25; // L: 1538 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16776960, 0); // L: 1539 - var24 += 25; // L: 1540 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16776960, 0); // L: 1541 - var4 = Login.loginBoxX + 180; // L: 1542 - var18 = 311; // L: 1543 - class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); // L: 1544 - var0.drawCentered("Try again", var4, var18 + 5, 16777215, 0); // L: 1545 - } else if (Login.loginIndex == 10) { // L: 1547 - var24 = Login.loginBoxX + 180; // L: 1548 - var25 = 209; // L: 1549 - var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var25, 16776960, 0); // L: 1550 - var4 = var25 + 20; // L: 1551 - Login.field894.drawAt(var24 - 109, var4); // L: 1552 - Login.field864.drawAt(var24 - 48, var4 + 18); // L: 1553 - } else if (Login.loginIndex == 12) { // L: 1555 - var24 = class138.loginBoxCenter; // L: 1556 - var25 = 216; // L: 1557 - var2.drawCentered("Before using this app, please read and accept our", var24, var25, 16777215, 0); // L: 1558 - var4 = var25 + 17; // L: 1559 - var2.drawCentered("terms of use, privacy policy, and end user licence", var24, var4, 16777215, 0); // L: 1560 - var4 += 17; // L: 1561 - var2.drawCentered("agreement (EULA).", var24, var4, 16777215, 0); // L: 1562 - var4 += 17; // L: 1563 - var2.drawCentered("By accepting, you agree to these documents.", var24, var4, 16777215, 0); // L: 1564 - var24 = class138.loginBoxCenter - 80; // L: 1565 - var25 = 311; // L: 1566 - class19.titlebuttonSprite.drawAt(var24 - 73, var25 - 20); // L: 1567 - var0.drawCentered("Accept", var24, var25 + 5, 16777215, 0); // L: 1568 - var24 = class138.loginBoxCenter + 80; // L: 1569 - class19.titlebuttonSprite.drawAt(var24 - 73, var25 - 20); // L: 1570 - var0.drawCentered("Decline", var24, var25 + 5, 16777215, 0); // L: 1571 - } else if (Login.loginIndex == 13) { // L: 1573 - var23 = 231; // L: 1574 - var2.drawCentered("You must accept our terms of use, privacy policy,", Login.loginBoxX + 180, var23, 16777215, 0); // L: 1575 - var24 = var23 + 20; // L: 1576 - var2.drawCentered("and end user licence agreement to continue.", Login.loginBoxX + 180, var24, 16777215, 0); // L: 1577 - var4 = Login.loginBoxX + 180; // L: 1578 - var23 = 311; // L: 1579 - class19.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1580 - var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1581 - } else if (Login.loginIndex == 14) { // L: 1583 - var23 = 201; // L: 1584 - String var19 = ""; // L: 1585 - var5 = ""; // L: 1586 - var6 = ""; // L: 1587 - switch(Login.field871) { // L: 1588 + var0.draw(AbstractFont.escapeBrackets(var6) + (Client.cycle % 40 < 20 ? UserComparator5.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var24, 16777215, 0); + var24 += 15; + var20 = Login.loginBoxX + 180 - 80; + var27 = 321; + class19.titlebuttonSprite.drawAt(var20 - 73, var27 - 20); + var0.drawCentered("Recover", var20, var27 + 5, 16777215, 0); + var20 = Login.loginBoxX + 180 + 80; + class19.titlebuttonSprite.drawAt(var20 - 73, var27 - 20); + var0.drawCentered("Back", var20, var27 + 5, 16777215, 0); + var27 = 356; + var1.drawCentered("Still having trouble logging in?", class138.loginBoxCenter, var27, 268435455, 0); + } else if (Login.loginIndex == 6) { + var23 = 201; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16776960, 0); + var24 = var23 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var4 = Login.loginBoxX + 180; + var18 = 321; + class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var0.drawCentered("Back", var4, var18 + 5, 16777215, 0); + } else if (Login.loginIndex == 7) { + var23 = 216; + var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var23, 16776960, 0); + var24 = var23 + 15; + var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var4 = Login.loginBoxX + 180 - 80; + var18 = 321; + class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var0.drawCentered("Set Date of Birth", var4, var18 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180 + 80; + class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var0.drawCentered("Back", var4, var18 + 5, 16777215, 0); + } else if (Login.loginIndex == 8) { + var23 = 216; + var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var23, 16776960, 0); + var24 = var23 + 15; + var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var4 = Login.loginBoxX + 180 - 80; + var18 = 321; + class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var0.drawCentered("Privacy Policy", var4, var18 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180 + 80; + class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var0.drawCentered("Back", var4, var18 + 5, 16777215, 0); + } else if (Login.loginIndex == 9) { + var23 = 221; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16776960, 0); + var24 = var23 + 25; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 25; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16776960, 0); + var4 = Login.loginBoxX + 180; + var18 = 311; + class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var0.drawCentered("Try again", var4, var18 + 5, 16777215, 0); + } else if (Login.loginIndex == 10) { + var24 = Login.loginBoxX + 180; + var25 = 209; + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var25, 16776960, 0); + var4 = var25 + 20; + Login.field894.drawAt(var24 - 109, var4); + Login.field864.drawAt(var24 - 48, var4 + 18); + } else if (Login.loginIndex == 12) { + var24 = class138.loginBoxCenter; + var25 = 216; + var2.drawCentered("Before using this app, please read and accept our", var24, var25, 16777215, 0); + var4 = var25 + 17; + var2.drawCentered("terms of use, privacy policy, and end user licence", var24, var4, 16777215, 0); + var4 += 17; + var2.drawCentered("agreement (EULA).", var24, var4, 16777215, 0); + var4 += 17; + var2.drawCentered("By accepting, you agree to these documents.", var24, var4, 16777215, 0); + var24 = class138.loginBoxCenter - 80; + var25 = 311; + class19.titlebuttonSprite.drawAt(var24 - 73, var25 - 20); + var0.drawCentered("Accept", var24, var25 + 5, 16777215, 0); + var24 = class138.loginBoxCenter + 80; + class19.titlebuttonSprite.drawAt(var24 - 73, var25 - 20); + var0.drawCentered("Decline", var24, var25 + 5, 16777215, 0); + } else if (Login.loginIndex == 13) { + var23 = 231; + var2.drawCentered("You must accept our terms of use, privacy policy,", Login.loginBoxX + 180, var23, 16777215, 0); + var24 = var23 + 20; + var2.drawCentered("and end user licence agreement to continue.", Login.loginBoxX + 180, var24, 16777215, 0); + var4 = Login.loginBoxX + 180; + var23 = 311; + class19.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); + var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); + } else if (Login.loginIndex == 14) { + var23 = 201; + String var19 = ""; + var5 = ""; + var6 = ""; + switch(Login.field871) { case 0: - var19 = "Your account has been disabled."; // L: 1591 - var5 = Strings.field3523; // L: 1592 - var6 = ""; // L: 1593 + var19 = "Your account has been disabled."; + var5 = Strings.field3523; + var6 = ""; break; case 1: - var19 = "Account locked as we suspect it has been stolen."; // L: 1598 - var5 = Strings.field3562; // L: 1599 - var6 = ""; // L: 1600 - break; // L: 1601 + var19 = "Account locked as we suspect it has been stolen."; + var5 = Strings.field3562; + var6 = ""; + break; default: - class67.Login_promptCredentials(false); // L: 1605 + class67.Login_promptCredentials(false); } - var0.drawCentered(var19, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1609 - var24 = var23 + 15; // L: 1610 - var2.drawCentered(var5, Login.loginBoxX + 180, var24, 16776960, 0); // L: 1611 - var24 += 15; // L: 1612 - var2.drawCentered(var6, Login.loginBoxX + 180, var24, 16776960, 0); // L: 1613 - var24 += 15; // L: 1614 - var20 = Login.loginBoxX + 180; // L: 1615 - var27 = 276; // L: 1616 - class19.titlebuttonSprite.drawAt(var20 - 73, var27 - 20); // L: 1617 - var0.drawCentered("Support Page", var20, var27 + 5, 16777215, 0); // L: 1618 - var20 = Login.loginBoxX + 180; // L: 1619 - var27 = 326; // L: 1620 - class19.titlebuttonSprite.drawAt(var20 - 73, var27 - 20); // L: 1621 - var0.drawCentered("Back", var20, var27 + 5, 16777215, 0); // L: 1622 - } else if (Login.loginIndex == 24) { // L: 1624 - var23 = 221; // L: 1625 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16777215, 0); // L: 1626 - var24 = var23 + 15; // L: 1627 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16777215, 0); // L: 1628 - var24 += 15; // L: 1629 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16777215, 0); // L: 1630 - var24 += 15; // L: 1631 - var4 = Login.loginBoxX + 180; // L: 1632 - var18 = 301; // L: 1633 - class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); // L: 1634 - var0.drawCentered("Ok", var4, var18 + 5, 16777215, 0); // L: 1635 + var0.drawCentered(var19, Login.loginBoxX + 180, var23, 16776960, 0); + var24 = var23 + 15; + var2.drawCentered(var5, Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var2.drawCentered(var6, Login.loginBoxX + 180, var24, 16776960, 0); + var24 += 15; + var20 = Login.loginBoxX + 180; + var27 = 276; + class19.titlebuttonSprite.drawAt(var20 - 73, var27 - 20); + var0.drawCentered("Support Page", var20, var27 + 5, 16777215, 0); + var20 = Login.loginBoxX + 180; + var27 = 326; + class19.titlebuttonSprite.drawAt(var20 - 73, var27 - 20); + var0.drawCentered("Back", var20, var27 + 5, 16777215, 0); + } else if (Login.loginIndex == 24) { + var23 = 221; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16777215, 0); + var24 = var23 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16777215, 0); + var24 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16777215, 0); + var24 += 15; + var4 = Login.loginBoxX + 180; + var18 = 301; + class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); + var0.drawCentered("Ok", var4, var18 + 5, 16777215, 0); } } } - if (Client.gameState >= 10) { // L: 1638 - int[] var21 = new int[4]; // L: 1639 - Rasterizer2D.Rasterizer2D_getClipArray(var21); // L: 1640 - Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, BoundaryObject.canvasHeight); // L: 1641 - Client.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); // L: 1642 - Client.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); // L: 1643 - Rasterizer2D.Rasterizer2D_setClipArray(var21); // L: 1644 + if (Client.gameState >= 10) { + int[] var21 = new int[4]; + Rasterizer2D.Rasterizer2D_getClipArray(var21); + Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, BoundaryObject.canvasHeight); + Client.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); + Client.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); + Rasterizer2D.Rasterizer2D_setClipArray(var21); } - Login.title_muteSprite[SecureRandomFuture.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); // L: 1646 - if (Client.gameState > 5 && ScriptFrame.clientLanguage == Language.Language_EN) { // L: 1647 - if (class21.field118 != null) { // L: 1648 - var24 = Login.xPadding + 5; // L: 1649 - var25 = 463; // L: 1650 - byte var29 = 100; // L: 1651 - byte var22 = 35; // L: 1652 - class21.field118.drawAt(var24, var25); // L: 1653 - var0.drawCentered("World" + " " + Client.worldId, var29 / 2 + var24, var22 / 2 + var25 - 2, 16777215, 0); // L: 1654 - if (HorizontalAlignment.World_request != null) { // L: 1655 + Login.title_muteSprite[SecureRandomFuture.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); + if (Client.gameState > 5 && ScriptFrame.clientLanguage == Language.Language_EN) { + if (class21.field118 != null) { + var24 = Login.xPadding + 5; + var25 = 463; + byte var29 = 100; + byte var22 = 35; + class21.field118.drawAt(var24, var25); + var0.drawCentered("World" + " " + Client.worldId, var29 / 2 + var24, var22 / 2 + var25 - 2, 16777215, 0); + if (HorizontalAlignment.World_request != null) { var1.drawCentered("Loading...", var29 / 2 + var24, var22 / 2 + var25 + 12, 16777215, 0); } else { - var1.drawCentered("Click to switch", var29 / 2 + var24, var22 / 2 + var25 + 12, 16777215, 0); // L: 1656 + var1.drawCentered("Click to switch", var29 / 2 + var24, var22 / 2 + var25 + 12, 16777215, 0); } } else { - class21.field118 = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(UserComparator6.archive8, "sl_button", ""); // L: 1659 + class21.field118 = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(UserComparator6.archive8, "sl_button", ""); } } } - } // L: 1259 1662 + } } diff --git a/runescape-client/src/main/java/class257.java b/runescape-client/src/main/java/class257.java index c0a8ca776a..ba97a05a83 100644 --- a/runescape-client/src/main/java/class257.java +++ b/runescape-client/src/main/java/class257.java @@ -31,6 +31,6 @@ public class class257 { garbageValue = "-1757234345" ) public static boolean method5020(int var0) { - return (var0 >> 28 & 1) != 0; // L: 29 + return (var0 >> 28 & 1) != 0; } } diff --git a/runescape-client/src/main/java/class258.java b/runescape-client/src/main/java/class258.java index 08787cc4d6..0bfa60fa57 100644 --- a/runescape-client/src/main/java/class258.java +++ b/runescape-client/src/main/java/class258.java @@ -8,16 +8,16 @@ public class class258 { static { new Object(); - field3049 = new int[33]; // L: 8 - field3049[0] = 0; // L: 11 - int var0 = 2; // L: 12 + field3049 = new int[33]; + field3049[0] = 0; + int var0 = 2; - for (int var1 = 1; var1 < 33; ++var1) { // L: 13 - field3049[var1] = var0 - 1; // L: 14 - var0 += var0; // L: 15 + for (int var1 = 1; var1 < 33; ++var1) { + field3049[var1] = var0 - 1; + var0 += var0; } - } // L: 17 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -25,7 +25,7 @@ public class class258 { garbageValue = "-156509951" ) public static void method5047(AbstractArchive var0, AbstractArchive var1) { - NPCComposition.NpcDefinition_archive = var0; // L: 57 - NPCComposition.NpcDefinition_modelArchive = var1; // L: 58 - } // L: 59 + NPCComposition.NpcDefinition_archive = var0; + NPCComposition.NpcDefinition_modelArchive = var1; + } } diff --git a/runescape-client/src/main/java/class260.java b/runescape-client/src/main/java/class260.java index 4bdac0c4e1..536d4cda69 100644 --- a/runescape-client/src/main/java/class260.java +++ b/runescape-client/src/main/java/class260.java @@ -58,37 +58,37 @@ public class class260 { garbageValue = "0" ) public static String method5070(CharSequence var0) { - int var1 = var0.length(); // L: 11 - StringBuilder var2 = new StringBuilder(var1); // L: 12 + int var1 = var0.length(); + StringBuilder var2 = new StringBuilder(var1); - 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 + for (int var3 = 0; var3 < var1; ++var3) { + char var4 = var0.charAt(var3); + if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') { + if (var4 == ' ') { var2.append('+'); } else { - byte var5 = class372.charToByteCp1252(var4); // L: 18 - var2.append('%'); // L: 19 - int var6 = var5 >> 4 & 15; // L: 20 - if (var6 >= 10) { // L: 21 + byte var5 = class372.charToByteCp1252(var4); + var2.append('%'); + int var6 = var5 >> 4 & 15; + if (var6 >= 10) { var2.append((char)(var6 + 55)); } else { - var2.append((char)(var6 + 48)); // L: 22 + var2.append((char)(var6 + 48)); } - var6 = var5 & 15; // L: 23 - if (var6 >= 10) { // L: 24 + var6 = var5 & 15; + if (var6 >= 10) { var2.append((char)(var6 + 55)); } else { var2.append((char)(var6 + 48)); } } } else { - var2.append(var4); // L: 25 + var2.append(var4); } } - return var2.toString(); // L: 28 + return var2.toString(); } @ObfuscatedName("n") @@ -97,16 +97,16 @@ public class class260 { garbageValue = "-68634034" ) static final int method5069(int var0, int var1, int var2) { - int var3 = var0 / var2; // L: 462 - int var4 = var0 & var2 - 1; // L: 463 - int var5 = var1 / var2; // L: 464 - int var6 = var1 & var2 - 1; // L: 465 - int var7 = class139.method2932(var3, var5); // L: 466 - int var8 = class139.method2932(var3 + 1, var5); // L: 467 - int var9 = class139.method2932(var3, var5 + 1); // L: 468 - int var10 = class139.method2932(var3 + 1, var5 + 1); // L: 469 - int var11 = class131.method2802(var7, var8, var4, var2); // L: 470 - int var12 = class131.method2802(var9, var10, var4, var2); // L: 471 - return class131.method2802(var11, var12, var6, var2); // L: 472 + int var3 = var0 / var2; + int var4 = var0 & var2 - 1; + int var5 = var1 / var2; + int var6 = var1 & var2 - 1; + int var7 = class139.method2932(var3, var5); + int var8 = class139.method2932(var3 + 1, var5); + int var9 = class139.method2932(var3, var5 + 1); + int var10 = class139.method2932(var3 + 1, var5 + 1); + int var11 = class131.method2802(var7, var8, var4, var2); + int var12 = class131.method2802(var9, var10, var4, var2); + return class131.method2802(var11, var12, var6, var2); } } diff --git a/runescape-client/src/main/java/class269.java b/runescape-client/src/main/java/class269.java index 211bc173dc..6412daf844 100644 --- a/runescape-client/src/main/java/class269.java +++ b/runescape-client/src/main/java/class269.java @@ -15,43 +15,43 @@ public class class269 { ) @Export("requestNetFile") static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) { - long var6 = (long)((var1 << 16) + var2); // L: 211 - NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); // L: 212 - if (var8 == null) { // L: 213 - var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); // L: 214 - if (var8 == null) { // L: 215 - var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); // L: 216 - if (var8 != null) { // L: 217 - if (var5) { // L: 218 - var8.removeDual(); // L: 219 - NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 220 - --NetCache.NetCache_pendingWritesCount; // L: 221 - ++NetCache.NetCache_pendingPriorityWritesCount; // L: 222 + long var6 = (long)((var1 << 16) + var2); + NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); + if (var8 == null) { + var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); + if (var8 == null) { + var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); + if (var8 != null) { + if (var5) { + var8.removeDual(); + NetCache.NetCache_pendingPriorityWrites.put(var8, var6); + --NetCache.NetCache_pendingWritesCount; + ++NetCache.NetCache_pendingPriorityWritesCount; } } else { - if (!var5) { // L: 226 - var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); // L: 227 - if (var8 != null) { // L: 228 + if (!var5) { + var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); + if (var8 != null) { return; } } - var8 = new NetFileRequest(); // L: 230 - var8.archive = var0; // L: 231 - var8.crc = var3; // L: 232 - var8.padding = var4; // L: 233 - if (var5) { // L: 234 - NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 235 - ++NetCache.NetCache_pendingPriorityWritesCount; // L: 236 + var8 = new NetFileRequest(); + var8.archive = var0; + var8.crc = var3; + var8.padding = var4; + if (var5) { + NetCache.NetCache_pendingPriorityWrites.put(var8, var6); + ++NetCache.NetCache_pendingPriorityWritesCount; } else { - NetCache.NetCache_pendingWritesQueue.addFirst(var8); // L: 239 - NetCache.NetCache_pendingWrites.put(var8, var6); // L: 240 - ++NetCache.NetCache_pendingWritesCount; // L: 241 + NetCache.NetCache_pendingWritesQueue.addFirst(var8); + NetCache.NetCache_pendingWrites.put(var8, var6); + ++NetCache.NetCache_pendingWritesCount; } } } } - } // L: 224 243 + } } diff --git a/runescape-client/src/main/java/class27.java b/runescape-client/src/main/java/class27.java index db3ae71340..105217e1d6 100644 --- a/runescape-client/src/main/java/class27.java +++ b/runescape-client/src/main/java/class27.java @@ -11,8 +11,8 @@ public class class27 { garbageValue = "1638077488" ) public static void method432(Applet var0, String var1) throws Throwable { - JSObject.getWindow(var0).eval(var1); // L: 13 - } // L: 14 + JSObject.getWindow(var0).eval(var1); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -20,6 +20,6 @@ public class class27 { garbageValue = "-1601030388" ) static Object method433(Applet var0, String var1, Object[] var2) throws Throwable { - return JSObject.getWindow(var0).call(var1, var2); // L: 17 + return JSObject.getWindow(var0).call(var1, var2); } } diff --git a/runescape-client/src/main/java/class273.java b/runescape-client/src/main/java/class273.java index 18dbe58cc6..9dfdb98b71 100644 --- a/runescape-client/src/main/java/class273.java +++ b/runescape-client/src/main/java/class273.java @@ -12,26 +12,26 @@ public class class273 { ) @Export("getVarbit") public static int getVarbit(int var0) { - VarbitComposition var2 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); // L: 26 + VarbitComposition var2 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); VarbitComposition var1; - if (var2 != null) { // L: 27 - var1 = var2; // L: 28 + if (var2 != null) { + var1 = var2; } else { - byte[] var3 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); // L: 31 - var2 = new VarbitComposition(); // L: 32 - if (var3 != null) { // L: 33 + byte[] var3 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); + var2 = new VarbitComposition(); + if (var3 != null) { var2.decode(new Buffer(var3)); } - VarbitComposition.VarbitDefinition_cached.put(var2, (long)var0); // L: 34 - var1 = var2; // L: 35 + VarbitComposition.VarbitDefinition_cached.put(var2, (long)var0); + var1 = var2; } - int var7 = var1.baseVar; // L: 38 - int var4 = var1.startBit; // L: 39 - int var5 = var1.endBit; // L: 40 - int var6 = Varps.Varps_masks[var5 - var4]; // L: 41 - return Varps.Varps_main[var7] >> var4 & var6; // L: 42 + int var7 = var1.baseVar; + int var4 = var1.startBit; + int var5 = var1.endBit; + int var6 = Varps.Varps_masks[var5 - var4]; + return Varps.Varps_main[var7] >> var4 & var6; } @ObfuscatedName("m") @@ -42,108 +42,108 @@ public class class273 { static int method5332(int var0, Script var1, boolean var2) { int var4; int var9; - if (var0 == ScriptOpcodes.CC_CREATE) { // L: 480 - IsaacCipher.Interpreter_intStackSize -= 3; // L: 481 - var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 482 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 483 - int var11 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 484 - if (var4 == 0) { // L: 485 - throw new RuntimeException(); // L: 486 + if (var0 == ScriptOpcodes.CC_CREATE) { + IsaacCipher.Interpreter_intStackSize -= 3; + var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + int var11 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; + if (var4 == 0) { + throw new RuntimeException(); } else { - Widget var6 = ChatChannel.getWidget(var9); // L: 488 - if (var6.children == null) { // L: 489 + Widget var6 = ChatChannel.getWidget(var9); + if (var6.children == null) { var6.children = new Widget[var11 + 1]; } - if (var6.children.length <= var11) { // L: 490 - Widget[] var7 = new Widget[var11 + 1]; // L: 491 + if (var6.children.length <= var11) { + Widget[] var7 = new Widget[var11 + 1]; - for (int var8 = 0; var8 < var6.children.length; ++var8) { // L: 492 + for (int var8 = 0; var8 < var6.children.length; ++var8) { var7[var8] = var6.children[var8]; } - var6.children = var7; // L: 493 + var6.children = var7; } - if (var11 > 0 && var6.children[var11 - 1] == null) { // L: 495 + if (var11 > 0 && var6.children[var11 - 1] == null) { throw new RuntimeException("" + (var11 - 1)); } else { - Widget var12 = new Widget(); // L: 496 - var12.type = var4; // L: 497 - var12.parentId = var12.id = var6.id; // L: 498 - var12.childIndex = var11; // L: 499 - var12.isIf3 = true; // L: 500 - var6.children[var11] = var12; // L: 501 - if (var2) { // L: 502 + Widget var12 = new Widget(); + var12.type = var4; + var12.parentId = var12.id = var6.id; + var12.childIndex = var11; + var12.isIf3 = true; + var6.children[var11] = var12; + if (var2) { WorldMapArea.scriptDotWidget = var12; } else { - Messages.scriptActiveWidget = var12; // L: 503 + Messages.scriptActiveWidget = var12; } - SecureRandomCallable.invalidateWidget(var6); // L: 504 - return 1; // L: 505 + SecureRandomCallable.invalidateWidget(var6); + return 1; } } } else { Widget var3; - if (var0 == ScriptOpcodes.CC_DELETE) { // L: 507 - var3 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; // L: 508 - Widget var10 = ChatChannel.getWidget(var3.id); // L: 509 - var10.children[var3.childIndex] = null; // L: 510 - SecureRandomCallable.invalidateWidget(var10); // L: 511 - return 1; // L: 512 - } else if (var0 == ScriptOpcodes.CC_DELETEALL) { // L: 514 - var3 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 515 - var3.children = null; // L: 516 - SecureRandomCallable.invalidateWidget(var3); // L: 517 - return 1; // L: 518 - } else if (var0 == 103) { // L: 520 - IsaacCipher.Interpreter_intStackSize -= 3; // L: 521 - return 1; // L: 522 - } else if (var0 == 104) { // L: 524 - --IsaacCipher.Interpreter_intStackSize; // L: 525 - return 1; // L: 526 - } else if (var0 != ScriptOpcodes.CC_FIND) { // L: 528 - if (var0 == ScriptOpcodes.IF_FIND) { // L: 541 - var3 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 542 - if (var3 != null) { // L: 543 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; // L: 544 - if (var2) { // L: 545 + if (var0 == ScriptOpcodes.CC_DELETE) { + var3 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; + Widget var10 = ChatChannel.getWidget(var3.id); + var10.children[var3.childIndex] = null; + SecureRandomCallable.invalidateWidget(var10); + return 1; + } else if (var0 == ScriptOpcodes.CC_DELETEALL) { + var3 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); + var3.children = null; + SecureRandomCallable.invalidateWidget(var3); + return 1; + } else if (var0 == 103) { + IsaacCipher.Interpreter_intStackSize -= 3; + return 1; + } else if (var0 == 104) { + --IsaacCipher.Interpreter_intStackSize; + return 1; + } else if (var0 != ScriptOpcodes.CC_FIND) { + if (var0 == ScriptOpcodes.IF_FIND) { + var3 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); + if (var3 != null) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; + if (var2) { WorldMapArea.scriptDotWidget = var3; } else { - Messages.scriptActiveWidget = var3; // L: 546 + Messages.scriptActiveWidget = var3; } } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 548 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; } - return 1; // L: 549 - } else if (var0 == 202) { // L: 551 - Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1] = 0; // L: 552 - return 1; // L: 553 - } else if (var0 == 203) { // L: 555 - Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize + 1] = 0; // L: 556 - return 1; // L: 557 + return 1; + } else if (var0 == 202) { + Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1] = 0; + return 1; + } else if (var0 == 203) { + Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize + 1] = 0; + return 1; } else { - return 2; // L: 559 + return 2; } } else { - IsaacCipher.Interpreter_intStackSize -= 2; // L: 529 - var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 530 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 531 - Widget var5 = class126.getWidgetChild(var9, var4); // L: 532 - if (var5 != null && var4 != -1) { // L: 533 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; // L: 534 - if (var2) { // L: 535 + IsaacCipher.Interpreter_intStackSize -= 2; + var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + Widget var5 = class126.getWidgetChild(var9, var4); + if (var5 != null && var4 != -1) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; + if (var2) { WorldMapArea.scriptDotWidget = var5; } else { - Messages.scriptActiveWidget = var5; // L: 536 + Messages.scriptActiveWidget = var5; } } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 538 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; } - return 1; // L: 539 + return 1; } } } @@ -154,29 +154,29 @@ public class class273 { garbageValue = "-11359" ) public static void method5333(int var0) { - if (var0 != -1) { // L: 240 - if (Widget.Widget_loadedInterfaces[var0]) { // L: 241 - CollisionMap.Widget_archive.clearFilesGroup(var0); // L: 242 - if (MouseRecorder.Widget_interfaceComponents[var0] != null) { // L: 243 - boolean var1 = true; // L: 244 + if (var0 != -1) { + if (Widget.Widget_loadedInterfaces[var0]) { + CollisionMap.Widget_archive.clearFilesGroup(var0); + if (MouseRecorder.Widget_interfaceComponents[var0] != null) { + boolean var1 = true; - for (int var2 = 0; var2 < MouseRecorder.Widget_interfaceComponents[var0].length; ++var2) { // L: 245 - if (MouseRecorder.Widget_interfaceComponents[var0][var2] != null) { // L: 246 - if (MouseRecorder.Widget_interfaceComponents[var0][var2].type != 2) { // L: 247 + for (int var2 = 0; var2 < MouseRecorder.Widget_interfaceComponents[var0].length; ++var2) { + if (MouseRecorder.Widget_interfaceComponents[var0][var2] != null) { + if (MouseRecorder.Widget_interfaceComponents[var0][var2].type != 2) { MouseRecorder.Widget_interfaceComponents[var0][var2] = null; } else { - var1 = false; // L: 248 + var1 = false; } } } if (var1) { - MouseRecorder.Widget_interfaceComponents[var0] = null; // L: 251 + MouseRecorder.Widget_interfaceComponents[var0] = null; } - Widget.Widget_loadedInterfaces[var0] = false; // L: 252 + Widget.Widget_loadedInterfaces[var0] = false; } } } - } // L: 253 + } } diff --git a/runescape-client/src/main/java/class277.java b/runescape-client/src/main/java/class277.java index 05af3c58b2..f02bc64922 100644 --- a/runescape-client/src/main/java/class277.java +++ b/runescape-client/src/main/java/class277.java @@ -11,6 +11,6 @@ public class class277 { ) @Export("isDigit") public static boolean isDigit(char var0) { - return var0 >= '0' && var0 <= '9'; // L: 148 + return var0 >= '0' && var0 <= '9'; } } diff --git a/runescape-client/src/main/java/class279.java b/runescape-client/src/main/java/class279.java index 017eb61519..a00295e5f8 100644 --- a/runescape-client/src/main/java/class279.java +++ b/runescape-client/src/main/java/class279.java @@ -21,10 +21,10 @@ public class class279 { public static NetFileRequest NetCache_currentResponse; static { - field3209 = new short[]{6798, 8741, 25238, 4626, 4550}; // L: 4 - field3208 = 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 - field3211 = new short[]{-10304, 9104, -1, -1, -1}; // L: 12 - field3210 = 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 + field3209 = new short[]{6798, 8741, 25238, 4626, 4550}; + field3208 = 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}}; + field3211 = new short[]{-10304, 9104, -1, -1, -1}; + field3210 = new short[][]{{6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002}, {9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019}, new short[0], new short[0], new short[0]}; } @ObfuscatedName("m") @@ -33,20 +33,20 @@ public class class279 { garbageValue = "1285186796" ) public static char method5406(byte var0) { - int var1 = var0 & 255; // L: 66 - if (var1 == 0) { // L: 67 + int var1 = var0 & 255; + if (var1 == 0) { throw new IllegalArgumentException("" + Integer.toString(var1, 16)); } else { - if (var1 >= 128 && var1 < 160) { // L: 68 - char var2 = class328.cp1252AsciiExtension[var1 - 128]; // L: 69 - if (var2 == 0) { // L: 70 + if (var1 >= 128 && var1 < 160) { + char var2 = class328.cp1252AsciiExtension[var1 - 128]; + if (var2 == 0) { var2 = '?'; } - var1 = var2; // L: 71 + var1 = var2; } - return (char)var1; // L: 73 + return (char)var1; } } @@ -56,58 +56,58 @@ public class class279 { garbageValue = "-19" ) static int method5405(int var0, Script var1, boolean var2) { - int var3 = -1; // L: 563 + int var3 = -1; Widget var4; - if (var0 >= 2000) { // L: 565 - var0 -= 1000; // L: 566 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 567 - var4 = ChatChannel.getWidget(var3); // L: 568 + if (var0 >= 2000) { + var0 -= 1000; + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + var4 = ChatChannel.getWidget(var3); } else { - var4 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; // L: 570 + var4 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; } - if (var0 == ScriptOpcodes.CC_SETPOSITION) { // L: 571 - IsaacCipher.Interpreter_intStackSize -= 4; // L: 572 - var4.rawX = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 573 - var4.rawY = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 574 - var4.xAlignment = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 575 - var4.yAlignment = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3]; // L: 576 - SecureRandomCallable.invalidateWidget(var4); // L: 577 - class295.client.alignWidget(var4); // L: 578 - if (var3 != -1 && var4.type == 0) { // L: 579 + if (var0 == ScriptOpcodes.CC_SETPOSITION) { + IsaacCipher.Interpreter_intStackSize -= 4; + var4.rawX = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4.rawY = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + var4.xAlignment = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; + var4.yAlignment = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3]; + SecureRandomCallable.invalidateWidget(var4); + class295.client.alignWidget(var4); + if (var3 != -1 && var4.type == 0) { class115.revalidateWidgetScroll(MouseRecorder.Widget_interfaceComponents[var3 >> 16], var4, false); } - return 1; // L: 580 - } else if (var0 == ScriptOpcodes.CC_SETSIZE) { // L: 582 - IsaacCipher.Interpreter_intStackSize -= 4; // L: 583 - var4.rawWidth = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 584 - var4.rawHeight = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 585 - var4.widthAlignment = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 586 - var4.heightAlignment = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3]; // L: 587 - SecureRandomCallable.invalidateWidget(var4); // L: 588 - class295.client.alignWidget(var4); // L: 589 - if (var3 != -1 && var4.type == 0) { // L: 590 + return 1; + } else if (var0 == ScriptOpcodes.CC_SETSIZE) { + IsaacCipher.Interpreter_intStackSize -= 4; + var4.rawWidth = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4.rawHeight = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + var4.widthAlignment = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; + var4.heightAlignment = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3]; + SecureRandomCallable.invalidateWidget(var4); + class295.client.alignWidget(var4); + if (var3 != -1 && var4.type == 0) { class115.revalidateWidgetScroll(MouseRecorder.Widget_interfaceComponents[var3 >> 16], var4, false); } - return 1; // L: 591 - } else if (var0 == ScriptOpcodes.CC_SETHIDE) { // L: 593 - boolean var5 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 594 - if (var5 != var4.isHidden) { // L: 595 - var4.isHidden = var5; // L: 596 - SecureRandomCallable.invalidateWidget(var4); // L: 597 + return 1; + } else if (var0 == ScriptOpcodes.CC_SETHIDE) { + boolean var5 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + if (var5 != var4.isHidden) { + var4.isHidden = var5; + SecureRandomCallable.invalidateWidget(var4); } - return 1; // L: 599 - } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { // L: 601 - var4.noClickThrough = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 602 - return 1; // L: 603 - } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { // L: 605 - var4.noScrollThrough = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 606 - return 1; // L: 607 + return 1; + } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { + var4.noClickThrough = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { + var4.noScrollThrough = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + return 1; } else { - return 2; // L: 609 + return 2; } } } diff --git a/runescape-client/src/main/java/class28.java b/runescape-client/src/main/java/class28.java index d67047968f..a808e366fd 100644 --- a/runescape-client/src/main/java/class28.java +++ b/runescape-client/src/main/java/class28.java @@ -14,8 +14,8 @@ public class class28 { static int field168; static { - ImageIO.setUseCache(false); // L: 12 - } // L: 13 + ImageIO.setUseCache(false); + } @ObfuscatedName("an") @ObfuscatedSignature( @@ -24,139 +24,139 @@ public class class28 { ) static int method443(int var0, Script var1, boolean var2) { int var3; - if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { // L: 2681 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2682 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); // L: 2683 - return 1; // L: 2684 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { // L: 2686 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2687 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; // L: 2688 - return 1; // L: 2689 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { // L: 2691 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2692 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; // L: 2693 - return 1; // L: 2694 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { // L: 2696 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2697 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; // L: 2698 - return 1; // L: 2699 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { // L: 2701 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2702 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; // L: 2703 - return 1; // L: 2704 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { // L: 2706 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2707 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; // L: 2708 - return 1; // L: 2709 + if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; + return 1; } else { int var13; - if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { // L: 2711 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2712 - var13 = Client.grandExchangeOffers[var3].status(); // L: 2713 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var13 == 0 ? 1 : 0; // L: 2714 - return 1; // L: 2715 - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { // L: 2717 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2718 - var13 = Client.grandExchangeOffers[var3].status(); // L: 2719 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var13 == 2 ? 1 : 0; // L: 2720 - return 1; // L: 2721 - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { // L: 2723 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2724 - var13 = Client.grandExchangeOffers[var3].status(); // L: 2725 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var13 == 5 ? 1 : 0; // L: 2726 - return 1; // L: 2727 - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { // L: 2729 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2730 - var13 = Client.grandExchangeOffers[var3].status(); // L: 2731 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var13 == 1 ? 1 : 0; // L: 2732 - return 1; // L: 2733 + if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + var13 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var13 == 0 ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + var13 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var13 == 2 ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + var13 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var13 == 5 ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + var13 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var13 == 1 ? 1 : 0; + return 1; } else { boolean var12; - if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { // L: 2735 - var12 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2736 - if (Client.grandExchangeEvents != null) { // L: 2737 - Client.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var12); // L: 2738 + if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { + var12 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + if (Client.grandExchangeEvents != null) { + Client.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var12); } - return 1; // L: 2740 - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { // L: 2742 - var12 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2743 - if (Client.grandExchangeEvents != null) { // L: 2744 - Client.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var12); // L: 2745 + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { + var12 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + if (Client.grandExchangeEvents != null) { + Client.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var12); } - return 1; // L: 2747 - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { // L: 2749 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 2750 - var12 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] == 1; // L: 2751 - boolean var11 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1] == 1; // L: 2752 - if (Client.grandExchangeEvents != null) { // L: 2753 - Client.GrandExchangeEvents_worldComparator.filterWorlds = var11; // L: 2754 - Client.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var12); // L: 2755 + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { + IsaacCipher.Interpreter_intStackSize -= 2; + var12 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] == 1; + boolean var11 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1] == 1; + if (Client.grandExchangeEvents != null) { + Client.GrandExchangeEvents_worldComparator.filterWorlds = var11; + Client.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var12); } - return 1; // L: 2757 - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { // L: 2759 - var12 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2760 - if (Client.grandExchangeEvents != null) { // L: 2761 - Client.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var12); // L: 2762 + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { + var12 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + if (Client.grandExchangeEvents != null) { + Client.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var12); } - return 1; // L: 2764 - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { // L: 2766 - var12 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2767 - if (Client.grandExchangeEvents != null) { // L: 2768 - Client.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var12); // L: 2769 + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { + var12 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; + if (Client.grandExchangeEvents != null) { + Client.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var12); } - return 1; // L: 2771 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { // L: 2773 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.grandExchangeEvents == null ? 0 : Client.grandExchangeEvents.events.size(); // L: 2774 - return 1; // L: 2775 + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.grandExchangeEvents == null ? 0 : Client.grandExchangeEvents.events.size(); + return 1; } else { GrandExchangeEvent var4; - if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { // L: 2777 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2778 - var4 = (GrandExchangeEvent)Client.grandExchangeEvents.events.get(var3); // L: 2779 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.world; // L: 2780 - return 1; // L: 2781 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { // L: 2783 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2784 - var4 = (GrandExchangeEvent)Client.grandExchangeEvents.events.get(var3); // L: 2785 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.getOfferName(); // L: 2786 - return 1; // L: 2787 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { // L: 2789 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2790 - var4 = (GrandExchangeEvent)Client.grandExchangeEvents.events.get(var3); // L: 2791 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.getPreviousOfferName(); // L: 2792 - return 1; // L: 2793 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { // L: 2795 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2796 - var4 = (GrandExchangeEvent)Client.grandExchangeEvents.events.get(var3); // L: 2797 - long var5 = Ignored.method6459() - WorldMapSprite.field2727 - var4.age; // L: 2798 - int var7 = (int)(var5 / 3600000L); // L: 2799 - int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); // L: 2800 - int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); // L: 2801 - String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; // L: 2802 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var10; // L: 2803 - return 1; // L: 2804 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { // L: 2806 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2807 - var4 = (GrandExchangeEvent)Client.grandExchangeEvents.events.get(var3); // L: 2808 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.totalQuantity; // L: 2809 - return 1; // L: 2810 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { // L: 2812 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2813 - var4 = (GrandExchangeEvent)Client.grandExchangeEvents.events.get(var3); // L: 2814 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.unitPrice; // L: 2815 - return 1; // L: 2816 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { // L: 2818 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2819 - var4 = (GrandExchangeEvent)Client.grandExchangeEvents.events.get(var3); // L: 2820 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.id; // L: 2821 - return 1; // L: 2822 + if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + var4 = (GrandExchangeEvent)Client.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.world; + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + var4 = (GrandExchangeEvent)Client.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.getOfferName(); + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + var4 = (GrandExchangeEvent)Client.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.getPreviousOfferName(); + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + var4 = (GrandExchangeEvent)Client.grandExchangeEvents.events.get(var3); + long var5 = Ignored.method6459() - WorldMapSprite.field2727 - var4.age; + int var7 = (int)(var5 / 3600000L); + int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); + int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); + String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var10; + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + var4 = (GrandExchangeEvent)Client.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.totalQuantity; + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + var4 = (GrandExchangeEvent)Client.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.unitPrice; + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + var4 = (GrandExchangeEvent)Client.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.id; + return 1; } else { - return 2; // L: 2824 + return 2; } } } @@ -170,30 +170,30 @@ public class class28 { ) @Export("runCs1") static final boolean runCs1(Widget var0) { - if (var0.cs1Comparisons == null) { // L: 11045 + if (var0.cs1Comparisons == null) { return false; } else { - for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { // L: 11046 - int var2 = method442(var0, var1); // L: 11047 - int var3 = var0.cs1ComparisonValues[var1]; // L: 11048 - if (var0.cs1Comparisons[var1] == 2) { // L: 11049 - if (var2 >= var3) { // L: 11050 + for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { + int var2 = method442(var0, var1); + int var3 = var0.cs1ComparisonValues[var1]; + if (var0.cs1Comparisons[var1] == 2) { + if (var2 >= var3) { return false; } - } else if (var0.cs1Comparisons[var1] == 3) { // L: 11052 - if (var2 <= var3) { // L: 11053 + } else if (var0.cs1Comparisons[var1] == 3) { + if (var2 <= var3) { return false; } - } else if (var0.cs1Comparisons[var1] == 4) { // L: 11055 - if (var3 == var2) { // L: 11056 + } else if (var0.cs1Comparisons[var1] == 4) { + if (var3 == var2) { return false; } - } else if (var3 != var2) { // L: 11058 + } else if (var3 != var2) { return false; } } - return true; // L: 11060 + return true; } } @@ -203,30 +203,30 @@ public class class28 { garbageValue = "-2117288569" ) static final int method442(Widget var0, int var1) { - if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { // L: 11064 + if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { try { - int[] var2 = var0.cs1Instructions[var1]; // L: 11066 - int var3 = 0; // L: 11067 - int var4 = 0; // L: 11068 - byte var5 = 0; // L: 11069 + int[] var2 = var0.cs1Instructions[var1]; + int var3 = 0; + int var4 = 0; + byte var5 = 0; while (true) { - int var6 = var2[var4++]; // L: 11071 - int var7 = 0; // L: 11072 - byte var8 = 0; // L: 11073 - if (var6 == 0) { // L: 11074 + int var6 = var2[var4++]; + int var7 = 0; + byte var8 = 0; + if (var6 == 0) { return var3; } - if (var6 == 1) { // L: 11075 + if (var6 == 1) { var7 = Client.currentLevels[var2[var4++]]; } - if (var6 == 2) { // L: 11076 + if (var6 == 2) { var7 = Client.levels[var2[var4++]]; } - if (var6 == 3) { // L: 11077 + if (var6 == 3) { var7 = Client.experience[var2[var4++]]; } @@ -234,126 +234,126 @@ public class class28 { Widget var10; int var11; int var12; - if (var6 == 4) { // L: 11078 - var9 = var2[var4++] << 16; // L: 11079 - var9 += var2[var4++]; // L: 11080 - var10 = ChatChannel.getWidget(var9); // L: 11081 - var11 = var2[var4++]; // L: 11082 - if (var11 != -1 && (!UserComparator6.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 11083 - for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 11084 - if (var11 + 1 == var10.itemIds[var12]) { // L: 11085 + if (var6 == 4) { + var9 = var2[var4++] << 16; + var9 += var2[var4++]; + var10 = ChatChannel.getWidget(var9); + var11 = var2[var4++]; + if (var11 != -1 && (!UserComparator6.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { + if (var11 + 1 == var10.itemIds[var12]) { var7 += var10.itemQuantities[var12]; } } } } - if (var6 == 5) { // L: 11089 + if (var6 == 5) { var7 = Varps.Varps_main[var2[var4++]]; } - if (var6 == 6) { // L: 11090 + if (var6 == 6) { var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1]; } - if (var6 == 7) { // L: 11091 + if (var6 == 7) { var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875; } - if (var6 == 8) { // L: 11092 + if (var6 == 8) { var7 = class340.localPlayer.combatLevel; } - if (var6 == 9) { // L: 11093 - for (var9 = 0; var9 < 25; ++var9) { // L: 11094 - if (Skills.Skills_enabled[var9]) { // L: 11095 + if (var6 == 9) { + for (var9 = 0; var9 < 25; ++var9) { + if (Skills.Skills_enabled[var9]) { var7 += Client.levels[var9]; } } } - if (var6 == 10) { // L: 11098 - var9 = var2[var4++] << 16; // L: 11099 - var9 += var2[var4++]; // L: 11100 - var10 = ChatChannel.getWidget(var9); // L: 11101 - var11 = var2[var4++]; // L: 11102 - if (var11 != -1 && (!UserComparator6.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 11103 - for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 11104 - if (var11 + 1 == var10.itemIds[var12]) { // L: 11105 - var7 = 999999999; // L: 11106 - break; // L: 11107 + if (var6 == 10) { + var9 = var2[var4++] << 16; + var9 += var2[var4++]; + var10 = ChatChannel.getWidget(var9); + var11 = var2[var4++]; + if (var11 != -1 && (!UserComparator6.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { + if (var11 + 1 == var10.itemIds[var12]) { + var7 = 999999999; + break; } } } } - if (var6 == 11) { // L: 11112 + if (var6 == 11) { var7 = Client.runEnergy; } - if (var6 == 12) { // L: 11113 + if (var6 == 12) { var7 = Client.weight; } - if (var6 == 13) { // L: 11114 - var9 = Varps.Varps_main[var2[var4++]]; // L: 11115 - int var13 = var2[var4++]; // L: 11116 - var7 = (var9 & 1 << var13) != 0 ? 1 : 0; // L: 11117 + if (var6 == 13) { + var9 = Varps.Varps_main[var2[var4++]]; + int var13 = var2[var4++]; + var7 = (var9 & 1 << var13) != 0 ? 1 : 0; } - if (var6 == 14) { // L: 11119 - var9 = var2[var4++]; // L: 11120 - var7 = class273.getVarbit(var9); // L: 11121 + if (var6 == 14) { + var9 = var2[var4++]; + var7 = class273.getVarbit(var9); } - if (var6 == 15) { // L: 11123 + if (var6 == 15) { var8 = 1; } - if (var6 == 16) { // L: 11124 + if (var6 == 16) { var8 = 2; } - if (var6 == 17) { // L: 11125 + if (var6 == 17) { var8 = 3; } - if (var6 == 18) { // L: 11126 + if (var6 == 18) { var7 = (class340.localPlayer.x >> 7) + class131.baseX; } - if (var6 == 19) { // L: 11127 + if (var6 == 19) { var7 = (class340.localPlayer.y >> 7) + TileItem.baseY; } - if (var6 == 20) { // L: 11128 + if (var6 == 20) { var7 = var2[var4++]; } - if (var8 == 0) { // L: 11129 - if (var5 == 0) { // L: 11130 + if (var8 == 0) { + if (var5 == 0) { var3 += var7; } - if (var5 == 1) { // L: 11131 + if (var5 == 1) { var3 -= var7; } - if (var5 == 2 && var7 != 0) { // L: 11132 + if (var5 == 2 && var7 != 0) { var3 /= var7; } - if (var5 == 3) { // L: 11133 + if (var5 == 3) { var3 *= var7; } - var5 = 0; // L: 11134 + var5 = 0; } else { - var5 = var8; // L: 11136 + var5 = var8; } } - } catch (Exception var14) { // L: 11139 - return -1; // L: 11140 + } catch (Exception var14) { + return -1; } } else { return -2; diff --git a/runescape-client/src/main/java/class281.java b/runescape-client/src/main/java/class281.java index ec18b333e6..6990541296 100644 --- a/runescape-client/src/main/java/class281.java +++ b/runescape-client/src/main/java/class281.java @@ -23,133 +23,133 @@ public class class281 { ) @Export("changeGameOptions") static final void changeGameOptions(int var0) { - UserComparator6.method2551(); // L: 12161 - ObjectComposition.method3540(); // L: 12162 - int var1 = SecureRandomCallable.VarpDefinition_get(var0).type; // L: 12163 - if (var1 != 0) { // L: 12164 - int var2 = Varps.Varps_main[var0]; // L: 12165 - if (var1 == 1) { // L: 12166 - if (var2 == 1) { // L: 12167 + UserComparator6.method2551(); + ObjectComposition.method3540(); + int var1 = SecureRandomCallable.VarpDefinition_get(var0).type; + if (var1 != 0) { + int var2 = Varps.Varps_main[var0]; + if (var1 == 1) { + if (var2 == 1) { InterfaceParent.method2142(0.9D); } - if (var2 == 2) { // L: 12168 + if (var2 == 2) { InterfaceParent.method2142(0.8D); } - if (var2 == 3) { // L: 12169 + if (var2 == 3) { InterfaceParent.method2142(0.7D); } - if (var2 == 4) { // L: 12170 + if (var2 == 4) { InterfaceParent.method2142(0.6D); } } - if (var1 == 3) { // L: 12172 - if (var2 == 0) { // L: 12173 + if (var1 == 3) { + if (var2 == 0) { Varcs.method2426(255); } - if (var2 == 1) { // L: 12174 + if (var2 == 1) { Varcs.method2426(192); } - if (var2 == 2) { // L: 12175 + if (var2 == 2) { Varcs.method2426(128); } - if (var2 == 3) { // L: 12176 + if (var2 == 3) { Varcs.method2426(64); } - if (var2 == 4) { // L: 12177 + if (var2 == 4) { Varcs.method2426(0); } } - if (var1 == 4) { // L: 12179 - if (var2 == 0) { // L: 12180 + if (var1 == 4) { + if (var2 == 0) { class20.updateSoundEffectVolume(127); } - if (var2 == 1) { // L: 12181 + if (var2 == 1) { class20.updateSoundEffectVolume(96); } - if (var2 == 2) { // L: 12182 + if (var2 == 2) { class20.updateSoundEffectVolume(64); } - if (var2 == 3) { // L: 12183 + if (var2 == 3) { class20.updateSoundEffectVolume(32); } - if (var2 == 4) { // L: 12184 + if (var2 == 4) { class20.updateSoundEffectVolume(0); } } - if (var1 == 5) { // L: 12186 + if (var1 == 5) { Client.leftClickOpensMenu = var2; } - if (var1 == 6) { // L: 12187 + if (var1 == 6) { Client.chatEffects = var2; } - if (var1 == 9) { // L: 12188 + if (var1 == 9) { Client.field641 = var2; } - if (var1 == 10) { // L: 12189 - if (var2 == 0) { // L: 12190 + if (var1 == 10) { + if (var2 == 0) { Players.method2383(127); } - if (var2 == 1) { // L: 12191 + if (var2 == 1) { Players.method2383(96); } - if (var2 == 2) { // L: 12192 + if (var2 == 2) { Players.method2383(64); } - if (var2 == 3) { // L: 12193 + if (var2 == 3) { Players.method2383(32); } - if (var2 == 4) { // L: 12194 + if (var2 == 4) { Players.method2383(0); } } - if (var1 == 17) { // L: 12196 - Client.followerIndex = var2 & 65535; // L: 12197 + if (var1 == 17) { + Client.followerIndex = var2 & 65535; } - if (var1 == 18) { // L: 12199 - Client.playerAttackOption = (AttackOption)class130.findEnumerated(FloorUnderlayDefinition.method3376(), var2); // L: 12200 - if (Client.playerAttackOption == null) { // L: 12201 + if (var1 == 18) { + Client.playerAttackOption = (AttackOption)class130.findEnumerated(FloorUnderlayDefinition.method3376(), var2); + if (Client.playerAttackOption == null) { Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; } } - if (var1 == 19) { // L: 12203 - if (var2 == -1) { // L: 12204 + if (var1 == 19) { + if (var2 == -1) { Client.combatTargetPlayerIndex = -1; } else { - Client.combatTargetPlayerIndex = var2 & 2047; // L: 12205 + Client.combatTargetPlayerIndex = var2 & 2047; } } - if (var1 == 22) { // L: 12207 - Client.npcAttackOption = (AttackOption)class130.findEnumerated(FloorUnderlayDefinition.method3376(), var2); // L: 12208 - if (Client.npcAttackOption == null) { // L: 12209 + if (var1 == 22) { + Client.npcAttackOption = (AttackOption)class130.findEnumerated(FloorUnderlayDefinition.method3376(), var2); + if (Client.npcAttackOption == null) { Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; } } } - } // L: 12211 + } } diff --git a/runescape-client/src/main/java/class282.java b/runescape-client/src/main/java/class282.java index 48a13ff6e6..c20e65d774 100644 --- a/runescape-client/src/main/java/class282.java +++ b/runescape-client/src/main/java/class282.java @@ -38,8 +38,8 @@ public enum class282 implements MouseWheel { final int field3381; class282(int var3) { - this.field3381 = var3; // L: 14 - } // L: 15 + this.field3381 = var3; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -48,7 +48,7 @@ public enum class282 implements MouseWheel { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field3381; // L: 19 + return this.field3381; } @ObfuscatedName("w") @@ -58,7 +58,7 @@ public enum class282 implements MouseWheel { ) @Export("worldListStart") static World worldListStart() { - World.World_listCount = 0; // L: 237 - return Canvas.getNextWorldListWorld(); // L: 238 + World.World_listCount = 0; + return Canvas.getNextWorldListWorld(); } } diff --git a/runescape-client/src/main/java/class285.java b/runescape-client/src/main/java/class285.java index 0a3af45ea8..9e3d931b66 100644 --- a/runescape-client/src/main/java/class285.java +++ b/runescape-client/src/main/java/class285.java @@ -11,8 +11,8 @@ public class class285 { ) @Export("runScriptEvent") public static void runScriptEvent(ScriptEvent var0) { - ScriptFrame.runScript(var0, 500000, 475000); // L: 110 - } // L: 111 + ScriptFrame.runScript(var0, 500000, 475000); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -21,6 +21,6 @@ public class class285 { ) @Export("ByteArrayPool_getArray") public static synchronized byte[] ByteArrayPool_getArray(int var0) { - return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); // L: 92 + return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); } } diff --git a/runescape-client/src/main/java/class286.java b/runescape-client/src/main/java/class286.java index b7fb349753..8154d0329f 100644 --- a/runescape-client/src/main/java/class286.java +++ b/runescape-client/src/main/java/class286.java @@ -19,26 +19,26 @@ public final class class286 { ) @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 = class334.World_worlds[var6]; // L: 180 - class334.World_worlds[var6] = class334.World_worlds[var1]; // L: 181 - class334.World_worlds[var1] = var8; // L: 182 + if (var0 < var1) { + int var6 = (var0 + var1) / 2; + int var7 = var0; + World var8 = class334.World_worlds[var6]; + class334.World_worlds[var6] = class334.World_worlds[var1]; + class334.World_worlds[var1] = var8; - for (int var9 = var0; var9 < var1; ++var9) { // L: 183 - if (UserComparator4.method2506(class334.World_worlds[var9], var8, var2, var3, var4, var5) <= 0) { // L: 184 - World var10 = class334.World_worlds[var9]; // L: 185 - class334.World_worlds[var9] = class334.World_worlds[var7]; // L: 186 - class334.World_worlds[var7++] = var10; // L: 187 + for (int var9 = var0; var9 < var1; ++var9) { + if (UserComparator4.method2506(class334.World_worlds[var9], var8, var2, var3, var4, var5) <= 0) { + World var10 = class334.World_worlds[var9]; + class334.World_worlds[var9] = class334.World_worlds[var7]; + class334.World_worlds[var7++] = var10; } } - class334.World_worlds[var1] = class334.World_worlds[var7]; // L: 191 - class334.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 + class334.World_worlds[var1] = class334.World_worlds[var7]; + class334.World_worlds[var7] = var8; + doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); + doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); } - } // L: 196 + } } diff --git a/runescape-client/src/main/java/class287.java b/runescape-client/src/main/java/class287.java index d9b1ded89f..541ea4ee89 100644 --- a/runescape-client/src/main/java/class287.java +++ b/runescape-client/src/main/java/class287.java @@ -3,6 +3,6 @@ import net.runelite.mapping.ObfuscatedName; @ObfuscatedName("ks") public class class287 { static { - Math.sqrt(8192.0D); // L: 9 - } // L: 10 + Math.sqrt(8192.0D); + } } diff --git a/runescape-client/src/main/java/class288.java b/runescape-client/src/main/java/class288.java index 411f1b1996..14ac5453e5 100644 --- a/runescape-client/src/main/java/class288.java +++ b/runescape-client/src/main/java/class288.java @@ -27,14 +27,14 @@ public class class288 { final int field3437; static { - field3436 = new class288(51, 27, 800, 0, 16, 16); // L: 29 - field3438 = new class288(25, 28, 800, 656, 40, 40); // L: 30 + field3436 = new class288(51, 27, 800, 0, 16, 16); + field3438 = new class288(25, 28, 800, 656, 40, 40); } class288(int var1, int var2, int var3, int var4, int var5, int var6) { - this.field3435 = var5; // L: 39 - this.field3437 = var6; // L: 40 - } // L: 41 + this.field3435 = var5; + this.field3437 = var6; + } @ObfuscatedName("is") @ObfuscatedSignature( @@ -43,9 +43,9 @@ public class class288 { ) @Export("resumePauseWidget") static void resumePauseWidget(int var0, int var1) { - PacketBufferNode var2 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2873, Client.packetWriter.isaacCipher); // L: 9896 - var2.packetBuffer.method7349(var1); // L: 9897 - var2.packetBuffer.method7407(var0); // L: 9898 - Client.packetWriter.addNode(var2); // L: 9899 - } // L: 9900 + PacketBufferNode var2 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2873, Client.packetWriter.isaacCipher); + var2.packetBuffer.method7349(var1); + var2.packetBuffer.method7407(var0); + Client.packetWriter.addNode(var2); + } } diff --git a/runescape-client/src/main/java/class29.java b/runescape-client/src/main/java/class29.java index 70fc092b38..ef92e95799 100644 --- a/runescape-client/src/main/java/class29.java +++ b/runescape-client/src/main/java/class29.java @@ -17,8 +17,8 @@ public class class29 { public static String field177; static { - field172 = null; // L: 10 - field177 = ""; // L: 11 + field172 = null; + field177 = ""; } @ObfuscatedName("fd") @@ -28,119 +28,119 @@ public class class29 { ) @Export("getLoginError") static void getLoginError(int var0) { - if (var0 == -3) { // L: 3454 + if (var0 == -3) { class19.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); - } else if (var0 == -2) { // L: 3455 + } else if (var0 == -2) { class19.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); - } else if (var0 == -1) { // L: 3456 + } else if (var0 == -1) { class19.setLoginResponseString("No response from server.", "Please try using a different world.", ""); - } else if (var0 == 3) { // L: 3457 - PlayerType.method5521(3); // L: 3458 - Login.field872 = 1; // L: 3459 - } else if (var0 == 4) { // L: 3461 - PlayerType.method5521(14); // L: 3463 - Login.field871 = 0; // L: 3464 - } else if (var0 == 5) { // L: 3467 - Login.field872 = 2; // L: 3468 - class19.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: 3469 - } else if (var0 == 68 || !Client.onMobile && var0 == 6) { // L: 3471 - class19.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); // L: 3472 - } else if (var0 == 7) { // L: 3474 + } else if (var0 == 3) { + PlayerType.method5521(3); + Login.field872 = 1; + } else if (var0 == 4) { + PlayerType.method5521(14); + Login.field871 = 0; + } else if (var0 == 5) { + Login.field872 = 2; + class19.setLoginResponseString("Your account has not logged out from its last", "session or the server is too busy right now.", "Please try again in a few minutes."); + } else if (var0 == 68 || !Client.onMobile && var0 == 6) { + class19.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); + } else if (var0 == 7) { class19.setLoginResponseString("This world is full.", "Please use a different world.", ""); - } else if (var0 == 8) { // L: 3475 + } else if (var0 == 8) { class19.setLoginResponseString("Unable to connect.", "Login server offline.", ""); - } else if (var0 == 9) { // L: 3476 + } else if (var0 == 9) { class19.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); - } else if (var0 == 10) { // L: 3477 + } else if (var0 == 10) { class19.setLoginResponseString("Unable to connect.", "Bad session id.", ""); - } else if (var0 == 11) { // L: 3478 + } else if (var0 == 11) { class19.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); - } else if (var0 == 12) { // L: 3479 + } else if (var0 == 12) { class19.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); - } else if (var0 == 13) { // L: 3480 + } else if (var0 == 13) { class19.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); - } else if (var0 == 14) { // L: 3481 + } else if (var0 == 14) { class19.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 16) { // L: 3482 + } else if (var0 == 16) { class19.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); - } else if (var0 == 17) { // L: 3483 + } else if (var0 == 17) { class19.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: 3484 - PlayerType.method5521(14); // L: 3486 - Login.field871 = 1; // L: 3487 - } else if (var0 == 19) { // L: 3490 + } else if (var0 == 18) { + PlayerType.method5521(14); + Login.field871 = 1; + } else if (var0 == 19) { class19.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); - } else if (var0 == 20) { // L: 3491 + } else if (var0 == 20) { class19.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); - } else if (var0 == 22) { // L: 3492 + } else if (var0 == 22) { class19.setLoginResponseString("Malformed login packet.", "Please try again.", ""); - } else if (var0 == 23) { // L: 3493 + } else if (var0 == 23) { class19.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 24) { // L: 3494 + } else if (var0 == 24) { class19.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); - } else if (var0 == 25) { // L: 3495 + } else if (var0 == 25) { class19.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); - } else if (var0 == 26) { // L: 3496 + } else if (var0 == 26) { class19.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); - } else if (var0 == 27) { // L: 3497 + } else if (var0 == 27) { class19.setLoginResponseString("", "Service unavailable.", ""); - } else if (var0 == 31) { // L: 3498 + } else if (var0 == 31) { class19.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) { - class19.setLoginResponseString("Your attempt to log into your account was", "unsuccessful. Don't worry, you can sort", "this out by visiting the billing system."); // L: 3499 - } else if (var0 == 37) { // L: 3500 + class19.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) { class19.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); - } else if (var0 == 38) { // L: 3501 + } else if (var0 == 38) { class19.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!"); - } else if (var0 == 55) { // L: 3502 - PlayerType.method5521(8); // L: 3503 + } else if (var0 == 55) { + PlayerType.method5521(8); } else { - if (var0 == 56) { // L: 3505 - class19.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); // L: 3506 - VertexNormal.updateGameState(11); // L: 3507 - return; // L: 3508 + if (var0 == 56) { + class19.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); + VertexNormal.updateGameState(11); + return; } - if (var0 == 57) { // L: 3510 - class19.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); // L: 3511 - VertexNormal.updateGameState(11); // L: 3512 - return; // L: 3513 + if (var0 == 57) { + class19.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); + VertexNormal.updateGameState(11); + return; } - if (var0 == 61) { // L: 3515 - PlayerType.method5521(7); // L: 3516 + if (var0 == 61) { + PlayerType.method5521(7); } else { - if (var0 == 62) { // L: 3518 - VertexNormal.updateGameState(10); // L: 3519 - PlayerType.method5521(9); // L: 3520 - class19.setLoginResponseString("Login attempt timed out.", "Please try again.", ""); // L: 3521 - return; // L: 3522 + if (var0 == 62) { + VertexNormal.updateGameState(10); + PlayerType.method5521(9); + class19.setLoginResponseString("Login attempt timed out.", "Please try again.", ""); + return; } - if (var0 == 63) { // L: 3524 - VertexNormal.updateGameState(10); // L: 3525 - PlayerType.method5521(9); // L: 3526 - class19.setLoginResponseString("You were signed out.", "Please sign in again.", ""); // L: 3527 - return; // L: 3528 + if (var0 == 63) { + VertexNormal.updateGameState(10); + PlayerType.method5521(9); + class19.setLoginResponseString("You were signed out.", "Please sign in again.", ""); + return; } - if (var0 == 65 || var0 == 67) { // L: 3530 - VertexNormal.updateGameState(10); // L: 3531 - PlayerType.method5521(9); // L: 3532 - class19.setLoginResponseString("Failed to login.", "Please try again.", ""); // L: 3533 - return; // L: 3534 + if (var0 == 65 || var0 == 67) { + VertexNormal.updateGameState(10); + PlayerType.method5521(9); + class19.setLoginResponseString("Failed to login.", "Please try again.", ""); + return; } - class19.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); // L: 3536 + class19.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); } } - VertexNormal.updateGameState(10); // L: 3537 - if (Client.field508.method7605()) { // L: 3538 - PlayerType.method5521(9); // L: 3539 + VertexNormal.updateGameState(10); + if (Client.field508.method7605()) { + PlayerType.method5521(9); } - } // L: 3541 + } @ObfuscatedName("jf") @ObfuscatedSignature( @@ -149,44 +149,44 @@ public class class29 { ) @Export("alignWidgetSize") static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { - int var4 = var0.width; // L: 10955 - int var5 = var0.height; // L: 10956 - if (var0.widthAlignment == 0) { // L: 10957 + int var4 = var0.width; + int var5 = var0.height; + if (var0.widthAlignment == 0) { var0.width = var0.rawWidth; - } else if (var0.widthAlignment == 1) { // L: 10958 + } else if (var0.widthAlignment == 1) { var0.width = var1 - var0.rawWidth; - } else if (var0.widthAlignment == 2) { // L: 10959 + } else if (var0.widthAlignment == 2) { var0.width = var0.rawWidth * var1 >> 14; } - if (var0.heightAlignment == 0) { // L: 10960 + if (var0.heightAlignment == 0) { var0.height = var0.rawHeight; - } else if (var0.heightAlignment == 1) { // L: 10961 + } else if (var0.heightAlignment == 1) { var0.height = var2 - var0.rawHeight; - } else if (var0.heightAlignment == 2) { // L: 10962 + } else if (var0.heightAlignment == 2) { var0.height = var2 * var0.rawHeight >> 14; } - if (var0.widthAlignment == 4) { // L: 10963 + if (var0.widthAlignment == 4) { var0.width = var0.height * var0.field3242 / var0.field3243; } - if (var0.heightAlignment == 4) { // L: 10964 + if (var0.heightAlignment == 4) { var0.height = var0.field3243 * var0.width / var0.field3242; } - if (var0.contentType == 1337) { // L: 10965 + if (var0.contentType == 1337) { Client.viewportWidget = var0; } - if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { // L: 10966 - ScriptEvent var6 = new ScriptEvent(); // L: 10967 - var6.widget = var0; // L: 10968 - var6.args = var0.onResize; // L: 10969 - Client.scriptEvents.addFirst(var6); // L: 10970 + if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { + ScriptEvent var6 = new ScriptEvent(); + var6.widget = var0; + var6.args = var0.onResize; + Client.scriptEvents.addFirst(var6); } - } // L: 10972 + } @ObfuscatedName("kt") @ObfuscatedSignature( @@ -195,34 +195,34 @@ public class class29 { ) @Export("clickWidget") static final void clickWidget(Widget var0, int var1, int var2) { - if (Client.clickedWidget == null && !Client.isMenuOpen) { // L: 11914 - if (var0 != null) { // L: 11916 - Widget var4 = SpotAnimationDefinition.method3340(var0); // L: 11919 - if (var4 == null) { // L: 11920 + if (Client.clickedWidget == null && !Client.isMenuOpen) { + if (var0 != null) { + Widget var4 = SpotAnimationDefinition.method3340(var0); + if (var4 == null) { var4 = var0.parent; } - if (var4 != null) { // L: 11923 - Client.clickedWidget = var0; // L: 11927 - var4 = SpotAnimationDefinition.method3340(var0); // L: 11930 - if (var4 == null) { // L: 11931 + if (var4 != null) { + Client.clickedWidget = var0; + var4 = SpotAnimationDefinition.method3340(var0); + if (var4 == null) { var4 = var0.parent; } - Client.clickedWidgetParent = var4; // L: 11934 - Client.widgetClickX = var1; // L: 11935 - Client.widgetClickY = var2; // L: 11936 - class87.widgetDragDuration = 0; // L: 11937 - Client.isDraggingWidget = false; // L: 11938 - int var6 = Client.menuOptionsCount - 1; // L: 11941 - if (var6 != -1) { // L: 11944 + Client.clickedWidgetParent = var4; + Client.widgetClickX = var1; + Client.widgetClickY = var2; + class87.widgetDragDuration = 0; + Client.isDraggingWidget = false; + int var6 = Client.menuOptionsCount - 1; + if (var6 != -1) { class16.method239(var6); } - return; // L: 11945 + return; } } } - } // L: 11925 + } } diff --git a/runescape-client/src/main/java/class291.java b/runescape-client/src/main/java/class291.java index 1d9d5405b2..2101a15c95 100644 --- a/runescape-client/src/main/java/class291.java +++ b/runescape-client/src/main/java/class291.java @@ -11,321 +11,321 @@ public class class291 { ) @Export("drawEntities") static final void drawEntities(int var0, int var1, int var2, int var3) { - ++Client.viewportDrawCount; // L: 5147 - ReflectionCheck.method664(); // L: 5148 - class9.method88(); // L: 5149 - if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { // L: 5151 - Buddy.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); // L: 5152 + ++Client.viewportDrawCount; + ReflectionCheck.method664(); + class9.method88(); + if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { + Buddy.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); } - MouseHandler.addNpcsToScene(true); // L: 5155 - int var4 = Players.Players_count; // L: 5157 - int[] var5 = Players.Players_indices; // L: 5158 + MouseHandler.addNpcsToScene(true); + int var4 = Players.Players_count; + int[] var5 = Players.Players_indices; int var6; - for (var6 = 0; var6 < var4; ++var6) { // L: 5159 - if (var5[var6] != Client.combatTargetPlayerIndex && var5[var6] != Client.localPlayerIndex) { // L: 5160 - Buddy.addPlayerToScene(Client.players[var5[var6]], true); // L: 5161 + for (var6 = 0; var6 < var4; ++var6) { + if (var5[var6] != Client.combatTargetPlayerIndex && var5[var6] != Client.localPlayerIndex) { + Buddy.addPlayerToScene(Client.players[var5[var6]], true); } } - MouseHandler.addNpcsToScene(false); // L: 5164 + MouseHandler.addNpcsToScene(false); - for (Projectile var30 = (Projectile)Client.projectiles.last(); var30 != null; var30 = (Projectile)Client.projectiles.previous()) { // L: 5166 5167 5184 - if (var30.plane == class20.Client_plane && Client.cycle <= var30.cycleEnd) { // L: 5168 - if (Client.cycle >= var30.cycleStart) { // L: 5169 - if (var30.targetIndex > 0) { // L: 5170 - NPC var34 = Client.npcs[var30.targetIndex - 1]; // L: 5171 - if (var34 != null && var34.x >= 0 && var34.x < 13312 && var34.y >= 0 && var34.y < 13312) { // L: 5172 + for (Projectile var30 = (Projectile)Client.projectiles.last(); var30 != null; var30 = (Projectile)Client.projectiles.previous()) { + if (var30.plane == class20.Client_plane && Client.cycle <= var30.cycleEnd) { + if (Client.cycle >= var30.cycleStart) { + if (var30.targetIndex > 0) { + NPC var34 = Client.npcs[var30.targetIndex - 1]; + if (var34 != null && var34.x >= 0 && var34.x < 13312 && var34.y >= 0 && var34.y < 13312) { var30.setDestination(var34.x, var34.y, FaceNormal.getTileHeight(var34.x, var34.y, var30.plane) - var30.endHeight, Client.cycle); } } - if (var30.targetIndex < 0) { // L: 5174 - var6 = -var30.targetIndex - 1; // L: 5176 + if (var30.targetIndex < 0) { + var6 = -var30.targetIndex - 1; Player var35; - if (var6 == Client.localPlayerIndex) { // L: 5177 + if (var6 == Client.localPlayerIndex) { var35 = class340.localPlayer; } else { - var35 = Client.players[var6]; // L: 5178 + var35 = Client.players[var6]; } - if (var35 != null && var35.x >= 0 && var35.x < 13312 && var35.y >= 0 && var35.y < 13312) { // L: 5179 + if (var35 != null && var35.x >= 0 && var35.x < 13312 && var35.y >= 0 && var35.y < 13312) { var30.setDestination(var35.x, var35.y, FaceNormal.getTileHeight(var35.x, var35.y, var30.plane) - var30.endHeight, Client.cycle); } } - var30.advance(Client.field538); // L: 5181 - class7.scene.drawEntity(class20.Client_plane, (int)var30.x, (int)var30.y, (int)var30.z, 60, var30, var30.yaw, -1L, false); // L: 5182 + var30.advance(Client.field538); + class7.scene.drawEntity(class20.Client_plane, (int)var30.x, (int)var30.y, (int)var30.z, 60, var30, var30.yaw, -1L, false); } } else { var30.remove(); } } - class33.method656(); // L: 5187 - WorldMapDecoration.setViewportShape(var0, var1, var2, var3, true); // L: 5188 - var0 = Client.viewportOffsetX; // L: 5189 - var1 = Client.viewportOffsetY; // L: 5190 - var2 = Client.viewportWidth; // L: 5191 - var3 = Client.viewportHeight; // L: 5192 - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 5193 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 5194 - var4 = Client.camAngleX; // L: 5195 - if (Client.field562 / 256 > var4) { // L: 5196 + class33.method656(); + WorldMapDecoration.setViewportShape(var0, var1, var2, var3, true); + var0 = Client.viewportOffsetX; + var1 = Client.viewportOffsetY; + var2 = Client.viewportWidth; + var3 = Client.viewportHeight; + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); + var4 = Client.camAngleX; + if (Client.field562 / 256 > var4) { var4 = Client.field562 / 256; } - if (Client.field725[4] && Client.field679[4] + 128 > var4) { // L: 5197 + if (Client.field725[4] && Client.field679[4] + 128 > var4) { var4 = Client.field679[4] + 128; } - int var31 = Client.camAngleY & 2047; // L: 5198 - class6.method50(class7.oculusOrbFocalPointX, MouseHandler.field231, Actor.oculusOrbFocalPointY, var4, var31, class142.method2958(var4), var3); // L: 5199 - if (!Client.isCameraLocked) { // L: 5201 + int var31 = Client.camAngleY & 2047; + class6.method50(class7.oculusOrbFocalPointX, MouseHandler.field231, Actor.oculusOrbFocalPointY, var4, var31, class142.method2958(var4), var3); + if (!Client.isCameraLocked) { var6 = AbstractWorldMapIcon.method4862(); } else { - var6 = UserComparator7.method2518(); // L: 5202 + var6 = UserComparator7.method2518(); } - int var7 = UserComparator7.cameraX; // L: 5203 - int var8 = AbstractByteArrayCopier.cameraY; // L: 5204 - int var9 = UserComparator10.cameraZ; // L: 5205 - int var10 = UserComparator7.cameraPitch; // L: 5206 - int var11 = class379.cameraYaw; // L: 5207 + int var7 = UserComparator7.cameraX; + int var8 = AbstractByteArrayCopier.cameraY; + int var9 = UserComparator10.cameraZ; + int var10 = UserComparator7.cameraPitch; + int var11 = class379.cameraYaw; int var12; int var13; - for (var12 = 0; var12 < 5; ++var12) { // L: 5208 - if (Client.field725[var12]) { // L: 5209 - var13 = (int)(Math.random() * (double)(Client.field726[var12] * 2 + 1) - (double)Client.field726[var12] + Math.sin((double)Client.field618[var12] / 100.0D * (double)Client.field729[var12]) * (double)Client.field679[var12]); // L: 5210 - if (var12 == 0) { // L: 5211 + for (var12 = 0; var12 < 5; ++var12) { + if (Client.field725[var12]) { + var13 = (int)(Math.random() * (double)(Client.field726[var12] * 2 + 1) - (double)Client.field726[var12] + Math.sin((double)Client.field618[var12] / 100.0D * (double)Client.field729[var12]) * (double)Client.field679[var12]); + if (var12 == 0) { UserComparator7.cameraX += var13; } - if (var12 == 1) { // L: 5212 + if (var12 == 1) { AbstractByteArrayCopier.cameraY += var13; } - if (var12 == 2) { // L: 5213 + if (var12 == 2) { UserComparator10.cameraZ += var13; } - if (var12 == 3) { // L: 5214 + if (var12 == 3) { class379.cameraYaw = var13 + class379.cameraYaw & 2047; } - if (var12 == 4) { // L: 5215 - UserComparator7.cameraPitch += var13; // L: 5216 - if (UserComparator7.cameraPitch < 128) { // L: 5217 + if (var12 == 4) { + UserComparator7.cameraPitch += var13; + if (UserComparator7.cameraPitch < 128) { UserComparator7.cameraPitch = 128; } - if (UserComparator7.cameraPitch > 383) { // L: 5218 + if (UserComparator7.cameraPitch > 383) { UserComparator7.cameraPitch = 383; } } } } - var12 = MouseHandler.MouseHandler_x; // L: 5222 - var13 = MouseHandler.MouseHandler_y; // L: 5223 - if (MouseHandler.MouseHandler_lastButton != 0) { // L: 5224 - var12 = MouseHandler.MouseHandler_lastPressedX; // L: 5225 - var13 = MouseHandler.MouseHandler_lastPressedY; // L: 5226 + var12 = MouseHandler.MouseHandler_x; + var13 = MouseHandler.MouseHandler_y; + if (MouseHandler.MouseHandler_lastButton != 0) { + var12 = MouseHandler.MouseHandler_lastPressedX; + var13 = MouseHandler.MouseHandler_lastPressedY; } int var14; - if (var12 >= var0 && var12 < var0 + var2 && var13 >= var1 && var13 < var3 + var1) { // L: 5228 - var14 = var12 - var0; // L: 5229 - int var15 = var13 - var1; // L: 5230 - ViewportMouse.ViewportMouse_x = var14; // L: 5232 - ViewportMouse.ViewportMouse_y = var15; // L: 5233 - ViewportMouse.ViewportMouse_isInViewport = true; // L: 5234 - ViewportMouse.ViewportMouse_entityCount = 0; // L: 5235 - ViewportMouse.ViewportMouse_false0 = false; // L: 5236 + if (var12 >= var0 && var12 < var0 + var2 && var13 >= var1 && var13 < var3 + var1) { + var14 = var12 - var0; + int var15 = var13 - var1; + ViewportMouse.ViewportMouse_x = var14; + ViewportMouse.ViewportMouse_y = var15; + ViewportMouse.ViewportMouse_isInViewport = true; + ViewportMouse.ViewportMouse_entityCount = 0; + ViewportMouse.ViewportMouse_false0 = false; } else { - class135.method2832(); // L: 5240 + class135.method2832(); } - class148.playPcmPlayers(); // L: 5242 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 5243 - class148.playPcmPlayers(); // L: 5244 - var14 = Rasterizer3D.Rasterizer3D_zoom; // L: 5245 - Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; // L: 5246 - class7.scene.draw(UserComparator7.cameraX, AbstractByteArrayCopier.cameraY, UserComparator10.cameraZ, UserComparator7.cameraPitch, class379.cameraYaw, var6); // L: 5247 - Rasterizer3D.Rasterizer3D_zoom = var14; // L: 5248 - class148.playPcmPlayers(); // L: 5249 - class7.scene.clearTempGameObjects(); // L: 5250 - Client.overheadTextCount = 0; // L: 5252 - boolean var36 = false; // L: 5253 - int var16 = -1; // L: 5254 - int var17 = -1; // L: 5255 - int var18 = Players.Players_count; // L: 5256 - int[] var19 = Players.Players_indices; // L: 5257 + class148.playPcmPlayers(); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); + class148.playPcmPlayers(); + var14 = Rasterizer3D.Rasterizer3D_zoom; + Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; + class7.scene.draw(UserComparator7.cameraX, AbstractByteArrayCopier.cameraY, UserComparator10.cameraZ, UserComparator7.cameraPitch, class379.cameraYaw, var6); + Rasterizer3D.Rasterizer3D_zoom = var14; + class148.playPcmPlayers(); + class7.scene.clearTempGameObjects(); + Client.overheadTextCount = 0; + boolean var36 = false; + int var16 = -1; + int var17 = -1; + int var18 = Players.Players_count; + int[] var19 = Players.Players_indices; int var20; - for (var20 = 0; var20 < var18 + Client.npcCount; ++var20) { // L: 5258 + for (var20 = 0; var20 < var18 + Client.npcCount; ++var20) { Object var33; - if (var20 < var18) { // L: 5260 - var33 = Client.players[var19[var20]]; // L: 5261 - if (var19[var20] == Client.combatTargetPlayerIndex) { // L: 5262 - var36 = true; // L: 5263 - var16 = var20; // L: 5264 + if (var20 < var18) { + var33 = Client.players[var19[var20]]; + if (var19[var20] == Client.combatTargetPlayerIndex) { + var36 = true; + var16 = var20; continue; } - if (var33 == class340.localPlayer) { // L: 5267 - var17 = var20; // L: 5268 - continue; // L: 5269 + if (var33 == class340.localPlayer) { + var17 = var20; + continue; } } else { - var33 = Client.npcs[Client.npcIndices[var20 - var18]]; // L: 5272 + var33 = Client.npcs[Client.npcIndices[var20 - var18]]; } - class148.drawActor2d((Actor)var33, var20, var0, var1, var2, var3); // L: 5273 + class148.drawActor2d((Actor)var33, var20, var0, var1, var2, var3); } - if (Client.renderSelf && var17 != -1) { // L: 5275 - class148.drawActor2d(class340.localPlayer, var17, var0, var1, var2, var3); // L: 5276 + if (Client.renderSelf && var17 != -1) { + class148.drawActor2d(class340.localPlayer, var17, var0, var1, var2, var3); } - if (var36) { // L: 5278 - class148.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var16, var0, var1, var2, var3); // L: 5279 + if (var36) { + class148.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var16, var0, var1, var2, var3); } - for (var20 = 0; var20 < Client.overheadTextCount; ++var20) { // L: 5281 - int var21 = Client.overheadTextXs[var20]; // L: 5282 - int var22 = Client.overheadTextYs[var20]; // L: 5283 - int var23 = Client.overheadTextXOffsets[var20]; // L: 5284 - int var24 = Client.overheadTextAscents[var20]; // L: 5285 - boolean var25 = true; // L: 5286 + for (var20 = 0; var20 < Client.overheadTextCount; ++var20) { + int var21 = Client.overheadTextXs[var20]; + int var22 = Client.overheadTextYs[var20]; + int var23 = Client.overheadTextXOffsets[var20]; + int var24 = Client.overheadTextAscents[var20]; + boolean var25 = true; while (var25) { - var25 = false; // L: 5288 + var25 = false; - for (int var32 = 0; var32 < var20; ++var32) { // L: 5289 - if (var22 + 2 > Client.overheadTextYs[var32] - Client.overheadTextAscents[var32] && var22 - var24 < Client.overheadTextYs[var32] + 2 && var21 - var23 < Client.overheadTextXOffsets[var32] + Client.overheadTextXs[var32] && var23 + var21 > Client.overheadTextXs[var32] - Client.overheadTextXOffsets[var32] && Client.overheadTextYs[var32] - Client.overheadTextAscents[var32] < var22) { // L: 5290 5291 - var22 = Client.overheadTextYs[var32] - Client.overheadTextAscents[var32]; // L: 5292 - var25 = true; // L: 5293 + for (int var32 = 0; var32 < var20; ++var32) { + if (var22 + 2 > Client.overheadTextYs[var32] - Client.overheadTextAscents[var32] && var22 - var24 < Client.overheadTextYs[var32] + 2 && var21 - var23 < Client.overheadTextXOffsets[var32] + Client.overheadTextXs[var32] && var23 + var21 > Client.overheadTextXs[var32] - Client.overheadTextXOffsets[var32] && Client.overheadTextYs[var32] - Client.overheadTextAscents[var32] < var22) { + var22 = Client.overheadTextYs[var32] - Client.overheadTextAscents[var32]; + var25 = true; } } } - Client.viewportTempX = Client.overheadTextXs[var20]; // L: 5298 - Client.viewportTempY = Client.overheadTextYs[var20] = var22; // L: 5299 - String var26 = Client.overheadText[var20]; // L: 5300 - if (Client.chatEffects == 0) { // L: 5301 - int var27 = 16776960; // L: 5302 - if (Client.overheadTextColors[var20] < 6) { // L: 5303 + Client.viewportTempX = Client.overheadTextXs[var20]; + Client.viewportTempY = Client.overheadTextYs[var20] = var22; + String var26 = Client.overheadText[var20]; + if (Client.chatEffects == 0) { + int var27 = 16776960; + if (Client.overheadTextColors[var20] < 6) { var27 = Client.field749[Client.overheadTextColors[var20]]; } - if (Client.overheadTextColors[var20] == 6) { // L: 5304 + if (Client.overheadTextColors[var20] == 6) { var27 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; } - if (Client.overheadTextColors[var20] == 7) { // L: 5305 + if (Client.overheadTextColors[var20] == 7) { var27 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; } - if (Client.overheadTextColors[var20] == 8) { // L: 5306 + if (Client.overheadTextColors[var20] == 8) { var27 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016; } int var28; - if (Client.overheadTextColors[var20] == 9) { // L: 5307 - var28 = 150 - Client.overheadTextCyclesRemaining[var20]; // L: 5308 - if (var28 < 50) { // L: 5309 + if (Client.overheadTextColors[var20] == 9) { + var28 = 150 - Client.overheadTextCyclesRemaining[var20]; + if (var28 < 50) { var27 = var28 * 1280 + 16711680; - } else if (var28 < 100) { // L: 5310 + } else if (var28 < 100) { var27 = 16776960 - (var28 - 50) * 327680; - } else if (var28 < 150) { // L: 5311 + } else if (var28 < 150) { var27 = (var28 - 100) * 5 + 65280; } } - if (Client.overheadTextColors[var20] == 10) { // L: 5313 - var28 = 150 - Client.overheadTextCyclesRemaining[var20]; // L: 5314 - if (var28 < 50) { // L: 5315 + if (Client.overheadTextColors[var20] == 10) { + var28 = 150 - Client.overheadTextCyclesRemaining[var20]; + if (var28 < 50) { var27 = var28 * 5 + 16711680; - } else if (var28 < 100) { // L: 5316 + } else if (var28 < 100) { var27 = 16711935 - (var28 - 50) * 327680; - } else if (var28 < 150) { // L: 5317 + } else if (var28 < 150) { var27 = (var28 - 100) * 327680 + 255 - (var28 - 100) * 5; } } - if (Client.overheadTextColors[var20] == 11) { // L: 5319 - var28 = 150 - Client.overheadTextCyclesRemaining[var20]; // L: 5320 - if (var28 < 50) { // L: 5321 + if (Client.overheadTextColors[var20] == 11) { + var28 = 150 - Client.overheadTextCyclesRemaining[var20]; + if (var28 < 50) { var27 = 16777215 - var28 * 327685; - } else if (var28 < 100) { // L: 5322 + } else if (var28 < 100) { var27 = (var28 - 50) * 327685 + 65280; - } else if (var28 < 150) { // L: 5323 + } else if (var28 < 150) { var27 = 16777215 - (var28 - 100) * 327680; } } - if (Client.overheadTextEffects[var20] == 0) { // L: 5325 + if (Client.overheadTextEffects[var20] == 0) { class136.fontBold12.drawCentered(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, var27, 0); } - if (Client.overheadTextEffects[var20] == 1) { // L: 5326 + if (Client.overheadTextEffects[var20] == 1) { class136.fontBold12.drawCenteredWave(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, var27, 0, Client.viewportDrawCount); } - if (Client.overheadTextEffects[var20] == 2) { // L: 5327 + if (Client.overheadTextEffects[var20] == 2) { class136.fontBold12.drawCenteredWave2(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, var27, 0, Client.viewportDrawCount); } - if (Client.overheadTextEffects[var20] == 3) { // L: 5328 + if (Client.overheadTextEffects[var20] == 3) { class136.fontBold12.drawCenteredShake(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, var27, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var20]); } - if (Client.overheadTextEffects[var20] == 4) { // L: 5329 - var28 = (150 - Client.overheadTextCyclesRemaining[var20]) * (class136.fontBold12.stringWidth(var26) + 100) / 150; // L: 5330 - Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); // L: 5331 - class136.fontBold12.draw(var26, var0 + Client.viewportTempX + 50 - var28, Client.viewportTempY + var1, var27, 0); // L: 5332 - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 5333 + if (Client.overheadTextEffects[var20] == 4) { + var28 = (150 - Client.overheadTextCyclesRemaining[var20]) * (class136.fontBold12.stringWidth(var26) + 100) / 150; + Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); + class136.fontBold12.draw(var26, var0 + Client.viewportTempX + 50 - var28, Client.viewportTempY + var1, var27, 0); + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); } - if (Client.overheadTextEffects[var20] == 5) { // L: 5335 - var28 = 150 - Client.overheadTextCyclesRemaining[var20]; // L: 5336 - int var29 = 0; // L: 5337 - if (var28 < 25) { // L: 5338 + if (Client.overheadTextEffects[var20] == 5) { + var28 = 150 - Client.overheadTextCyclesRemaining[var20]; + int var29 = 0; + if (var28 < 25) { var29 = var28 - 25; - } else if (var28 > 125) { // L: 5339 + } else if (var28 > 125) { var29 = var28 - 125; } - Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - class136.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); // L: 5340 - class136.fontBold12.drawCentered(var26, var0 + Client.viewportTempX, var29 + Client.viewportTempY + var1, var27, 0); // L: 5341 - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 5342 + Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - class136.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); + class136.fontBold12.drawCentered(var26, var0 + Client.viewportTempX, var29 + Client.viewportTempY + var1, var27, 0); + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); } } else { - class136.fontBold12.drawCentered(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); // L: 5346 + class136.fontBold12.drawCentered(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); } } - ArchiveDiskAction.method5527(var0, var1); // L: 5350 - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field538); // L: 5351 - class336.method6228(var0, var1, var2, var3); // L: 5352 - UserComparator7.cameraX = var7; // L: 5353 - AbstractByteArrayCopier.cameraY = var8; // L: 5354 - UserComparator10.cameraZ = var9; // L: 5355 - UserComparator7.cameraPitch = var10; // L: 5356 - class379.cameraYaw = var11; // L: 5357 - if (Client.isLoading && class14.method214(true, false) == 0) { // L: 5358 + ArchiveDiskAction.method5527(var0, var1); + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field538); + class336.method6228(var0, var1, var2, var3); + UserComparator7.cameraX = var7; + AbstractByteArrayCopier.cameraY = var8; + UserComparator10.cameraZ = var9; + UserComparator7.cameraPitch = var10; + class379.cameraYaw = var11; + if (Client.isLoading && class14.method214(true, false) == 0) { Client.isLoading = false; } - if (Client.isLoading) { // L: 5359 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 5360 - ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait.", false); // L: 5361 + if (Client.isLoading) { + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); + ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait.", false); } - } // L: 5363 + } @ObfuscatedName("lb") @ObfuscatedSignature( @@ -333,9 +333,9 @@ public class class291 { garbageValue = "94" ) static void method5502() { - if (Client.oculusOrbState == 1) { // L: 12688 - Client.field612 = true; // L: 12689 + if (Client.oculusOrbState == 1) { + Client.field612 = true; } - } // L: 12691 + } } diff --git a/runescape-client/src/main/java/class292.java b/runescape-client/src/main/java/class292.java index 2c188e9bbc..9c87f8d690 100644 --- a/runescape-client/src/main/java/class292.java +++ b/runescape-client/src/main/java/class292.java @@ -4,22 +4,22 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("kp") public class class292 { static { - int var0 = 0; // L: 9 - int var1 = 0; // L: 10 - class288[] var2 = class213.method4355(); // L: 12 + int var0 = 0; + int var1 = 0; + class288[] var2 = class213.method4355(); - for (int var3 = 0; var3 < var2.length; ++var3) { // L: 13 - class288 var4 = var2[var3]; // L: 14 + for (int var3 = 0; var3 < var2.length; ++var3) { + class288 var4 = var2[var3]; if (var4.field3435 > var0) { - var0 = var4.field3435; // L: 16 + var0 = var4.field3435; } - if (var4.field3437 > var1) { // L: 17 + if (var4.field3437 > var1) { var1 = var4.field3437; } } - } // L: 21 + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -27,34 +27,34 @@ public class class292 { garbageValue = "-862238795" ) public static void method5504(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 + if (var2 < var3) { + int var4 = (var3 + var2) / 2; + int var5 = var2; + String var6 = var0[var4]; + var0[var4] = var0[var3]; + var0[var3] = var6; + int var7 = var1[var4]; + var1[var4] = var1[var3]; + var1[var3] = var7; - 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 + for (int var8 = var2; var8 < var3; ++var8) { + if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { + String var9 = var0[var8]; + var0[var8] = var0[var5]; + var0[var5] = var9; + int var10 = var1[var8]; + var1[var8] = var1[var5]; + var1[var5++] = var10; } } - var0[var3] = var0[var5]; // L: 63 - var0[var5] = var6; // L: 64 - var1[var3] = var1[var5]; // L: 65 - var1[var5] = var7; // L: 66 - method5504(var0, var1, var2, var5 - 1); // L: 67 - method5504(var0, var1, var5 + 1, var3); // L: 68 + var0[var3] = var0[var5]; + var0[var5] = var6; + var1[var3] = var1[var5]; + var1[var5] = var7; + method5504(var0, var1, var2, var5 - 1); + method5504(var0, var1, var5 + 1, var3); } - } // L: 70 + } } diff --git a/runescape-client/src/main/java/class295.java b/runescape-client/src/main/java/class295.java index 3040def82e..1341162226 100644 --- a/runescape-client/src/main/java/class295.java +++ b/runescape-client/src/main/java/class295.java @@ -40,8 +40,8 @@ public enum class295 implements MouseWheel { final int field3792; class295(int var3) { - this.field3792 = var3; // L: 15 - } // L: 16 + this.field3792 = var3; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -50,7 +50,7 @@ public enum class295 implements MouseWheel { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field3792; // L: 20 + return this.field3792; } @ObfuscatedName("c") @@ -59,63 +59,63 @@ public enum class295 implements MouseWheel { garbageValue = "1999955592" ) public static boolean method5515() { - long var0 = Ignored.method6459(); // L: 42 - int var2 = (int)(var0 - UserComparator7.field1319); // L: 43 - UserComparator7.field1319 = var0; // L: 44 - if (var2 > 200) { // L: 45 + long var0 = Ignored.method6459(); + int var2 = (int)(var0 - UserComparator7.field1319); + UserComparator7.field1319 = var0; + if (var2 > 200) { var2 = 200; } - NetCache.NetCache_loadTime += var2; // L: 46 - if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { // L: 47 + NetCache.NetCache_loadTime += var2; + if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { return true; - } else if (NetCache.NetCache_socket == null) { // L: 48 + } else if (NetCache.NetCache_socket == null) { return false; } else { try { - if (NetCache.NetCache_loadTime > 30000) { // L: 50 + if (NetCache.NetCache_loadTime > 30000) { throw new IOException(); } else { NetFileRequest var3; Buffer var4; - while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { // L: 51 - var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); // L: 52 - var4 = new Buffer(4); // L: 53 - var4.writeByte(1); // L: 54 - var4.writeMedium((int)var3.key); // L: 55 - NetCache.NetCache_socket.write(var4.array, 0, 4); // L: 56 - NetCache.NetCache_pendingPriorityResponses.put(var3, var3.key); // L: 57 - --NetCache.NetCache_pendingPriorityWritesCount; // L: 58 - ++NetCache.NetCache_pendingPriorityResponsesCount; // L: 59 + while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { + var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); + var4 = new Buffer(4); + var4.writeByte(1); + var4.writeMedium((int)var3.key); + NetCache.NetCache_socket.write(var4.array, 0, 4); + NetCache.NetCache_pendingPriorityResponses.put(var3, var3.key); + --NetCache.NetCache_pendingPriorityWritesCount; + ++NetCache.NetCache_pendingPriorityResponsesCount; } - while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { // L: 61 - var3 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); // L: 62 - var4 = new Buffer(4); // L: 63 - var4.writeByte(0); // L: 64 - var4.writeMedium((int)var3.key); // L: 65 - NetCache.NetCache_socket.write(var4.array, 0, 4); // L: 66 - var3.removeDual(); // L: 67 - NetCache.NetCache_pendingResponses.put(var3, var3.key); // L: 68 - --NetCache.NetCache_pendingWritesCount; // L: 69 - ++NetCache.NetCache_pendingResponsesCount; // L: 70 + while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { + var3 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); + var4 = new Buffer(4); + var4.writeByte(0); + var4.writeMedium((int)var3.key); + NetCache.NetCache_socket.write(var4.array, 0, 4); + var3.removeDual(); + NetCache.NetCache_pendingResponses.put(var3, var3.key); + --NetCache.NetCache_pendingWritesCount; + ++NetCache.NetCache_pendingResponsesCount; } - for (int var15 = 0; var15 < 100; ++var15) { // L: 72 - int var16 = NetCache.NetCache_socket.available(); // L: 73 - if (var16 < 0) { // L: 74 + for (int var15 = 0; var15 < 100; ++var15) { + int var16 = NetCache.NetCache_socket.available(); + if (var16 < 0) { throw new IOException(); } - if (var16 == 0) { // L: 75 + if (var16 == 0) { break; } - NetCache.NetCache_loadTime = 0; // L: 76 - byte var5 = 0; // L: 77 - if (class279.NetCache_currentResponse == null) { // L: 78 + NetCache.NetCache_loadTime = 0; + byte var5 = 0; + if (class279.NetCache_currentResponse == null) { var5 = 8; - } else if (NetCache.field3863 == 0) { // L: 79 + } else if (NetCache.field3863 == 0) { var5 = 1; } @@ -126,129 +126,129 @@ public enum class295 implements MouseWheel { byte[] var10000; int var10001; Buffer var22; - if (var5 > 0) { // L: 80 - var6 = var5 - NetCache.NetCache_responseHeaderBuffer.offset; // L: 81 - if (var6 > var16) { // L: 82 + if (var5 > 0) { + var6 = var5 - NetCache.NetCache_responseHeaderBuffer.offset; + if (var6 > var16) { var6 = var16; } - NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var6); // L: 83 - if (NetCache.field3866 != 0) { // L: 84 - for (var7 = 0; var7 < var6; ++var7) { // L: 85 + NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var6); + if (NetCache.field3866 != 0) { + for (var7 = 0; var7 < var6; ++var7) { var10000 = NetCache.NetCache_responseHeaderBuffer.array; var10001 = var7 + NetCache.NetCache_responseHeaderBuffer.offset; var10000[var10001] ^= NetCache.field3866; } } - var22 = NetCache.NetCache_responseHeaderBuffer; // L: 87 + var22 = NetCache.NetCache_responseHeaderBuffer; var22.offset += var6; - if (NetCache.NetCache_responseHeaderBuffer.offset < var5) { // L: 88 + if (NetCache.NetCache_responseHeaderBuffer.offset < var5) { break; } - if (class279.NetCache_currentResponse == null) { // L: 89 - NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 90 - var7 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 91 - var8 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); // L: 92 - int var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 93 - var10 = NetCache.NetCache_responseHeaderBuffer.readInt(); // L: 94 - long var11 = (long)(var8 + (var7 << 16)); // L: 95 - NetFileRequest var13 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var11); // L: 96 - class21.field116 = true; // L: 97 - if (var13 == null) { // L: 98 - var13 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var11); // L: 99 - class21.field116 = false; // L: 100 + if (class279.NetCache_currentResponse == null) { + NetCache.NetCache_responseHeaderBuffer.offset = 0; + var7 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); + var8 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); + int var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); + var10 = NetCache.NetCache_responseHeaderBuffer.readInt(); + long var11 = (long)(var8 + (var7 << 16)); + NetFileRequest var13 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var11); + class21.field116 = true; + if (var13 == null) { + var13 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var11); + class21.field116 = false; } - if (var13 == null) { // L: 102 - throw new IOException(); // L: 103 + if (var13 == null) { + throw new IOException(); } - int var14 = var9 == 0 ? 5 : 9; // L: 105 - class279.NetCache_currentResponse = var13; // L: 106 - class149.NetCache_responseArchiveBuffer = new Buffer(var14 + var10 + class279.NetCache_currentResponse.padding); // L: 107 - class149.NetCache_responseArchiveBuffer.writeByte(var9); // L: 108 - class149.NetCache_responseArchiveBuffer.writeInt(var10); // L: 109 - NetCache.field3863 = 8; // L: 110 - NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 111 - } else if (NetCache.field3863 == 0) { // L: 114 - if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { // L: 115 - NetCache.field3863 = 1; // L: 116 - NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 117 + int var14 = var9 == 0 ? 5 : 9; + class279.NetCache_currentResponse = var13; + class149.NetCache_responseArchiveBuffer = new Buffer(var14 + var10 + class279.NetCache_currentResponse.padding); + class149.NetCache_responseArchiveBuffer.writeByte(var9); + class149.NetCache_responseArchiveBuffer.writeInt(var10); + NetCache.field3863 = 8; + NetCache.NetCache_responseHeaderBuffer.offset = 0; + } else if (NetCache.field3863 == 0) { + if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { + NetCache.field3863 = 1; + NetCache.NetCache_responseHeaderBuffer.offset = 0; } else { - class279.NetCache_currentResponse = null; // L: 121 + class279.NetCache_currentResponse = null; } } } else { - var6 = class149.NetCache_responseArchiveBuffer.array.length - class279.NetCache_currentResponse.padding; // L: 127 - var7 = 512 - NetCache.field3863; // L: 128 - if (var7 > var6 - class149.NetCache_responseArchiveBuffer.offset) { // L: 129 + var6 = class149.NetCache_responseArchiveBuffer.array.length - class279.NetCache_currentResponse.padding; + var7 = 512 - NetCache.field3863; + if (var7 > var6 - class149.NetCache_responseArchiveBuffer.offset) { var7 = var6 - class149.NetCache_responseArchiveBuffer.offset; } - if (var7 > var16) { // L: 130 + if (var7 > var16) { var7 = var16; } - NetCache.NetCache_socket.read(class149.NetCache_responseArchiveBuffer.array, class149.NetCache_responseArchiveBuffer.offset, var7); // L: 131 - if (NetCache.field3866 != 0) { // L: 132 - for (var8 = 0; var8 < var7; ++var8) { // L: 133 + NetCache.NetCache_socket.read(class149.NetCache_responseArchiveBuffer.array, class149.NetCache_responseArchiveBuffer.offset, var7); + if (NetCache.field3866 != 0) { + for (var8 = 0; var8 < var7; ++var8) { var10000 = class149.NetCache_responseArchiveBuffer.array; var10001 = class149.NetCache_responseArchiveBuffer.offset + var8; var10000[var10001] ^= NetCache.field3866; } } - var22 = class149.NetCache_responseArchiveBuffer; // L: 135 + var22 = class149.NetCache_responseArchiveBuffer; var22.offset += var7; - NetCache.field3863 += var7; // L: 136 - if (var6 == class149.NetCache_responseArchiveBuffer.offset) { // L: 137 - if (16711935L == class279.NetCache_currentResponse.key) { // L: 138 - WorldMapLabel.NetCache_reference = class149.NetCache_responseArchiveBuffer; // L: 139 + NetCache.field3863 += var7; + if (var6 == class149.NetCache_responseArchiveBuffer.offset) { + if (16711935L == class279.NetCache_currentResponse.key) { + WorldMapLabel.NetCache_reference = class149.NetCache_responseArchiveBuffer; - for (var8 = 0; var8 < 256; ++var8) { // L: 140 - Archive var17 = NetCache.NetCache_archives[var8]; // L: 141 - if (var17 != null) { // L: 142 - WorldMapLabel.NetCache_reference.offset = var8 * 8 + 5; // L: 143 - var10 = WorldMapLabel.NetCache_reference.readInt(); // L: 144 - int var18 = WorldMapLabel.NetCache_reference.readInt(); // L: 145 - var17.loadIndex(var10, var18); // L: 146 + for (var8 = 0; var8 < 256; ++var8) { + Archive var17 = NetCache.NetCache_archives[var8]; + if (var17 != null) { + WorldMapLabel.NetCache_reference.offset = var8 * 8 + 5; + var10 = WorldMapLabel.NetCache_reference.readInt(); + int var18 = WorldMapLabel.NetCache_reference.readInt(); + var17.loadIndex(var10, var18); } } } else { - NetCache.NetCache_crc.reset(); // L: 151 - NetCache.NetCache_crc.update(class149.NetCache_responseArchiveBuffer.array, 0, var6); // L: 152 - var8 = (int)NetCache.NetCache_crc.getValue(); // L: 153 - if (var8 != class279.NetCache_currentResponse.crc) { // L: 154 + NetCache.NetCache_crc.reset(); + NetCache.NetCache_crc.update(class149.NetCache_responseArchiveBuffer.array, 0, var6); + var8 = (int)NetCache.NetCache_crc.getValue(); + if (var8 != class279.NetCache_currentResponse.crc) { try { - NetCache.NetCache_socket.close(); // L: 156 - } catch (Exception var20) { // L: 158 + NetCache.NetCache_socket.close(); + } catch (Exception var20) { } - ++NetCache.NetCache_crcMismatches; // L: 159 - NetCache.NetCache_socket = null; // L: 160 - NetCache.field3866 = (byte)((int)(Math.random() * 255.0D + 1.0D)); // L: 161 - return false; // L: 162 + ++NetCache.NetCache_crcMismatches; + NetCache.NetCache_socket = null; + NetCache.field3866 = (byte)((int)(Math.random() * 255.0D + 1.0D)); + return false; } - NetCache.NetCache_crcMismatches = 0; // L: 164 - NetCache.NetCache_ioExceptions = 0; // L: 165 - class279.NetCache_currentResponse.archive.write((int)(class279.NetCache_currentResponse.key & 65535L), class149.NetCache_responseArchiveBuffer.array, 16711680L == (class279.NetCache_currentResponse.key & 16711680L), class21.field116); // L: 166 + NetCache.NetCache_crcMismatches = 0; + NetCache.NetCache_ioExceptions = 0; + class279.NetCache_currentResponse.archive.write((int)(class279.NetCache_currentResponse.key & 65535L), class149.NetCache_responseArchiveBuffer.array, 16711680L == (class279.NetCache_currentResponse.key & 16711680L), class21.field116); } - class279.NetCache_currentResponse.remove(); // L: 168 - if (class21.field116) { // L: 169 + class279.NetCache_currentResponse.remove(); + if (class21.field116) { --NetCache.NetCache_pendingPriorityResponsesCount; } else { - --NetCache.NetCache_pendingResponsesCount; // L: 170 + --NetCache.NetCache_pendingResponsesCount; } - NetCache.field3863 = 0; // L: 171 - class279.NetCache_currentResponse = null; // L: 172 - class149.NetCache_responseArchiveBuffer = null; // L: 173 + NetCache.field3863 = 0; + class279.NetCache_currentResponse = null; + class149.NetCache_responseArchiveBuffer = null; } else { - if (NetCache.field3863 != 512) { // L: 175 + if (NetCache.field3863 != 512) { break; } @@ -257,17 +257,17 @@ public enum class295 implements MouseWheel { } } - return true; // L: 179 + return true; } } catch (IOException var21) { try { - NetCache.NetCache_socket.close(); // L: 183 - } catch (Exception var19) { // L: 185 + NetCache.NetCache_socket.close(); + } catch (Exception var19) { } - ++NetCache.NetCache_ioExceptions; // L: 186 - NetCache.NetCache_socket = null; // L: 187 - return false; // L: 188 + ++NetCache.NetCache_ioExceptions; + NetCache.NetCache_socket = null; + return false; } } } diff --git a/runescape-client/src/main/java/class312.java b/runescape-client/src/main/java/class312.java index 9af0b10715..59172af8f9 100644 --- a/runescape-client/src/main/java/class312.java +++ b/runescape-client/src/main/java/class312.java @@ -26,33 +26,33 @@ public class class312 { int field3911; public class312() { - this.spriteMap = new HashMap(); // L: 10 - this.bounds = new Bounds(0, 0); // L: 11 - this.field3909 = new int[2048]; // L: 12 - this.field3910 = new int[2048]; // L: 13 - this.field3911 = 0; // L: 14 - class111.field1348 = new int[2000]; // L: 22 - int var1 = 0; // L: 23 - int var2 = 240; // L: 24 + this.spriteMap = new HashMap(); + this.bounds = new Bounds(0, 0); + this.field3909 = new int[2048]; + this.field3910 = new int[2048]; + this.field3911 = 0; + class111.field1348 = new int[2000]; + int var1 = 0; + int var2 = 240; int var4; - for (byte var3 = 12; var1 < 16; var2 -= var3) { // L: 25 - var4 = class338.method6256((double)((float)var2 / 360.0F), 0.9998999834060669D, (double)((float)var1 * 0.425F / 16.0F + 0.075F)); // L: 27 - class111.field1348[var1] = var4; // L: 28 - ++var1; // L: 26 + for (byte var3 = 12; var1 < 16; var2 -= var3) { + var4 = class338.method6256((double)((float)var2 / 360.0F), 0.9998999834060669D, (double)((float)var1 * 0.425F / 16.0F + 0.075F)); + class111.field1348[var1] = var4; + ++var1; } - var2 = 48; // L: 30 + var2 = 48; - for (int var6 = var2 / 6; var1 < class111.field1348.length; var2 -= var6) { // L: 31 32 38 - var4 = var1 * 2; // L: 33 + for (int var6 = var2 / 6; var1 < class111.field1348.length; var2 -= var6) { + var4 = var1 * 2; - for (int var5 = class338.method6256((double)((float)var2 / 360.0F), 0.9998999834060669D, 0.5D); var1 < var4 && var1 < class111.field1348.length; ++var1) { // L: 34 35 - class111.field1348[var1] = var5; // L: 36 + for (int var5 = class338.method6256((double)((float)var2 / 360.0F), 0.9998999834060669D, 0.5D); var1 < var4 && var1 < class111.field1348.length; ++var1) { + class111.field1348[var1] = var5; } } - } // L: 41 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -60,35 +60,35 @@ public class class312 { garbageValue = "78" ) void method5803(int var1) { - int var2 = var1 * 2 + 1; // L: 44 - double var4 = (double)((float)var1 / 3.0F); // L: 46 - int var6 = var1 * 2 + 1; // L: 48 - double[] var7 = new double[var6]; // L: 49 + int var2 = var1 * 2 + 1; + double var4 = (double)((float)var1 / 3.0F); + int var6 = var1 * 2 + 1; + double[] var7 = new double[var6]; int var8 = -var1; for (int var9 = 0; var8 <= var1; ++var9) { - double var20 = Canvas.method408((double)(var8 - 0) / var4) / var4; // L: 55 - var7[var9] = var20; // L: 57 - ++var8; // L: 50 + double var20 = Canvas.method408((double)(var8 - 0) / var4) / var4; + var7[var9] = var20; + ++var8; } - double[] var14 = var7; // L: 61 - double var15 = var7[var1] * var7[var1]; // L: 62 - int[] var17 = new int[var2 * var2]; // L: 63 - boolean var10 = false; // L: 64 + double[] var14 = var7; + double var15 = var7[var1] * var7[var1]; + int[] var17 = new int[var2 * var2]; + boolean var10 = false; - for (int var11 = 0; var11 < var2; ++var11) { // L: 65 - for (int var12 = 0; var12 < var2; ++var12) { // L: 66 - int var13 = var17[var12 + var2 * var11] = (int)(256.0D * (var14[var11] * var14[var12] / var15)); // L: 67 - if (!var10 && var13 > 0) { // L: 68 - var10 = true; // L: 69 + for (int var11 = 0; var11 < var2; ++var11) { + for (int var12 = 0; var12 < var2; ++var12) { + int var13 = var17[var12 + var2 * var11] = (int)(256.0D * (var14[var11] * var14[var12] / var15)); + if (!var10 && var13 > 0) { + var10 = true; } } } - SpritePixels var18 = new SpritePixels(var17, var2, var2); // L: 73 - this.spriteMap.put(var1, var18); // L: 74 - } // L: 75 + SpritePixels var18 = new SpritePixels(var17, var2, var2); + this.spriteMap.put(var1, var18); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -96,11 +96,11 @@ public class class312 { garbageValue = "-904544036" ) SpritePixels method5797(int var1) { - if (!this.spriteMap.containsKey(var1)) { // L: 78 - this.method5803(var1); // L: 79 + if (!this.spriteMap.containsKey(var1)) { + this.method5803(var1); } - return (SpritePixels)this.spriteMap.get(var1); // L: 81 + return (SpritePixels)this.spriteMap.get(var1); } @ObfuscatedName("p") @@ -109,12 +109,12 @@ public class class312 { garbageValue = "1" ) public final void method5806(int var1, int var2) { - if (this.field3911 < this.field3909.length) { // L: 85 - this.field3909[this.field3911] = var1; // L: 86 - this.field3910[this.field3911] = var2; // L: 87 - ++this.field3911; // L: 88 + if (this.field3911 < this.field3909.length) { + this.field3909[this.field3911] = var1; + this.field3910[this.field3911] = var2; + ++this.field3911; } - } // L: 89 + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -122,8 +122,8 @@ public class class312 { garbageValue = "-82" ) public final void method5795() { - this.field3911 = 0; // L: 92 - } // L: 93 + this.field3911 = 0; + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -131,50 +131,50 @@ public class class312 { garbageValue = "-56" ) public final void method5800(int var1, int var2, SpritePixels var3, float var4) { - int var5 = (int)(18.0F * var4); // L: 96 - SpritePixels var6 = this.method5797(var5); // L: 97 - int var7 = var5 * 2 + 1; // L: 98 - Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); // L: 99 - Bounds var9 = new Bounds(0, 0); // L: 100 - this.bounds.setHigh(var7, var7); // L: 101 - System.nanoTime(); // L: 102 + int var5 = (int)(18.0F * var4); + SpritePixels var6 = this.method5797(var5); + int var7 = var5 * 2 + 1; + Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); + Bounds var9 = new Bounds(0, 0); + this.bounds.setHigh(var7, var7); + System.nanoTime(); int var10; int var11; int var12; - for (var10 = 0; var10 < this.field3911; ++var10) { // L: 103 - var11 = this.field3909[var10]; // L: 104 - var12 = this.field3910[var10]; // L: 105 - int var13 = (int)(var4 * (float)(var11 - var1)) - var5; // L: 106 - int var14 = (int)((float)var3.subHeight - (float)(var12 - var2) * var4) - var5; // L: 107 - this.bounds.setLow(var13, var14); // L: 108 - this.bounds.method6578(var8, var9); // L: 109 - this.method5801(var6, var3, var9); // L: 110 + for (var10 = 0; var10 < this.field3911; ++var10) { + var11 = this.field3909[var10]; + var12 = this.field3910[var10]; + int var13 = (int)(var4 * (float)(var11 - var1)) - var5; + int var14 = (int)((float)var3.subHeight - (float)(var12 - var2) * var4) - var5; + this.bounds.setLow(var13, var14); + this.bounds.method6578(var8, var9); + this.method5801(var6, var3, var9); } - System.nanoTime(); // L: 112 - System.nanoTime(); // L: 113 + System.nanoTime(); + System.nanoTime(); - for (var10 = 0; var10 < var3.pixels.length; ++var10) { // L: 114 - if (var3.pixels[var10] == 0) { // L: 115 - var3.pixels[var10] = -16777216; // L: 116 + for (var10 = 0; var10 < var3.pixels.length; ++var10) { + if (var3.pixels[var10] == 0) { + var3.pixels[var10] = -16777216; } else { - var11 = (var3.pixels[var10] + 64 - 1) / 256; // L: 119 - if (var11 <= 0) { // L: 120 - var3.pixels[var10] = -16777216; // L: 121 + var11 = (var3.pixels[var10] + 64 - 1) / 256; + if (var11 <= 0) { + var3.pixels[var10] = -16777216; } else { - if (var11 > class111.field1348.length) { // L: 124 + if (var11 > class111.field1348.length) { var11 = class111.field1348.length; } - var12 = class111.field1348[var11 - 1]; // L: 125 - var3.pixels[var10] = -16777216 | var12; // L: 126 + var12 = class111.field1348[var11 - 1]; + var3.pixels[var10] = -16777216 | var12; } } } - System.nanoTime(); // L: 128 - } // L: 129 + System.nanoTime(); + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -182,33 +182,33 @@ public class class312 { garbageValue = "-1046616793" ) void method5801(SpritePixels var1, SpritePixels var2, Bounds var3) { - if (var3.highX != 0 && var3.highY != 0) { // L: 132 - int var4 = 0; // L: 133 - int var5 = 0; // L: 134 - if (var3.lowX == 0) { // L: 135 + if (var3.highX != 0 && var3.highY != 0) { + int var4 = 0; + int var5 = 0; + if (var3.lowX == 0) { var4 = var1.subWidth - var3.highX; } - if (var3.lowY == 0) { // L: 136 + if (var3.lowY == 0) { var5 = var1.subHeight - var3.highY; } - int var6 = var4 + var5 * var1.subWidth; // L: 137 - int var7 = var2.subWidth * var3.lowY + var3.lowX; // L: 138 + int var6 = var4 + var5 * var1.subWidth; + int var7 = var2.subWidth * var3.lowY + var3.lowX; - for (int var8 = 0; var8 < var3.highY; ++var8) { // L: 139 - for (int var9 = 0; var9 < var3.highX; ++var9) { // L: 140 - int[] var10000 = var2.pixels; // L: 141 + for (int var8 = 0; var8 < var3.highY; ++var8) { + for (int var9 = 0; var9 < var3.highX; ++var9) { + int[] var10000 = var2.pixels; int var10001 = var7++; var10000[var10001] += var1.pixels[var6++]; } - var6 += var1.subWidth - var3.highX; // L: 143 - var7 += var2.subWidth - var3.highX; // L: 144 + var6 += var1.subWidth - var3.highX; + var7 += var2.subWidth - var3.highX; } } - } // L: 146 + } @ObfuscatedName("at") @ObfuscatedSignature( @@ -216,14 +216,14 @@ public class class312 { garbageValue = "586952329" ) static int method5810(int var0, Script var1, boolean var2) { - if (var0 == 6900) { // L: 4325 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 4326 - return 1; // L: 4327 - } else if (var0 == 6950) { // L: 4329 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4330 - return 1; // L: 4331 + if (var0 == 6900) { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; + return 1; + } else if (var0 == 6950) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; + return 1; } else { - return 2; // L: 4333 + return 2; } } @@ -234,46 +234,46 @@ public class class312 { ) @Export("checkIfMinimapClicked") static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { - if (Client.minimapState == 0 || Client.minimapState == 3) { // L: 4444 - if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !class150.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { // L: 4445 - SpriteMask var3 = var0.getSpriteMask(true); // L: 4446 - if (var3 == null) { // L: 4447 + if (Client.minimapState == 0 || Client.minimapState == 3) { + if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !class150.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { + SpriteMask var3 = var0.getSpriteMask(true); + if (var3 == null) { return; } - int var4 = MouseHandler.MouseHandler_lastPressedX - var1; // L: 4448 - int var5 = MouseHandler.MouseHandler_lastPressedY - var2; // L: 4449 - if (var3.contains(var4, var5)) { // L: 4450 - var4 -= var3.width / 2; // L: 4451 - var5 -= var3.height / 2; // L: 4452 - int var6 = Client.camAngleY & 2047; // L: 4453 - int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 4454 - int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 4455 - int var9 = var8 * var4 + var5 * var7 >> 11; // L: 4456 - int var10 = var8 * var5 - var7 * var4 >> 11; // L: 4457 - int var11 = var9 + class340.localPlayer.x >> 7; // L: 4458 - int var12 = class340.localPlayer.y - var10 >> 7; // L: 4459 - PacketBufferNode var13 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2860, Client.packetWriter.isaacCipher); // L: 4461 - var13.packetBuffer.writeByte(18); // L: 4462 - var13.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 4463 - var13.packetBuffer.method7493(var12 + TileItem.baseY); // L: 4464 - var13.packetBuffer.method7349(var11 + class131.baseX); // L: 4465 - var13.packetBuffer.writeByte(var4); // L: 4466 - var13.packetBuffer.writeByte(var5); // L: 4467 - var13.packetBuffer.writeShort(Client.camAngleY); // L: 4468 - var13.packetBuffer.writeByte(57); // L: 4469 - var13.packetBuffer.writeByte(0); // L: 4470 - var13.packetBuffer.writeByte(0); // L: 4471 - var13.packetBuffer.writeByte(89); // L: 4472 - var13.packetBuffer.writeShort(class340.localPlayer.x); // L: 4473 - var13.packetBuffer.writeShort(class340.localPlayer.y); // L: 4474 - var13.packetBuffer.writeByte(63); // L: 4475 - Client.packetWriter.addNode(var13); // L: 4476 - Client.destinationX = var11; // L: 4477 - Client.destinationY = var12; // L: 4478 + int var4 = MouseHandler.MouseHandler_lastPressedX - var1; + int var5 = MouseHandler.MouseHandler_lastPressedY - var2; + if (var3.contains(var4, var5)) { + var4 -= var3.width / 2; + var5 -= var3.height / 2; + int var6 = Client.camAngleY & 2047; + int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; + int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; + int var9 = var8 * var4 + var5 * var7 >> 11; + int var10 = var8 * var5 - var7 * var4 >> 11; + int var11 = var9 + class340.localPlayer.x >> 7; + int var12 = class340.localPlayer.y - var10 >> 7; + PacketBufferNode var13 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2860, Client.packetWriter.isaacCipher); + var13.packetBuffer.writeByte(18); + var13.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); + var13.packetBuffer.method7493(var12 + TileItem.baseY); + var13.packetBuffer.method7349(var11 + class131.baseX); + var13.packetBuffer.writeByte(var4); + var13.packetBuffer.writeByte(var5); + var13.packetBuffer.writeShort(Client.camAngleY); + var13.packetBuffer.writeByte(57); + var13.packetBuffer.writeByte(0); + var13.packetBuffer.writeByte(0); + var13.packetBuffer.writeByte(89); + var13.packetBuffer.writeShort(class340.localPlayer.x); + var13.packetBuffer.writeShort(class340.localPlayer.y); + var13.packetBuffer.writeByte(63); + Client.packetWriter.addNode(var13); + Client.destinationX = var11; + Client.destinationY = var12; } } } - } // L: 4481 + } } diff --git a/runescape-client/src/main/java/class313.java b/runescape-client/src/main/java/class313.java index 582d9769ca..4eb2a794ff 100644 --- a/runescape-client/src/main/java/class313.java +++ b/runescape-client/src/main/java/class313.java @@ -20,11 +20,11 @@ public class class313 { static final class313 field3915; static { - field3916 = new class313(); // L: 4 - field3917 = new class313(); // L: 5 - field3915 = new class313(); // L: 6 + field3916 = new class313(); + field3917 = new class313(); + field3915 = new class313(); } class313() { - } // L: 8 + } } diff --git a/runescape-client/src/main/java/class315.java b/runescape-client/src/main/java/class315.java index 01fb710194..81f3c872a7 100644 --- a/runescape-client/src/main/java/class315.java +++ b/runescape-client/src/main/java/class315.java @@ -13,7 +13,7 @@ public class class315 { static { new HashMap(); - } // L: 9 + } @ObfuscatedName("fr") @ObfuscatedSignature( @@ -21,20 +21,20 @@ public class class315 { garbageValue = "-2066183341" ) static void method5816(int var0, int var1, int var2) { - if (var0 != 0) { // L: 4315 - int var3 = var0 >> 8; // L: 4316 - int var4 = var0 >> 4 & 7; // L: 4317 - int var5 = var0 & 15; // L: 4318 - Client.soundEffectIds[Client.soundEffectCount] = var3; // L: 4319 - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var4; // L: 4320 - Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; // L: 4321 - Client.soundEffects[Client.soundEffectCount] = null; // L: 4322 - int var6 = (var1 - 64) / 128; // L: 4323 - int var7 = (var2 - 64) / 128; // L: 4324 - Client.soundLocations[Client.soundEffectCount] = var5 + (var7 << 8) + (var6 << 16); // L: 4325 - ++Client.soundEffectCount; // L: 4326 + if (var0 != 0) { + int var3 = var0 >> 8; + int var4 = var0 >> 4 & 7; + int var5 = var0 & 15; + Client.soundEffectIds[Client.soundEffectCount] = var3; + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var4; + Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; + Client.soundEffects[Client.soundEffectCount] = null; + int var6 = (var1 - 64) / 128; + int var7 = (var2 - 64) / 128; + Client.soundLocations[Client.soundEffectCount] = var5 + (var7 << 8) + (var6 << 16); + ++Client.soundEffectCount; } - } // L: 4327 + } @ObfuscatedName("fm") @ObfuscatedSignature( @@ -42,10 +42,10 @@ public class class315 { garbageValue = "-1161739111" ) static void method5822(int var0, int var1) { - if (SecureRandomFuture.clientPreferences.musicVolume != 0 && var0 != -1) { // L: 4361 - NetSocket.method3118(Players.archive11, var0, 0, SecureRandomFuture.clientPreferences.musicVolume, false); // L: 4362 - Client.field743 = true; // L: 4363 + if (SecureRandomFuture.clientPreferences.musicVolume != 0 && var0 != -1) { + NetSocket.method3118(Players.archive11, var0, 0, SecureRandomFuture.clientPreferences.musicVolume, false); + Client.field743 = true; } - } // L: 4365 + } } diff --git a/runescape-client/src/main/java/class328.java b/runescape-client/src/main/java/class328.java index 677b3868fe..b62c97d5bd 100644 --- a/runescape-client/src/main/java/class328.java +++ b/runescape-client/src/main/java/class328.java @@ -9,7 +9,7 @@ public class class328 { public static final char[] cp1252AsciiExtension; static { - cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; // L: 4 + cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; } @ObfuscatedName("kr") @@ -19,44 +19,44 @@ public class class328 { ) @Export("drawModelComponents") static final void drawModelComponents(Widget[] var0, int var1) { - for (int var2 = 0; var2 < var0.length; ++var2) { // L: 12075 - Widget var3 = var0[var2]; // L: 12076 - if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !StudioGame.isComponentHidden(var3))) { // L: 12077 12078 12079 - if (var3.type == 0) { // L: 12080 - if (!var3.isIf3 && StudioGame.isComponentHidden(var3) && var3 != class4.mousedOverWidgetIf1) { // L: 12081 + for (int var2 = 0; var2 < var0.length; ++var2) { + Widget var3 = var0[var2]; + if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !StudioGame.isComponentHidden(var3))) { + if (var3.type == 0) { + if (!var3.isIf3 && StudioGame.isComponentHidden(var3) && var3 != class4.mousedOverWidgetIf1) { continue; } - drawModelComponents(var0, var3.id); // L: 12082 - if (var3.children != null) { // L: 12083 + drawModelComponents(var0, var3.id); + if (var3.children != null) { drawModelComponents(var3.children, var3.id); } - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 12084 - if (var4 != null) { // L: 12085 + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); + if (var4 != null) { GraphicsObject.method1955(var4.group); } } - if (var3.type == 6) { // L: 12087 + if (var3.type == 6) { int var5; - if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { // L: 12088 - boolean var7 = class28.runCs1(var3); // L: 12089 - if (var7) { // L: 12091 + if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { + boolean var7 = class28.runCs1(var3); + if (var7) { var5 = var3.sequenceId2; } else { - var5 = var3.sequenceId; // L: 12092 + var5 = var3.sequenceId; } - if (var5 != -1) { // L: 12093 - SequenceDefinition var6 = UserComparator5.SequenceDefinition_get(var5); // L: 12094 + if (var5 != -1) { + SequenceDefinition var6 = UserComparator5.SequenceDefinition_get(var5); - for (var3.modelFrameCycle += Client.field538; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; SecureRandomCallable.invalidateWidget(var3)) { // L: 12095 12096 12103 - var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; // L: 12097 - ++var3.modelFrame; // L: 12098 - if (var3.modelFrame >= var6.frameIds.length) { // L: 12099 - var3.modelFrame -= var6.frameCount; // L: 12100 - if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { // L: 12101 + for (var3.modelFrameCycle += Client.field538; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; SecureRandomCallable.invalidateWidget(var3)) { + var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; + ++var3.modelFrame; + if (var3.modelFrame >= var6.frameIds.length) { + var3.modelFrame -= var6.frameCount; + if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { var3.modelFrame = 0; } } @@ -64,18 +64,18 @@ public class class328 { } } - if (var3.field3260 != 0 && !var3.isIf3) { // L: 12107 - int var8 = var3.field3260 >> 16; // L: 12108 - var5 = var3.field3260 << 16 >> 16; // L: 12109 - var8 *= Client.field538; // L: 12110 - var5 *= Client.field538; // L: 12111 - var3.modelAngleX = var8 + var3.modelAngleX & 2047; // L: 12112 - var3.modelAngleY = var5 + var3.modelAngleY & 2047; // L: 12113 - SecureRandomCallable.invalidateWidget(var3); // L: 12114 + if (var3.field3260 != 0 && !var3.isIf3) { + int var8 = var3.field3260 >> 16; + var5 = var3.field3260 << 16 >> 16; + var8 *= Client.field538; + var5 *= Client.field538; + var3.modelAngleX = var8 + var3.modelAngleX & 2047; + var3.modelAngleY = var5 + var3.modelAngleY & 2047; + SecureRandomCallable.invalidateWidget(var3); } } } } - } // L: 12118 + } } diff --git a/runescape-client/src/main/java/class329.java b/runescape-client/src/main/java/class329.java index c8b0764f7c..42d321cae6 100644 --- a/runescape-client/src/main/java/class329.java +++ b/runescape-client/src/main/java/class329.java @@ -13,80 +13,80 @@ public class class329 { static int[] field4004; static { - field4005 = new char[64]; // L: 7 + field4005 = new char[64]; int var0; - for (var0 = 0; var0 < 26; ++var0) { // L: 8 + for (var0 = 0; var0 < 26; ++var0) { field4005[var0] = (char)(var0 + 65); } - for (var0 = 26; var0 < 52; ++var0) { // L: 9 + for (var0 = 26; var0 < 52; ++var0) { field4005[var0] = (char)(var0 + 97 - 26); } - for (var0 = 52; var0 < 62; ++var0) { // L: 10 + for (var0 = 52; var0 < 62; ++var0) { field4005[var0] = (char)(var0 + 48 - 52); } - field4005[62] = '+'; // L: 11 - field4005[63] = '/'; // L: 12 - field4003 = new char[64]; // L: 18 + field4005[62] = '+'; + field4005[63] = '/'; + field4003 = new char[64]; - for (var0 = 0; var0 < 26; ++var0) { // L: 19 + for (var0 = 0; var0 < 26; ++var0) { field4003[var0] = (char)(var0 + 65); } - for (var0 = 26; var0 < 52; ++var0) { // L: 20 + for (var0 = 26; var0 < 52; ++var0) { field4003[var0] = (char)(var0 + 97 - 26); } - for (var0 = 52; var0 < 62; ++var0) { // L: 21 + for (var0 = 52; var0 < 62; ++var0) { field4003[var0] = (char)(var0 + 48 - 52); } - field4003[62] = '*'; // L: 22 - field4003[63] = '-'; // L: 23 - field4002 = new char[64]; // L: 29 + field4003[62] = '*'; + field4003[63] = '-'; + field4002 = new char[64]; - for (var0 = 0; var0 < 26; ++var0) { // L: 30 + for (var0 = 0; var0 < 26; ++var0) { field4002[var0] = (char)(var0 + 65); } - for (var0 = 26; var0 < 52; ++var0) { // L: 31 + for (var0 = 26; var0 < 52; ++var0) { field4002[var0] = (char)(var0 + 97 - 26); } - for (var0 = 52; var0 < 62; ++var0) { // L: 32 + for (var0 = 52; var0 < 62; ++var0) { field4002[var0] = (char)(var0 + 48 - 52); } - field4002[62] = '-'; // L: 33 - field4002[63] = '_'; // L: 34 - field4004 = new int[128]; // L: 40 + field4002[62] = '-'; + field4002[63] = '_'; + field4004 = new int[128]; - for (var0 = 0; var0 < field4004.length; ++var0) { // L: 41 + for (var0 = 0; var0 < field4004.length; ++var0) { field4004[var0] = -1; } - for (var0 = 65; var0 <= 90; ++var0) { // L: 42 + for (var0 = 65; var0 <= 90; ++var0) { field4004[var0] = var0 - 65; } - for (var0 = 97; var0 <= 122; ++var0) { // L: 43 + for (var0 = 97; var0 <= 122; ++var0) { field4004[var0] = var0 - 97 + 26; } - for (var0 = 48; var0 <= 57; ++var0) { // L: 44 + for (var0 = 48; var0 <= 57; ++var0) { field4004[var0] = var0 - 48 + 52; } - int[] var2 = field4004; // L: 45 - field4004[43] = 62; // L: 46 - var2[42] = 62; // L: 47 - int[] var1 = field4004; // L: 48 - field4004[47] = 63; // L: 49 - var1[45] = 63; // L: 50 - } // L: 51 + int[] var2 = field4004; + field4004[43] = 62; + var2[42] = 62; + int[] var1 = field4004; + field4004[47] = 63; + var1[45] = 63; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -94,8 +94,8 @@ public class class329 { garbageValue = "-119080424" ) public static float method6135(int var0) { - var0 &= 16383; // L: 24 - return (float)(6.283185307179586D * (double)((float)var0 / 16384.0F)); // L: 25 + var0 &= 16383; + return (float)(6.283185307179586D * (double)((float)var0 / 16384.0F)); } @ObfuscatedName("hn") @@ -104,6 +104,6 @@ public class class329 { garbageValue = "113" ) static boolean method6133() { - return (Client.drawPlayerNames & 8) != 0; // L: 5588 + return (Client.drawPlayerNames & 8) != 0; } } diff --git a/runescape-client/src/main/java/class33.java b/runescape-client/src/main/java/class33.java index 0fe85231a1..54e8b5b533 100644 --- a/runescape-client/src/main/java/class33.java +++ b/runescape-client/src/main/java/class33.java @@ -18,7 +18,7 @@ public class class33 { public static IterableNodeDeque reflectionChecks; static { - reflectionChecks = new IterableNodeDeque(); // L: 17 + reflectionChecks = new IterableNodeDeque(); } @ObfuscatedName("ae") @@ -28,23 +28,23 @@ public class class33 { ) @Export("runWidgetOnLoadListener") static void runWidgetOnLoadListener(int var0) { - if (var0 != -1) { // L: 4512 - if (class242.loadInterface(var0)) { // L: 4513 - Widget[] var1 = MouseRecorder.Widget_interfaceComponents[var0]; // L: 4514 + if (var0 != -1) { + if (class242.loadInterface(var0)) { + Widget[] var1 = MouseRecorder.Widget_interfaceComponents[var0]; - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 4515 - Widget var3 = var1[var2]; // L: 4516 - if (var3.onLoad != null) { // L: 4517 - ScriptEvent var4 = new ScriptEvent(); // L: 4518 - var4.widget = var3; // L: 4519 - var4.args = var3.onLoad; // L: 4520 - ScriptFrame.runScript(var4, 5000000, 0); // L: 4521 + for (int var2 = 0; var2 < var1.length; ++var2) { + Widget var3 = var1[var2]; + if (var3.onLoad != null) { + ScriptEvent var4 = new ScriptEvent(); + var4.widget = var3; + var4.args = var3.onLoad; + ScriptFrame.runScript(var4, 5000000, 0); } } } } - } // L: 4524 + } @ObfuscatedName("gd") @ObfuscatedSignature( @@ -52,14 +52,14 @@ public class class33 { garbageValue = "-1059461480" ) static final void method656() { - for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) { // L: 5495 5496 5503 - if (var0.plane == class20.Client_plane && !var0.isFinished) { // L: 5497 - if (Client.cycle >= var0.cycleStart) { // L: 5498 - var0.advance(Client.field538); // L: 5499 + for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) { + if (var0.plane == class20.Client_plane && !var0.isFinished) { + if (Client.cycle >= var0.cycleStart) { + var0.advance(Client.field538); if (var0.isFinished) { - var0.remove(); // L: 5500 + var0.remove(); } else { - class7.scene.drawEntity(var0.plane, var0.x, var0.y, var0.height, 60, var0, 0, -1L, false); // L: 5501 + class7.scene.drawEntity(var0.plane, var0.x, var0.y, var0.height, 60, var0, 0, -1L, false); } } } else { @@ -67,7 +67,7 @@ public class class33 { } } - } // L: 5505 + } @ObfuscatedName("hc") @ObfuscatedSignature( @@ -76,146 +76,146 @@ public class class33 { ) @Export("drawObject") static final void drawObject(int var0, int var1, int var2, int var3, int var4) { - long var5 = class7.scene.getBoundaryObjectTag(var0, var1, var2); // L: 6341 + long var5 = class7.scene.getBoundaryObjectTag(var0, var1, var2); int var7; int var8; int var9; int var10; int var12; int var13; - if (var5 != 0L) { // L: 6342 - var7 = class7.scene.getObjectFlags(var0, var1, var2, var5); // L: 6343 - var8 = var7 >> 6 & 3; // L: 6344 - var9 = var7 & 31; // L: 6345 - var10 = var3; // L: 6346 - if (class116.method2671(var5)) { // L: 6347 + if (var5 != 0L) { + var7 = class7.scene.getObjectFlags(var0, var1, var2, var5); + var8 = var7 >> 6 & 3; + var9 = var7 & 31; + var10 = var3; + if (class116.method2671(var5)) { var10 = var4; } - int[] var11 = class29.sceneMinimapSprite.pixels; // L: 6348 - var12 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 6349 - var13 = PacketWriter.Entity_unpackID(var5); // L: 6350 - ObjectComposition var14 = class148.getObjectDefinition(var13); // L: 6351 - if (var14.mapSceneId != -1) { // L: 6352 - IndexedSprite var15 = AbstractWorldMapData.mapSceneSprites[var14.mapSceneId]; // L: 6353 - if (var15 != null) { // L: 6354 - int var16 = (var14.sizeX * 4 - var15.subWidth) / 2; // L: 6355 - int var17 = (var14.sizeY * 4 - var15.subHeight) / 2; // L: 6356 - var15.drawAt(var16 + var1 * 4 + 48, var17 + (104 - var2 - var14.sizeY) * 4 + 48); // L: 6357 + int[] var11 = class29.sceneMinimapSprite.pixels; + var12 = var1 * 4 + (103 - var2) * 2048 + 24624; + var13 = PacketWriter.Entity_unpackID(var5); + ObjectComposition var14 = class148.getObjectDefinition(var13); + if (var14.mapSceneId != -1) { + IndexedSprite var15 = AbstractWorldMapData.mapSceneSprites[var14.mapSceneId]; + if (var15 != null) { + int var16 = (var14.sizeX * 4 - var15.subWidth) / 2; + int var17 = (var14.sizeY * 4 - var15.subHeight) / 2; + var15.drawAt(var16 + var1 * 4 + 48, var17 + (104 - var2 - var14.sizeY) * 4 + 48); } } else { - if (var9 == 0 || var9 == 2) { // L: 6361 - if (var8 == 0) { // L: 6362 - var11[var12] = var10; // L: 6363 - var11[var12 + 512] = var10; // L: 6364 - var11[var12 + 1024] = var10; // L: 6365 - var11[var12 + 1536] = var10; // L: 6366 - } else if (var8 == 1) { // L: 6368 - var11[var12] = var10; // L: 6369 - var11[var12 + 1] = var10; // L: 6370 - var11[var12 + 2] = var10; // L: 6371 - var11[var12 + 3] = var10; // L: 6372 - } else if (var8 == 2) { // L: 6374 - var11[var12 + 3] = var10; // L: 6375 - var11[var12 + 512 + 3] = var10; // L: 6376 - var11[var12 + 1024 + 3] = var10; // L: 6377 - var11[var12 + 1536 + 3] = var10; // L: 6378 - } else if (var8 == 3) { // L: 6380 - var11[var12 + 1536] = var10; // L: 6381 - var11[var12 + 1536 + 1] = var10; // L: 6382 - var11[var12 + 1536 + 2] = var10; // L: 6383 - var11[var12 + 1536 + 3] = var10; // L: 6384 + if (var9 == 0 || var9 == 2) { + if (var8 == 0) { + var11[var12] = var10; + var11[var12 + 512] = var10; + var11[var12 + 1024] = var10; + var11[var12 + 1536] = var10; + } else if (var8 == 1) { + var11[var12] = var10; + var11[var12 + 1] = var10; + var11[var12 + 2] = var10; + var11[var12 + 3] = var10; + } else if (var8 == 2) { + var11[var12 + 3] = var10; + var11[var12 + 512 + 3] = var10; + var11[var12 + 1024 + 3] = var10; + var11[var12 + 1536 + 3] = var10; + } else if (var8 == 3) { + var11[var12 + 1536] = var10; + var11[var12 + 1536 + 1] = var10; + var11[var12 + 1536 + 2] = var10; + var11[var12 + 1536 + 3] = var10; } } - if (var9 == 3) { // L: 6387 - if (var8 == 0) { // L: 6388 + if (var9 == 3) { + if (var8 == 0) { var11[var12] = var10; - } else if (var8 == 1) { // L: 6389 + } else if (var8 == 1) { var11[var12 + 3] = var10; - } else if (var8 == 2) { // L: 6390 + } else if (var8 == 2) { var11[var12 + 1536 + 3] = var10; - } else if (var8 == 3) { // L: 6391 + } else if (var8 == 3) { var11[var12 + 1536] = var10; } } - if (var9 == 2) { // L: 6393 - if (var8 == 3) { // L: 6394 - var11[var12] = var10; // L: 6395 - var11[var12 + 512] = var10; // L: 6396 - var11[var12 + 1024] = var10; // L: 6397 - var11[var12 + 1536] = var10; // L: 6398 - } else if (var8 == 0) { // L: 6400 - var11[var12] = var10; // L: 6401 - var11[var12 + 1] = var10; // L: 6402 - var11[var12 + 2] = var10; // L: 6403 - var11[var12 + 3] = var10; // L: 6404 - } else if (var8 == 1) { // L: 6406 - var11[var12 + 3] = var10; // L: 6407 - var11[var12 + 512 + 3] = var10; // L: 6408 - var11[var12 + 1024 + 3] = var10; // L: 6409 - var11[var12 + 1536 + 3] = var10; // L: 6410 - } else if (var8 == 2) { // L: 6412 - var11[var12 + 1536] = var10; // L: 6413 - var11[var12 + 1536 + 1] = var10; // L: 6414 - var11[var12 + 1536 + 2] = var10; // L: 6415 - var11[var12 + 1536 + 3] = var10; // L: 6416 + if (var9 == 2) { + if (var8 == 3) { + var11[var12] = var10; + var11[var12 + 512] = var10; + var11[var12 + 1024] = var10; + var11[var12 + 1536] = var10; + } else if (var8 == 0) { + var11[var12] = var10; + var11[var12 + 1] = var10; + var11[var12 + 2] = var10; + var11[var12 + 3] = var10; + } else if (var8 == 1) { + var11[var12 + 3] = var10; + var11[var12 + 512 + 3] = var10; + var11[var12 + 1024 + 3] = var10; + var11[var12 + 1536 + 3] = var10; + } else if (var8 == 2) { + var11[var12 + 1536] = var10; + var11[var12 + 1536 + 1] = var10; + var11[var12 + 1536 + 2] = var10; + var11[var12 + 1536 + 3] = var10; } } } } - var5 = class7.scene.getGameObjectTag(var0, var1, var2); // L: 6421 - if (var5 != 0L) { // L: 6422 - var7 = class7.scene.getObjectFlags(var0, var1, var2, var5); // L: 6423 - var8 = var7 >> 6 & 3; // L: 6424 - var9 = var7 & 31; // L: 6425 - var10 = PacketWriter.Entity_unpackID(var5); // L: 6426 - ObjectComposition var24 = class148.getObjectDefinition(var10); // L: 6427 + var5 = class7.scene.getGameObjectTag(var0, var1, var2); + if (var5 != 0L) { + var7 = class7.scene.getObjectFlags(var0, var1, var2, var5); + var8 = var7 >> 6 & 3; + var9 = var7 & 31; + var10 = PacketWriter.Entity_unpackID(var5); + ObjectComposition var24 = class148.getObjectDefinition(var10); int var19; - if (var24.mapSceneId != -1) { // L: 6428 - IndexedSprite var20 = AbstractWorldMapData.mapSceneSprites[var24.mapSceneId]; // L: 6429 - if (var20 != null) { // L: 6430 - var13 = (var24.sizeX * 4 - var20.subWidth) / 2; // L: 6431 - var19 = (var24.sizeY * 4 - var20.subHeight) / 2; // L: 6432 - var20.drawAt(var13 + var1 * 4 + 48, (104 - var2 - var24.sizeY) * 4 + var19 + 48); // L: 6433 + if (var24.mapSceneId != -1) { + IndexedSprite var20 = AbstractWorldMapData.mapSceneSprites[var24.mapSceneId]; + if (var20 != null) { + var13 = (var24.sizeX * 4 - var20.subWidth) / 2; + var19 = (var24.sizeY * 4 - var20.subHeight) / 2; + var20.drawAt(var13 + var1 * 4 + 48, (104 - var2 - var24.sizeY) * 4 + var19 + 48); } - } else if (var9 == 9) { // L: 6436 - var12 = 15658734; // L: 6437 - if (class116.method2671(var5)) { // L: 6438 + } else if (var9 == 9) { + var12 = 15658734; + if (class116.method2671(var5)) { var12 = 15597568; } - int[] var18 = class29.sceneMinimapSprite.pixels; // L: 6439 - var19 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 6440 - if (var8 != 0 && var8 != 2) { // L: 6441 - var18[var19] = var12; // L: 6448 - var18[var19 + 1 + 512] = var12; // L: 6449 - var18[var19 + 1024 + 2] = var12; // L: 6450 - var18[var19 + 1536 + 3] = var12; // L: 6451 + int[] var18 = class29.sceneMinimapSprite.pixels; + var19 = var1 * 4 + (103 - var2) * 2048 + 24624; + if (var8 != 0 && var8 != 2) { + var18[var19] = var12; + var18[var19 + 1 + 512] = var12; + var18[var19 + 1024 + 2] = var12; + var18[var19 + 1536 + 3] = var12; } else { - var18[var19 + 1536] = var12; // L: 6442 - var18[var19 + 1 + 1024] = var12; // L: 6443 - var18[var19 + 512 + 2] = var12; // L: 6444 - var18[var19 + 3] = var12; // L: 6445 + var18[var19 + 1536] = var12; + var18[var19 + 1 + 1024] = var12; + var18[var19 + 512 + 2] = var12; + var18[var19 + 3] = var12; } } } - var5 = class7.scene.getFloorDecorationTag(var0, var1, var2); // L: 6455 - if (0L != var5) { // L: 6456 - var7 = PacketWriter.Entity_unpackID(var5); // L: 6457 - ObjectComposition var21 = class148.getObjectDefinition(var7); // L: 6458 - if (var21.mapSceneId != -1) { // L: 6459 - IndexedSprite var22 = AbstractWorldMapData.mapSceneSprites[var21.mapSceneId]; // L: 6460 - if (var22 != null) { // L: 6461 - var10 = (var21.sizeX * 4 - var22.subWidth) / 2; // L: 6462 - int var23 = (var21.sizeY * 4 - var22.subHeight) / 2; // L: 6463 - var22.drawAt(var10 + var1 * 4 + 48, (104 - var2 - var21.sizeY) * 4 + var23 + 48); // L: 6464 + var5 = class7.scene.getFloorDecorationTag(var0, var1, var2); + if (0L != var5) { + var7 = PacketWriter.Entity_unpackID(var5); + ObjectComposition var21 = class148.getObjectDefinition(var7); + if (var21.mapSceneId != -1) { + IndexedSprite var22 = AbstractWorldMapData.mapSceneSprites[var21.mapSceneId]; + if (var22 != null) { + var10 = (var21.sizeX * 4 - var22.subWidth) / 2; + int var23 = (var21.sizeY * 4 - var22.subHeight) / 2; + var22.drawAt(var10 + var1 * 4 + 48, (104 - var2 - var21.sizeY) * 4 + var23 + 48); } } } - } // L: 6468 + } } diff --git a/runescape-client/src/main/java/class330.java b/runescape-client/src/main/java/class330.java index 7f867d710e..cd5fa40a8f 100644 --- a/runescape-client/src/main/java/class330.java +++ b/runescape-client/src/main/java/class330.java @@ -1,6 +1,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +@jc @ObfuscatedName("ly") public final class class330 { @ObfuscatedName("j") diff --git a/runescape-client/src/main/java/class331.java b/runescape-client/src/main/java/class331.java index 35328012ad..e16194d3a6 100644 --- a/runescape-client/src/main/java/class331.java +++ b/runescape-client/src/main/java/class331.java @@ -17,8 +17,8 @@ public class class331 { garbageValue = "0" ) public static void method6174(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) { - HitSplatDefinition.HitSplatDefinition_archive = var0; // L: 46 - HitSplatDefinition.field1939 = var1; // L: 47 - HitSplatDefinition.HitSplatDefinition_fontsArchive = var2; // L: 48 - } // L: 49 + HitSplatDefinition.HitSplatDefinition_archive = var0; + HitSplatDefinition.field1939 = var1; + HitSplatDefinition.HitSplatDefinition_fontsArchive = var2; + } } diff --git a/runescape-client/src/main/java/class332.java b/runescape-client/src/main/java/class332.java index 5dfa7b2e78..49b0c6f1d0 100644 --- a/runescape-client/src/main/java/class332.java +++ b/runescape-client/src/main/java/class332.java @@ -12,14 +12,14 @@ public final class class332 { static long[] field4013; 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 - field4013 = new long[12]; // L: 5 + 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'}; + field4013 = new long[12]; - for (int var0 = 0; var0 < field4013.length; ++var0) { // L: 8 + for (int var0 = 0; var0 < field4013.length; ++var0) { field4013[var0] = (long)Math.pow(37.0D, (double)var0); } - } // L: 9 + } @ObfuscatedName("ab") @ObfuscatedSignature( @@ -27,167 +27,167 @@ public final class class332 { garbageValue = "7484" ) static int method6184(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_LISTENED) { // L: 2499 - if (class222.guestClanSettings != null) { // L: 2500 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; // L: 2501 - Friend.field4084 = class222.guestClanSettings; // L: 2502 + if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_LISTENED) { + if (class222.guestClanSettings != null) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; + Friend.field4084 = class222.guestClanSettings; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 2504 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; } - return 1; // L: 2505 + return 1; } else { int var3; - if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_AFFINED) { // L: 2507 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2508 - if (Client.currentClanSettings[var3] != null) { // L: 2509 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; // L: 2510 - Friend.field4084 = Client.currentClanSettings[var3]; // L: 2511 + if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_AFFINED) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + if (Client.currentClanSettings[var3] != null) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; + Friend.field4084 = Client.currentClanSettings[var3]; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 2513 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; } - return 1; // L: 2514 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCLANNAME) { // L: 2516 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Friend.field4084.name; // L: 2517 - return 1; // L: 2518 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETALLOWUNAFFINED) { // L: 2520 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.allowGuests ? 1 : 0; // L: 2521 - return 1; // L: 2522 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKTALK) { // L: 2524 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.field1567; // L: 2525 - return 1; // L: 2526 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKKICK) { // L: 2528 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.field1568; // L: 2529 - return 1; // L: 2530 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKLOOTSHARE) { // L: 2532 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.field1569; // L: 2533 - return 1; // L: 2534 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCOINSHARE) { // L: 2536 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.field1570; // L: 2537 - return 1; // L: 2538 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDCOUNT) { // L: 2540 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.memberCount; // L: 2541 - return 1; // L: 2542 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDDISPLAYNAME) { // L: 2544 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2545 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Friend.field4084.memberNames[var3]; // L: 2546 - return 1; // L: 2547 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDRANK) { // L: 2549 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2550 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.memberRanks[var3]; // L: 2551 - return 1; // L: 2552 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDCOUNT) { // L: 2554 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.bannedMemberCount; // L: 2555 - return 1; // L: 2556 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDDISPLAYNAME) { // L: 2558 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2559 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Friend.field4084.bannedMemberNames[var3]; // L: 2560 - return 1; // L: 2561 + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCLANNAME) { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Friend.field4084.name; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETALLOWUNAFFINED) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.allowGuests ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKTALK) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.field1567; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKKICK) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.field1568; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKLOOTSHARE) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.field1569; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCOINSHARE) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.field1570; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDCOUNT) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.memberCount; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDDISPLAYNAME) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Friend.field4084.memberNames[var3]; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDRANK) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.memberRanks[var3]; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDCOUNT) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.bannedMemberCount; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDDISPLAYNAME) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Friend.field4084.bannedMemberNames[var3]; + return 1; } else { int var5; int var6; - if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDEXTRAINFO) { // L: 2563 - IsaacCipher.Interpreter_intStackSize -= 3; // L: 2564 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2565 - var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2566 - var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 2567 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.method2847(var3, var6, var5); // L: 2568 - return 1; // L: 2569 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCURRENTOWNER_SLOT) { // L: 2571 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.currentOwner; // L: 2572 - return 1; // L: 2573 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETREPLACEMENTOWNER_SLOT) { // L: 2575 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.field1579; // L: 2576 - return 1; // L: 2577 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDSLOT) { // L: 2579 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.method2881(Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]); // L: 2580 - return 1; // L: 2581 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETSORTEDAFFINEDSLOT) { // L: 2583 - Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.getSortedMembers()[Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1]]; // L: 2584 - return 1; // L: 2585 - } else if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL) { // L: 2587 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 2588 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2589 - var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2590 - class113.method2617(var6, var3); // L: 2591 - return 1; // L: 2592 - } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDJOINRUNEDAY) { // L: 2594 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2595 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.field1582[var3]; // L: 2596 - return 1; // L: 2597 + if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDEXTRAINFO) { + IsaacCipher.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.method2847(var3, var6, var5); + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCURRENTOWNER_SLOT) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.currentOwner; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETREPLACEMENTOWNER_SLOT) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.field1579; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDSLOT) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.method2881(Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]); + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETSORTEDAFFINEDSLOT) { + Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.getSortedMembers()[Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1]]; + return 1; + } else if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + class113.method2617(var6, var3); + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDJOINRUNEDAY) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.field1582[var3]; + return 1; } else { - if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL) { // L: 2599 - IsaacCipher.Interpreter_intStackSize -= 3; // L: 2600 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2601 - boolean var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1] == 1; // L: 2602 - var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 2603 - class6.method48(var5, var3, var4); // L: 2604 + if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL) { + IsaacCipher.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + boolean var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1] == 1; + var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; + class6.method48(var5, var3, var4); } - if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDMUTED) { // L: 2606 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2607 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.field1577[var3] ? 1 : 0; // L: 2608 - return 1; // L: 2609 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_LISTENED) { // L: 2611 - if (UserComparator5.guestClanChannel != null) { // L: 2612 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; // L: 2613 - class1.field0 = UserComparator5.guestClanChannel; // L: 2614 + if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDMUTED) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.field1577[var3] ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_LISTENED) { + if (UserComparator5.guestClanChannel != null) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; + class1.field0 = UserComparator5.guestClanChannel; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 2616 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; } - return 1; // L: 2617 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_AFFINED) { // L: 2619 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2620 - if (Client.currentClanChannels[var3] != null) { // L: 2621 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; // L: 2622 - class1.field0 = Client.currentClanChannels[var3]; // L: 2623 - Interpreter.field812 = var3; // L: 2624 + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_AFFINED) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + if (Client.currentClanChannels[var3] != null) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; + class1.field0 = Client.currentClanChannels[var3]; + Interpreter.field812 = var3; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 2626 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; } - return 1; // L: 2627 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETCLANNAME) { // L: 2629 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = class1.field0.name; // L: 2630 - return 1; // L: 2631 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKKICK) { // L: 2633 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class1.field0.field1643; // L: 2634 - return 1; // L: 2635 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKTALK) { // L: 2637 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class1.field0.field1636; // L: 2638 - return 1; // L: 2639 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERCOUNT) { // L: 2641 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class1.field0.method2990(); // L: 2642 - return 1; // L: 2643 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERDISPLAYNAME) { // L: 2645 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2646 - Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ((ClanChannelMember)class1.field0.members.get(var3)).username.getName(); // L: 2647 - return 1; // L: 2648 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERRANK) { // L: 2650 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2651 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = ((ClanChannelMember)class1.field0.members.get(var3)).rank; // L: 2652 - return 1; // L: 2653 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERWORLD) { // L: 2655 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2656 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = ((ClanChannelMember)class1.field0.members.get(var3)).world; // L: 2657 - return 1; // L: 2658 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_KICKUSER) { // L: 2660 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2661 - class135.method2831(Interpreter.field812, var3); // L: 2662 - return 1; // L: 2663 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERSLOT) { // L: 2665 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class1.field0.method2991(Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]); // L: 2666 - return 1; // L: 2667 - } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETSORTEDUSERSLOT) { // L: 2669 - Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1] = class1.field0.getSortedMembers()[Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1]]; // L: 2670 - return 1; // L: 2671 - } else if (var0 == ScriptOpcodes.CLANPROFILE_FIND) { // L: 2673 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = BuddyRankComparator.field1342 != null ? 1 : 0; // L: 2674 - return 1; // L: 2675 + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETCLANNAME) { + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = class1.field0.name; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKKICK) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class1.field0.field1643; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKTALK) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class1.field0.field1636; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERCOUNT) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class1.field0.method2990(); + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERDISPLAYNAME) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ((ClanChannelMember)class1.field0.members.get(var3)).username.getName(); + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERRANK) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = ((ClanChannelMember)class1.field0.members.get(var3)).rank; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERWORLD) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = ((ClanChannelMember)class1.field0.members.get(var3)).world; + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_KICKUSER) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + class135.method2831(Interpreter.field812, var3); + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERSLOT) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class1.field0.method2991(Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]); + return 1; + } else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETSORTEDUSERSLOT) { + Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1] = class1.field0.getSortedMembers()[Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1]]; + return 1; + } else if (var0 == ScriptOpcodes.CLANPROFILE_FIND) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = BuddyRankComparator.field1342 != null ? 1 : 0; + return 1; } else { - return 2; // L: 2677 + return 2; } } } diff --git a/runescape-client/src/main/java/class333.java b/runescape-client/src/main/java/class333.java index c09ce209ee..c1c3aa80c9 100644 --- a/runescape-client/src/main/java/class333.java +++ b/runescape-client/src/main/java/class333.java @@ -6,66 +6,66 @@ public class class333 { @ObfuscatedName("c") @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 + if (var2 == var0) { + if (var3 == var1) { 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 + if (var3 > var1 && var3 < var4 + var1) { + --var4; + var1 += var4; + var3 += var4; + var4 = var1 - var4; - 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--]) { + var2[var3--] = var0[var1--]; + var2[var3--] = var0[var1--]; + var2[var3--] = var0[var1--]; + var2[var3--] = var0[var1--]; + var2[var3--] = var0[var1--]; + var2[var3--] = var0[var1--]; + var2[var3--] = var0[var1--]; } - for (var4 -= 7; var1 >= var4; var2[var3--] = var0[var1--]) { // L: 30 31 + for (var4 -= 7; var1 >= var4; var2[var3--] = var0[var1--]) { } - return; // L: 32 + return; } } - var4 += var1; // L: 35 + var4 += var1; - 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++]) { + var2[var3++] = var0[var1++]; + var2[var3++] = var0[var1++]; + var2[var3++] = var0[var1++]; + var2[var3++] = var0[var1++]; + var2[var3++] = var0[var1++]; + var2[var3++] = var0[var1++]; + var2[var3++] = var0[var1++]; } - for (var4 += 7; var1 < var4; var2[var3++] = var0[var1++]) { // L: 47 48 + for (var4 += 7; var1 < var4; var2[var3++] = var0[var1++]) { } - } // L: 49 + } @ObfuscatedName("r") @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 = var2 + var1 - 7; var1 < var2; var0[var1++] = 0) { + var0[var1++] = 0; + var0[var1++] = 0; + var0[var1++] = 0; + var0[var1++] = 0; + var0[var1++] = 0; + var0[var1++] = 0; + var0[var1++] = 0; } - for (var2 += 7; var1 < var2; var0[var1++] = 0) { // L: 375 376 + for (var2 += 7; var1 < var2; var0[var1++] = 0) { } - } // L: 377 + } } diff --git a/runescape-client/src/main/java/class334.java b/runescape-client/src/main/java/class334.java index bfd1afa1c2..278023b71e 100644 --- a/runescape-client/src/main/java/class334.java +++ b/runescape-client/src/main/java/class334.java @@ -39,14 +39,14 @@ public class class334 { int field4017; public String toString() { - boolean var1 = true; // L: 15 - int var2 = 10 - Integer.toString(this.field4015).length(); // L: 16 - int var3 = 10 - Integer.toString(this.field4016).length(); // L: 17 - int var4 = 10 - Integer.toString(this.field4014).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.field4015 + var5 + "Created: " + this.field4014 + var7 + "Total used: " + this.field4016 + var6 + "Max-In-Use: " + this.field4017; // L: 22 + boolean var1 = true; + int var2 = 10 - Integer.toString(this.field4015).length(); + int var3 = 10 - Integer.toString(this.field4016).length(); + int var4 = 10 - Integer.toString(this.field4014).length(); + String var5 = " ".substring(10 - var2); + String var6 = " ".substring(10 - var3); + String var7 = " ".substring(10 - var4); + return " Size: " + this.field4015 + var5 + "Created: " + this.field4014 + var7 + "Total used: " + this.field4016 + var6 + "Max-In-Use: " + this.field4017; } @ObfuscatedName("lp") @@ -55,7 +55,7 @@ public class class334 { garbageValue = "0" ) static final void method6216() { - Client.field672 = Client.cycleCntr; // L: 12476 - SoundSystem.ClanChat_inClanChat = true; // L: 12477 - } // L: 12478 + Client.field672 = Client.cycleCntr; + SoundSystem.ClanChat_inClanChat = true; + } } diff --git a/runescape-client/src/main/java/class336.java b/runescape-client/src/main/java/class336.java index 0103ae501b..4615fc4f6c 100644 --- a/runescape-client/src/main/java/class336.java +++ b/runescape-client/src/main/java/class336.java @@ -18,20 +18,20 @@ public class class336 { garbageValue = "80446087" ) static final void method6228(int var0, int var1, int var2, int var3) { - Client.field590 = 0; // L: 6035 - int var4 = (class340.localPlayer.x >> 7) + class131.baseX; // L: 6036 - int var5 = (class340.localPlayer.y >> 7) + TileItem.baseY; // L: 6037 - if (var4 >= 3053 && var4 <= 3156 && var5 >= 3056 && var5 <= 3136) { // L: 6038 + Client.field590 = 0; + int var4 = (class340.localPlayer.x >> 7) + class131.baseX; + int var5 = (class340.localPlayer.y >> 7) + TileItem.baseY; + if (var4 >= 3053 && var4 <= 3156 && var5 >= 3056 && var5 <= 3136) { Client.field590 = 1; } - if (var4 >= 3072 && var4 <= 3118 && var5 >= 9492 && var5 <= 9535) { // L: 6039 + if (var4 >= 3072 && var4 <= 3118 && var5 >= 9492 && var5 <= 9535) { Client.field590 = 1; } - if (Client.field590 == 1 && var4 >= 3139 && var4 <= 3199 && var5 >= 3008 && var5 <= 3062) { // L: 6040 + if (Client.field590 == 1 && var4 >= 3139 && var4 <= 3199 && var5 >= 3008 && var5 <= 3062) { Client.field590 = 0; } - } // L: 6042 + } } diff --git a/runescape-client/src/main/java/class338.java b/runescape-client/src/main/java/class338.java index 411c781799..29e63e8319 100644 --- a/runescape-client/src/main/java/class338.java +++ b/runescape-client/src/main/java/class338.java @@ -17,63 +17,63 @@ public class class338 { @ObfuscatedName("c") public static final int method6256(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 var6 = var4; + double var8 = var4; + double var10 = var4; + if (var2 != 0.0D) { double var12; - if (var4 < 0.5D) { // L: 14 + if (var4 < 0.5D) { var12 = (1.0D + var2) * var4; } else { - var12 = var4 + var2 - var2 * var4; // L: 15 + var12 = var4 + var2 - var2 * var4; } - double var14 = 2.0D * var4 - var12; // L: 16 - double var16 = var0 + 0.3333333333333333D; // L: 17 - if (var16 > 1.0D) { // L: 18 + double var14 = 2.0D * var4 - var12; + double var16 = var0 + 0.3333333333333333D; + if (var16 > 1.0D) { --var16; } - double var20 = var0 - 0.3333333333333333D; // L: 20 - if (var20 < 0.0D) { // L: 21 + double var20 = var0 - 0.3333333333333333D; + if (var20 < 0.0D) { ++var20; } - if (var16 * 6.0D < 1.0D) { // L: 22 + if (var16 * 6.0D < 1.0D) { var6 = (var12 - var14) * 6.0D * var16 + var14; - } else if (var16 * 2.0D < 1.0D) { // L: 23 + } else if (var16 * 2.0D < 1.0D) { var6 = var12; - } else if (3.0D * var16 < 2.0D) { // L: 24 + } else if (3.0D * var16 < 2.0D) { var6 = 6.0D * (var12 - var14) * (0.6666666666666666D - var16) + var14; } else { - var6 = var14; // L: 25 + var6 = var14; } - if (6.0D * var0 < 1.0D) { // L: 26 + if (6.0D * var0 < 1.0D) { var8 = (var12 - var14) * 6.0D * var0 + var14; - } else if (var0 * 2.0D < 1.0D) { // L: 27 + } else if (var0 * 2.0D < 1.0D) { var8 = var12; } else if (var0 * 3.0D < 2.0D) { - var8 = 6.0D * (0.6666666666666666D - var0) * (var12 - var14) + var14; // L: 28 + var8 = 6.0D * (0.6666666666666666D - var0) * (var12 - var14) + var14; } else { - var8 = var14; // L: 29 + var8 = var14; } - if (var20 * 6.0D < 1.0D) { // L: 30 + if (var20 * 6.0D < 1.0D) { var10 = var14 + var20 * 6.0D * (var12 - var14); - } else if (var20 * 2.0D < 1.0D) { // L: 31 + } else if (var20 * 2.0D < 1.0D) { var10 = var12; - } else if (var20 * 3.0D < 2.0D) { // L: 32 + } else if (var20 * 3.0D < 2.0D) { var10 = var14 + (0.6666666666666666D - var20) * (var12 - var14) * 6.0D; } else { - var10 = var14; // L: 33 + var10 = var14; } } - int var22 = (int)(var6 * 256.0D); // L: 35 - int var13 = (int)(var8 * 256.0D); // L: 36 - int var23 = (int)(var10 * 256.0D); // L: 37 - int var15 = var23 + (var13 << 8) + (var22 << 16); // L: 38 - return var15; // L: 39 + int var22 = (int)(var6 * 256.0D); + int var13 = (int)(var8 * 256.0D); + int var23 = (int)(var10 * 256.0D); + int var15 = var23 + (var13 << 8) + (var22 << 16); + return var15; } } diff --git a/runescape-client/src/main/java/class341.java b/runescape-client/src/main/java/class341.java index f192e650e8..706f64a624 100644 --- a/runescape-client/src/main/java/class341.java +++ b/runescape-client/src/main/java/class341.java @@ -12,205 +12,205 @@ public class class341 { static int method6258(int var0, Script var1, boolean var2) { int var3; int var4; - if (var0 == ScriptOpcodes.ADD) { // L: 2828 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 2829 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2830 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2831 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4 + var3; // L: 2832 - return 1; // L: 2833 - } else if (var0 == ScriptOpcodes.SUB) { // L: 2835 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 2836 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2837 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2838 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 - var4; // L: 2839 - return 1; // L: 2840 - } else if (var0 == ScriptOpcodes.MULTIPLY) { // L: 2842 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 2843 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2844 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2845 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 * var4; // L: 2846 - return 1; // L: 2847 - } else if (var0 == ScriptOpcodes.DIV) { // L: 2849 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 2850 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2851 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2852 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 / var4; // L: 2853 - return 1; // L: 2854 - } else if (var0 == ScriptOpcodes.RANDOM) { // L: 2856 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2857 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); // L: 2858 - return 1; // L: 2859 - } else if (var0 == ScriptOpcodes.RANDOMINC) { // L: 2861 - var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2862 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); // L: 2863 - return 1; // L: 2864 + if (var0 == ScriptOpcodes.ADD) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4 + var3; + return 1; + } else if (var0 == ScriptOpcodes.SUB) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 - var4; + return 1; + } else if (var0 == ScriptOpcodes.MULTIPLY) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 * var4; + return 1; + } else if (var0 == ScriptOpcodes.DIV) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 / var4; + return 1; + } else if (var0 == ScriptOpcodes.RANDOM) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); + return 1; + } else if (var0 == ScriptOpcodes.RANDOMINC) { + var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); + return 1; } else { int var5; int var6; int var7; - if (var0 == ScriptOpcodes.INTERPOLATE) { // L: 2866 - IsaacCipher.Interpreter_intStackSize -= 5; // L: 2867 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2868 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2869 - var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 2870 - var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3]; // L: 2871 - var7 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 4]; // L: 2872 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 + (var4 - var3) * (var7 - var5) / (var6 - var5); // L: 2873 - return 1; // L: 2874 - } else if (var0 == ScriptOpcodes.ADDPERCENT) { // L: 2876 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 2877 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2878 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2879 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 + var3 * var4 / 100; // L: 2880 - return 1; // L: 2881 - } else if (var0 == ScriptOpcodes.SETBIT) { // L: 2883 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 2884 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2885 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2886 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 | 1 << var4; // L: 2887 - return 1; // L: 2888 - } else if (var0 == ScriptOpcodes.CLEARBIT) { // L: 2890 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 2891 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2892 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2893 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); // L: 2894 - return 1; // L: 2895 - } else if (var0 == ScriptOpcodes.TESTBIT) { // L: 2897 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 2898 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2899 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2900 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; // L: 2901 - return 1; // L: 2902 - } else if (var0 == ScriptOpcodes.MOD) { // L: 2904 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 2905 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2906 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2907 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 % var4; // L: 2908 - return 1; // L: 2909 - } else if (var0 == ScriptOpcodes.POW) { // L: 2911 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 2912 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2913 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2914 - if (var3 == 0) { // L: 2915 + if (var0 == ScriptOpcodes.INTERPOLATE) { + IsaacCipher.Interpreter_intStackSize -= 5; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; + var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3]; + var7 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 4]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 + (var4 - var3) * (var7 - var5) / (var6 - var5); + return 1; + } else if (var0 == ScriptOpcodes.ADDPERCENT) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 + var3 * var4 / 100; + return 1; + } else if (var0 == ScriptOpcodes.SETBIT) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 | 1 << var4; + return 1; + } else if (var0 == ScriptOpcodes.CLEARBIT) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); + return 1; + } else if (var0 == ScriptOpcodes.TESTBIT) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.MOD) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 % var4; + return 1; + } else if (var0 == ScriptOpcodes.POW) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + if (var3 == 0) { Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); // L: 2916 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); } - return 1; // L: 2917 - } else if (var0 == ScriptOpcodes.INVPOW) { // L: 2919 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 2920 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2921 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2922 - if (var3 == 0) { // L: 2923 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 2924 - return 1; // L: 2925 + return 1; + } else if (var0 == ScriptOpcodes.INVPOW) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + if (var3 == 0) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; + return 1; } else { - switch(var4) { // L: 2927 + switch(var4) { case 0: - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; // L: 2935 - break; // L: 2936 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; + break; case 1: - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3; // L: 2950 - break; // L: 2951 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3; + break; case 2: - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); // L: 2945 - break; // L: 2946 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); + break; case 3: - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); // L: 2930 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); break; case 4: - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); // L: 2955 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); break; default: - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); // L: 2940 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); } - return 1; // L: 2959 + return 1; } - } else if (var0 == ScriptOpcodes.AND) { // L: 2961 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 2962 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2963 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2964 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 & var4; // L: 2965 - return 1; // L: 2966 - } else if (var0 == ScriptOpcodes.OR) { // L: 2968 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 2969 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2970 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2971 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 | var4; // L: 2972 - return 1; // L: 2973 - } else if (var0 == ScriptOpcodes.SCALE) { // L: 2975 - IsaacCipher.Interpreter_intStackSize -= 3; // L: 2976 - long var9 = (long)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2977 - long var11 = (long)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2978 - long var13 = (long)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 2979 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (int)(var13 * var9 / var11); // L: 2980 - return 1; // L: 2981 - } else if (var0 == ScriptOpcodes.BITCOUNT) { // L: 2983 - var3 = Language.method5825(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 2984 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3; // L: 2985 - return 1; // L: 2986 - } else if (var0 == ScriptOpcodes.TOGGLEBIT) { // L: 2988 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 2989 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2990 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2991 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 ^ 1 << var4; // L: 2992 - return 1; // L: 2993 - } else if (var0 == ScriptOpcodes.SETBIT_RANGE) { // L: 2995 - IsaacCipher.Interpreter_intStackSize -= 3; // L: 2996 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2997 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2998 - var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 2999 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = FloorOverlayDefinition.method3636(var3, var4, var5); // L: 3000 - return 1; // L: 3001 - } else if (var0 == ScriptOpcodes.CLEARBIT_RANGE) { // L: 3003 - IsaacCipher.Interpreter_intStackSize -= 3; // L: 3004 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3005 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3006 - var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 3007 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class123.method2737(var3, var4, var5); // L: 3008 - return 1; // L: 3009 - } else if (var0 == ScriptOpcodes.GETBIT_RANGE) { // L: 3011 - IsaacCipher.Interpreter_intStackSize -= 3; // L: 3012 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3013 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3014 - var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 3015 - var6 = 31 - var5; // L: 3016 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 << var6 >>> var4 + var6; // L: 3017 - return 1; // L: 3018 - } else if (var0 == 4030) { // L: 3020 - IsaacCipher.Interpreter_intStackSize -= 4; // L: 3021 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3022 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3023 - var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 3024 - var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3]; // L: 3025 - var3 = class123.method2737(var3, var5, var6); // L: 3026 - var7 = WorldMapEvent.method4942(var6 - var5 + 1); // L: 3027 - if (var4 > var7) { // L: 3028 + } else if (var0 == ScriptOpcodes.AND) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 & var4; + return 1; + } else if (var0 == ScriptOpcodes.OR) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 | var4; + return 1; + } else if (var0 == ScriptOpcodes.SCALE) { + IsaacCipher.Interpreter_intStackSize -= 3; + long var9 = (long)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + long var11 = (long)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + long var13 = (long)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (int)(var13 * var9 / var11); + return 1; + } else if (var0 == ScriptOpcodes.BITCOUNT) { + var3 = Language.method5825(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3; + return 1; + } else if (var0 == ScriptOpcodes.TOGGLEBIT) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 ^ 1 << var4; + return 1; + } else if (var0 == ScriptOpcodes.SETBIT_RANGE) { + IsaacCipher.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = FloorOverlayDefinition.method3636(var3, var4, var5); + return 1; + } else if (var0 == ScriptOpcodes.CLEARBIT_RANGE) { + IsaacCipher.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class123.method2737(var3, var4, var5); + return 1; + } else if (var0 == ScriptOpcodes.GETBIT_RANGE) { + IsaacCipher.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; + var6 = 31 - var5; + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 << var6 >>> var4 + var6; + return 1; + } else if (var0 == 4030) { + IsaacCipher.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; + var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3]; + var3 = class123.method2737(var3, var5, var6); + var7 = WorldMapEvent.method4942(var6 - var5 + 1); + if (var4 > var7) { var4 = var7; } - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 | var4 << var5; // L: 3029 - return 1; // L: 3030 - } else if (var0 == 4032) { // L: 3032 - Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1] = SoundCache.method833(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1]); // L: 3033 - return 1; // L: 3034 - } else if (var0 == 4033) { // L: 3036 - Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1] = GrandExchangeOfferNameComparator.method5727(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1]); // L: 3037 - return 1; // L: 3038 - } else if (var0 == 4034) { // L: 3040 - IsaacCipher.Interpreter_intStackSize -= 2; // L: 3041 - var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3042 - var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3043 - var5 = class123.method2744(var3, var4); // L: 3044 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5; // L: 3045 - return 1; // L: 3046 - } else if (var0 == 4035) { // L: 3048 - Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1] = Math.abs(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1]); // L: 3049 - return 1; // L: 3050 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 | var4 << var5; + return 1; + } else if (var0 == 4032) { + Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1] = SoundCache.method833(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1]); + return 1; + } else if (var0 == 4033) { + Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1] = GrandExchangeOfferNameComparator.method5727(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1]); + return 1; + } else if (var0 == 4034) { + IsaacCipher.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; + var5 = class123.method2744(var3, var4); + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5; + return 1; + } else if (var0 == 4035) { + Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1] = Math.abs(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1]); + return 1; } else { - return 2; // L: 3052 + return 2; } } } @@ -221,15 +221,15 @@ public class class341 { garbageValue = "1492532048" ) static final void method6257() { - int var0 = Players.Players_count; // L: 4603 - int[] var1 = Players.Players_indices; // L: 4604 + int var0 = Players.Players_count; + int[] var1 = Players.Players_indices; - for (int var2 = 0; var2 < var0; ++var2) { // L: 4605 - Player var3 = Client.players[var1[var2]]; // L: 4606 - if (var3 != null) { // L: 4607 - ItemLayer.updateActorSequence(var3, 1); // L: 4608 + for (int var2 = 0; var2 < var0; ++var2) { + Player var3 = Client.players[var1[var2]]; + if (var3 != null) { + ItemLayer.updateActorSequence(var3, 1); } } - } // L: 4611 + } } diff --git a/runescape-client/src/main/java/class363.java b/runescape-client/src/main/java/class363.java index 0429d2aeee..5eed2df3d0 100644 --- a/runescape-client/src/main/java/class363.java +++ b/runescape-client/src/main/java/class363.java @@ -10,139 +10,139 @@ public class class363 { garbageValue = "499018335" ) static final void method6612(Actor var0) { - var0.isWalking = false; // L: 4826 + var0.isWalking = false; SequenceDefinition var1; int var2; - if (var0.movementSequence != -1) { // L: 4827 - var1 = UserComparator5.SequenceDefinition_get(var0.movementSequence); // L: 4828 - if (var1 != null) { // L: 4829 - if (!var1.method3690() && var1.frameIds != null) { // L: 4830 - ++var0.movementFrameCycle; // L: 4831 - if (var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) { // L: 4832 - var0.movementFrameCycle = 1; // L: 4833 - ++var0.movementFrame; // L: 4834 - class409.method7269(var1, var0.movementFrame, var0.x, var0.y); // L: 4835 + if (var0.movementSequence != -1) { + var1 = UserComparator5.SequenceDefinition_get(var0.movementSequence); + if (var1 != null) { + if (!var1.method3690() && var1.frameIds != null) { + ++var0.field1121; + if (var0.movementFrame < var1.frameIds.length && var0.field1121 > var1.frameLengths[var0.movementFrame]) { + var0.field1121 = 1; + ++var0.movementFrame; + class409.method7269(var1, var0.movementFrame, var0.x, var0.y); } - if (var0.movementFrame >= var1.frameIds.length) { // L: 4837 - var0.movementFrameCycle = 0; // L: 4838 - var0.movementFrame = 0; // L: 4839 - class409.method7269(var1, var0.movementFrame, var0.x, var0.y); // L: 4840 + if (var0.movementFrame >= var1.frameIds.length) { + var0.field1121 = 0; + var0.movementFrame = 0; + class409.method7269(var1, var0.movementFrame, var0.x, var0.y); } - } else if (var1.method3690()) { // L: 4843 - ++var0.movementFrame; // L: 4844 - var2 = var1.method3647(); // L: 4845 - if (var0.movementFrame < var2) { // L: 4846 - Varcs.method2427(var1, var0.movementFrame, var0.x, var0.y); // L: 4847 + } else if (var1.method3690()) { + ++var0.movementFrame; + var2 = var1.method3647(); + if (var0.movementFrame < var2) { + Varcs.method2427(var1, var0.movementFrame, var0.x, var0.y); } else { - var0.movementFrameCycle = 0; // L: 4850 - var0.movementFrame = 0; // L: 4851 - Varcs.method2427(var1, var0.movementFrame, var0.x, var0.y); // L: 4852 + var0.field1121 = 0; + var0.movementFrame = 0; + Varcs.method2427(var1, var0.movementFrame, var0.x, var0.y); } } else { - var0.movementSequence = -1; // L: 4855 + var0.movementSequence = -1; } } else { - var0.movementSequence = -1; // L: 4857 + var0.movementSequence = -1; } } - if (var0.spotAnimation != -1 && Client.cycle >= var0.field1130) { // L: 4859 - if (var0.spotAnimationFrame < 0) { // L: 4860 + if (var0.spotAnimation != -1 && Client.cycle >= var0.field1130) { + if (var0.spotAnimationFrame < 0) { var0.spotAnimationFrame = 0; } - int var4 = AccessFile.SpotAnimationDefinition_get(var0.spotAnimation).sequence; // L: 4861 - if (var4 != -1) { // L: 4862 - SequenceDefinition var5 = UserComparator5.SequenceDefinition_get(var4); // L: 4863 - if (var5 != null && var5.frameIds != null) { // L: 4864 - ++var0.spotAnimationFrameCycle; // L: 4865 - if (var0.spotAnimationFrame < var5.frameIds.length && var0.spotAnimationFrameCycle > var5.frameLengths[var0.spotAnimationFrame]) { // L: 4866 - var0.spotAnimationFrameCycle = 1; // L: 4867 - ++var0.spotAnimationFrame; // L: 4868 - class409.method7269(var5, var0.spotAnimationFrame, var0.x, var0.y); // L: 4869 + int var4 = AccessFile.SpotAnimationDefinition_get(var0.spotAnimation).sequence; + if (var4 != -1) { + SequenceDefinition var5 = UserComparator5.SequenceDefinition_get(var4); + if (var5 != null && var5.frameIds != null) { + ++var0.spotAnimationFrameCycle; + if (var0.spotAnimationFrame < var5.frameIds.length && var0.spotAnimationFrameCycle > var5.frameLengths[var0.spotAnimationFrame]) { + var0.spotAnimationFrameCycle = 1; + ++var0.spotAnimationFrame; + class409.method7269(var5, var0.spotAnimationFrame, var0.x, var0.y); } - if (var0.spotAnimationFrame >= var5.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var5.frameIds.length)) { // L: 4871 4872 + if (var0.spotAnimationFrame >= var5.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var5.frameIds.length)) { var0.spotAnimation = -1; } - } else if (var5.method3690()) { // L: 4875 - ++var0.spotAnimationFrame; // L: 4876 - int var3 = var5.method3647(); // L: 4877 - if (var0.spotAnimationFrame < var3) { // L: 4878 - Varcs.method2427(var5, var0.spotAnimationFrame, var0.x, var0.y); // L: 4879 - } else if (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var3) { // L: 4882 + } else if (var5.method3690()) { + ++var0.spotAnimationFrame; + int var3 = var5.method3647(); + if (var0.spotAnimationFrame < var3) { + Varcs.method2427(var5, var0.spotAnimationFrame, var0.x, var0.y); + } else if (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var3) { var0.spotAnimation = -1; } } else { - var0.spotAnimation = -1; // L: 4885 + var0.spotAnimation = -1; } } else { - var0.spotAnimation = -1; // L: 4887 + var0.spotAnimation = -1; } } - if (var0.sequence != -1 && var0.sequenceDelay <= 1) { // L: 4889 - var1 = UserComparator5.SequenceDefinition_get(var0.sequence); // L: 4890 - if (var1.field2096 == 1 && var0.field1098 > 0 && var0.field1136 <= Client.cycle && var0.field1157 < Client.cycle) { // L: 4891 4892 - var0.sequenceDelay = 1; // L: 4893 - return; // L: 4894 + if (var0.sequence != -1 && var0.sequenceDelay <= 1) { + var1 = UserComparator5.SequenceDefinition_get(var0.sequence); + if (var1.field2096 == 1 && var0.field1098 > 0 && var0.field1136 <= Client.cycle && var0.field1157 < Client.cycle) { + var0.sequenceDelay = 1; + return; } } - if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 4898 - var1 = UserComparator5.SequenceDefinition_get(var0.sequence); // L: 4899 - if (var1 != null) { // L: 4900 - if (!var1.method3690() && var1.frameIds != null) { // L: 4901 - ++var0.sequenceFrameCycle; // L: 4902 - if (var0.sequenceFrame < var1.frameIds.length && var0.sequenceFrameCycle > var1.frameLengths[var0.sequenceFrame]) { // L: 4903 - var0.sequenceFrameCycle = 1; // L: 4904 - ++var0.sequenceFrame; // L: 4905 - class409.method7269(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4906 + if (var0.sequence != -1 && var0.sequenceDelay == 0) { + var1 = UserComparator5.SequenceDefinition_get(var0.sequence); + if (var1 != null) { + if (!var1.method3690() && var1.frameIds != null) { + ++var0.sequenceFrameCycle; + if (var0.sequenceFrame < var1.frameIds.length && var0.sequenceFrameCycle > var1.frameLengths[var0.sequenceFrame]) { + var0.sequenceFrameCycle = 1; + ++var0.sequenceFrame; + class409.method7269(var1, var0.sequenceFrame, var0.x, var0.y); } - if (var0.sequenceFrame >= var1.frameIds.length) { // L: 4908 - var0.sequenceFrame -= var1.frameCount; // L: 4909 - ++var0.field1126; // L: 4910 - if (var0.field1126 >= var1.field2095) { // L: 4911 + if (var0.sequenceFrame >= var1.frameIds.length) { + var0.sequenceFrame -= var1.frameCount; + ++var0.field1126; + if (var0.field1126 >= var1.field2095) { var0.sequence = -1; - } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) { // L: 4912 - class409.method7269(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4913 + } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) { + class409.method7269(var1, var0.sequenceFrame, var0.x, var0.y); } else { var0.sequence = -1; } } - var0.isWalking = var1.field2091; // L: 4915 - } else if (var1.method3690()) { // L: 4917 - ++var0.sequenceFrame; // L: 4918 - var2 = var1.method3648().method2691(); // L: 4919 - if (var0.sequenceFrame < var2) { // L: 4920 - Varcs.method2427(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4921 + var0.isWalking = var1.field2091; + } else if (var1.method3690()) { + ++var0.sequenceFrame; + var2 = var1.method3648().method2691(); + if (var0.sequenceFrame < var2) { + Varcs.method2427(var1, var0.sequenceFrame, var0.x, var0.y); } else { - var0.sequenceFrame -= var1.frameCount; // L: 4924 - ++var0.field1126; // L: 4925 - if (var0.field1126 >= var1.field2095) { // L: 4926 + var0.sequenceFrame -= var1.frameCount; + ++var0.field1126; + if (var0.field1126 >= var1.field2095) { var0.sequence = -1; - } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var2) { // L: 4927 - Varcs.method2427(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4928 + } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var2) { + Varcs.method2427(var1, var0.sequenceFrame, var0.x, var0.y); } else { var0.sequence = -1; } } } else { - var0.sequence = -1; // L: 4931 + var0.sequence = -1; } } else { - var0.sequence = -1; // L: 4933 + var0.sequence = -1; } } - if (var0.sequenceDelay > 0) { // L: 4935 + if (var0.sequenceDelay > 0) { --var0.sequenceDelay; } - } // L: 4936 + } @ObfuscatedName("lr") @ObfuscatedSignature( @@ -151,7 +151,7 @@ public class class363 { ) @Export("getWidgetFlags") static int getWidgetFlags(Widget var0) { - IntegerNode var1 = (IntegerNode)Client.widgetFlags.get(((long)var0.id << 32) + (long)var0.childIndex); // L: 12561 - return var1 != null ? var1.integer : var0.flags; // L: 12562 12563 + IntegerNode var1 = (IntegerNode)Client.widgetFlags.get(((long)var0.id << 32) + (long)var0.childIndex); + return var1 != null ? var1.integer : var0.flags; } } diff --git a/runescape-client/src/main/java/class364.java b/runescape-client/src/main/java/class364.java index 6aa1fcb561..8d04f19402 100644 --- a/runescape-client/src/main/java/class364.java +++ b/runescape-client/src/main/java/class364.java @@ -11,19 +11,19 @@ public class class364 { float field4182; static { - new class364(0.0F, 0.0F, 0.0F); // L: 5 - new class364(1.0F, 1.0F, 1.0F); // L: 9 - new class364(1.0F, 0.0F, 0.0F); // L: 13 - new class364(0.0F, 1.0F, 0.0F); // L: 17 - new class364(0.0F, 0.0F, 1.0F); // L: 21 - Decimator.method1073(100); // L: 25 - } // L: 26 + new class364(0.0F, 0.0F, 0.0F); + new class364(1.0F, 1.0F, 1.0F); + new class364(1.0F, 0.0F, 0.0F); + new class364(0.0F, 1.0F, 0.0F); + new class364(0.0F, 0.0F, 1.0F); + Decimator.method1073(100); + } class364(float var1, float var2, float var3) { - this.field4181 = var1; // L: 35 - this.field4180 = var2; // L: 36 - this.field4182 = var3; // L: 37 - } // L: 38 + this.field4181 = var1; + this.field4180 = var2; + this.field4182 = var3; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -31,11 +31,11 @@ public class class364 { garbageValue = "-893321960" ) final float method6618() { - return (float)Math.sqrt((double)(this.field4182 * this.field4182 + this.field4181 * this.field4181 + this.field4180 * this.field4180)); // L: 41 + return (float)Math.sqrt((double)(this.field4182 * this.field4182 + this.field4181 * this.field4181 + this.field4180 * this.field4180)); } public String toString() { - return this.field4181 + ", " + this.field4180 + ", " + this.field4182; // L: 46 + return this.field4181 + ", " + this.field4180 + ", " + this.field4182; } @ObfuscatedName("s") @@ -44,6 +44,6 @@ public class class364 { garbageValue = "-247001185" ) public static void method6623() { - FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); // L: 94 - } // L: 95 + FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); + } } diff --git a/runescape-client/src/main/java/class365.java b/runescape-client/src/main/java/class365.java index dbf004dfa5..0534bfb552 100644 --- a/runescape-client/src/main/java/class365.java +++ b/runescape-client/src/main/java/class365.java @@ -29,16 +29,16 @@ public final class class365 { float field4183; static { - field4189 = new class365[0]; // L: 4 - field4184 = 100; // L: 10 - field4189 = new class365[100]; // L: 11 - field4185 = 0; // L: 12 + field4189 = new class365[0]; + field4184 = 100; + field4189 = new class365[100]; + field4185 = 0; new class365(); - } // L: 18 + } class365() { - this.method6627(); // L: 42 - } // L: 43 + this.method6627(); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -46,13 +46,13 @@ public final class class365 { garbageValue = "-330094120" ) public void method6646() { - synchronized(field4189) { // L: 36 - if (field4185 < field4184 - 1) { // L: 37 + synchronized(field4189) { + if (field4185 < field4184 - 1) { field4189[++field4185 - 1] = this; } } - } // L: 39 + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -60,11 +60,11 @@ public final class class365 { garbageValue = "545169306" ) void method6625(float var1, float var2, float var3, float var4) { - this.field4186 = var1; // L: 46 - this.field4188 = var2; // L: 47 - this.field4187 = var3; // L: 48 - this.field4183 = var4; // L: 49 - } // L: 50 + this.field4186 = var1; + this.field4188 = var2; + this.field4187 = var3; + this.field4183 = var4; + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -72,13 +72,13 @@ public final class class365 { garbageValue = "917970306" ) public void method6630(float var1, float var2, float var3, float var4) { - float var5 = (float)Math.sin((double)(var4 * 0.5F)); // L: 53 - float var6 = (float)Math.cos((double)(0.5F * var4)); // L: 54 - this.field4186 = var5 * var1; // L: 55 - this.field4188 = var5 * var2; // L: 56 - this.field4187 = var5 * var3; // L: 57 - this.field4183 = var6; // L: 58 - } // L: 59 + float var5 = (float)Math.sin((double)(var4 * 0.5F)); + float var6 = (float)Math.cos((double)(0.5F * var4)); + this.field4186 = var5 * var1; + this.field4188 = var5 * var2; + this.field4187 = var5 * var3; + this.field4183 = var6; + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -86,11 +86,11 @@ public final class class365 { garbageValue = "-24" ) final void method6627() { - this.field4187 = 0.0F; // L: 62 - this.field4188 = 0.0F; // L: 63 - this.field4186 = 0.0F; // L: 64 - this.field4183 = 1.0F; // L: 65 - } // L: 66 + this.field4187 = 0.0F; + this.field4188 = 0.0F; + this.field4186 = 0.0F; + this.field4183 = 1.0F; + } @ObfuscatedName("s") @ObfuscatedSignature( @@ -98,29 +98,29 @@ public final class class365 { garbageValue = "-13" ) public final void method6628(class365 var1) { - this.method6625(var1.field4183 * this.field4186 + var1.field4186 * this.field4183 + this.field4187 * var1.field4188 - this.field4188 * var1.field4187, var1.field4187 * this.field4186 + var1.field4188 * this.field4183 + (var1.field4183 * this.field4188 - var1.field4186 * this.field4187), this.field4188 * var1.field4186 + this.field4187 * var1.field4183 - this.field4186 * var1.field4188 + this.field4183 * var1.field4187, this.field4183 * var1.field4183 - var1.field4186 * this.field4186 - this.field4188 * var1.field4188 - var1.field4187 * this.field4187); // L: 69 - } // L: 70 + this.method6625(var1.field4183 * this.field4186 + var1.field4186 * this.field4183 + this.field4187 * var1.field4188 - this.field4188 * var1.field4187, var1.field4187 * this.field4186 + var1.field4188 * this.field4183 + (var1.field4183 * this.field4188 - var1.field4186 * this.field4187), this.field4188 * var1.field4186 + this.field4187 * var1.field4183 - this.field4186 * var1.field4188 + this.field4183 * var1.field4187, this.field4183 * var1.field4183 - var1.field4186 * this.field4186 - this.field4188 * var1.field4188 - var1.field4187 * this.field4187); + } public boolean equals(Object var1) { - if (!(var1 instanceof class365)) { // L: 74 - return false; // L: 78 + if (!(var1 instanceof class365)) { + return false; } else { - class365 var2 = (class365)var1; // L: 75 - return this.field4186 == var2.field4186 && var2.field4188 == this.field4188 && var2.field4187 == this.field4187 && var2.field4183 == this.field4183; // L: 76 + class365 var2 = (class365)var1; + return this.field4186 == var2.field4186 && var2.field4188 == this.field4188 && var2.field4187 == this.field4187 && var2.field4183 == this.field4183; } } public String toString() { - return this.field4186 + "," + this.field4188 + "," + this.field4187 + "," + this.field4183; // L: 94 + return this.field4186 + "," + this.field4188 + "," + this.field4187 + "," + this.field4183; } public int hashCode() { - boolean var1 = true; // L: 83 - float var2 = 1.0F; // L: 84 - var2 = 31.0F * var2 + this.field4186; // L: 85 - var2 = var2 * 31.0F + this.field4188; // L: 86 - var2 = 31.0F * var2 + this.field4187; // L: 87 - var2 = var2 * 31.0F + this.field4183; // L: 88 - return (int)var2; // L: 89 + boolean var1 = true; + float var2 = 1.0F; + var2 = 31.0F * var2 + this.field4186; + var2 = var2 * 31.0F + this.field4188; + var2 = 31.0F * var2 + this.field4187; + var2 = var2 * 31.0F + this.field4183; + return (int)var2; } } diff --git a/runescape-client/src/main/java/class366.java b/runescape-client/src/main/java/class366.java index f586c26213..e455ac7877 100644 --- a/runescape-client/src/main/java/class366.java +++ b/runescape-client/src/main/java/class366.java @@ -24,31 +24,31 @@ public final class class366 { public float[] field4196; static { - field4191 = new class366[0]; // L: 9 - Client.method1623(100); // L: 14 - field4194 = new class366(); // L: 18 + field4191 = new class366[0]; + Client.method1623(100); + field4194 = new class366(); } public class366() { this.field4196 = new float[16]; - this.method6652(); // L: 33 - } // L: 34 + this.method6652(); + } @ObfuscatedSignature( descriptor = "(Lno;)V" ) public class366(class366 var1) { this.field4196 = new float[16]; - this.method6654(var1); // L: 37 - } // L: 38 + this.method6654(var1); + } @ObfuscatedSignature( descriptor = "(Lpi;Z)V" ) public class366(Buffer var1, boolean var2) { - this.field4196 = new float[16]; // L: 17 - this.method6649(var1, var2); // L: 41 - } // L: 42 + this.field4196 = new float[16]; + this.method6649(var1, var2); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -56,13 +56,13 @@ public final class class366 { garbageValue = "340941633" ) public void method6656() { - synchronized(field4191) { // L: 27 - if (class149.field1663 < field4192 - 1) { // L: 28 + synchronized(field4191) { + if (class149.field1663 < field4192 - 1) { field4191[++class149.field1663 - 1] = this; } } - } // L: 30 + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -70,20 +70,20 @@ public final class class366 { garbageValue = "-1222867877" ) void method6649(Buffer var1, boolean var2) { - if (var2) { // L: 45 - class367 var4 = new class367(); // L: 46 - var4.method6732(class329.method6135(var1.readShort())); // L: 47 - var4.method6717(class329.method6135(var1.readShort())); // L: 48 - var4.method6718(class329.method6135(var1.readShort())); // L: 49 - var4.method6719((float)var1.readShort(), (float)var1.readShort(), (float)var1.readShort()); // L: 50 - this.method6713(var4); // L: 51 + if (var2) { + class367 var4 = new class367(); + var4.method6732(class329.method6135(var1.readShort())); + var4.method6717(class329.method6135(var1.readShort())); + var4.method6718(class329.method6135(var1.readShort())); + var4.method6719((float)var1.readShort(), (float)var1.readShort(), (float)var1.readShort()); + this.method6713(var4); } else { - for (int var3 = 0; var3 < 16; ++var3) { // L: 54 - this.field4196[var3] = var1.method7369(); // L: 55 + for (int var3 = 0; var3 < 16; ++var3) { + this.field4196[var3] = var1.method7369(); } } - } // L: 58 + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -91,19 +91,19 @@ public final class class366 { garbageValue = "42" ) float[] method6650() { - float[] var1 = new float[3]; // L: 61 - if ((double)this.field4196[2] < 0.999D && (double)this.field4196[2] > -0.999D) { // L: 62 - var1[1] = (float)(-Math.asin((double)this.field4196[2])); // L: 63 - double var2 = Math.cos((double)var1[1]); // L: 64 - var1[0] = (float)Math.atan2((double)this.field4196[6] / var2, (double)this.field4196[10] / var2); // L: 65 - var1[2] = (float)Math.atan2((double)this.field4196[1] / var2, (double)this.field4196[0] / var2); // L: 66 + float[] var1 = new float[3]; + if ((double)this.field4196[2] < 0.999D && (double)this.field4196[2] > -0.999D) { + var1[1] = (float)(-Math.asin((double)this.field4196[2])); + double var2 = Math.cos((double)var1[1]); + var1[0] = (float)Math.atan2((double)this.field4196[6] / var2, (double)this.field4196[10] / var2); + var1[2] = (float)Math.atan2((double)this.field4196[1] / var2, (double)this.field4196[0] / var2); } else { - var1[0] = 0.0F; // L: 69 - var1[1] = (float)Math.atan2((double)this.field4196[2], 0.0D); // L: 70 - var1[2] = (float)Math.atan2((double)(-this.field4196[9]), (double)this.field4196[5]); // L: 71 + var1[0] = 0.0F; + var1[1] = (float)Math.atan2((double)this.field4196[2], 0.0D); + var1[2] = (float)Math.atan2((double)(-this.field4196[9]), (double)this.field4196[5]); } - return var1; // L: 73 + return var1; } @ObfuscatedName("t") @@ -112,30 +112,30 @@ public final class class366 { garbageValue = "-1676317150" ) public float[] method6651() { - float[] var1 = new float[]{(float)(-Math.asin((double)this.field4196[6])), 0.0F, 0.0F}; // L: 77 78 - double var2 = Math.cos((double)var1[0]); // L: 79 + float[] var1 = new float[]{(float)(-Math.asin((double)this.field4196[6])), 0.0F, 0.0F}; + double var2 = Math.cos((double)var1[0]); double var4; double var6; - if (Math.abs(var2) > 0.005D) { // L: 80 - var4 = (double)this.field4196[2]; // L: 81 - var6 = (double)this.field4196[10]; // L: 82 - double var8 = (double)this.field4196[4]; // L: 83 - double var10 = (double)this.field4196[5]; // L: 84 - var1[1] = (float)Math.atan2(var4, var6); // L: 85 - var1[2] = (float)Math.atan2(var8, var10); // L: 86 + if (Math.abs(var2) > 0.005D) { + var4 = (double)this.field4196[2]; + var6 = (double)this.field4196[10]; + double var8 = (double)this.field4196[4]; + double var10 = (double)this.field4196[5]; + var1[1] = (float)Math.atan2(var4, var6); + var1[2] = (float)Math.atan2(var8, var10); } else { - var4 = (double)this.field4196[1]; // L: 89 - var6 = (double)this.field4196[0]; // L: 90 - if (this.field4196[6] < 0.0F) { // L: 91 - var1[1] = (float)Math.atan2(var4, var6); // L: 92 + var4 = (double)this.field4196[1]; + var6 = (double)this.field4196[0]; + if (this.field4196[6] < 0.0F) { + var1[1] = (float)Math.atan2(var4, var6); } else { - var1[1] = (float)(-Math.atan2(var4, var6)); // L: 95 + var1[1] = (float)(-Math.atan2(var4, var6)); } - var1[2] = 0.0F; // L: 97 + var1[2] = 0.0F; } - return var1; // L: 99 + return var1; } @ObfuscatedName("s") @@ -144,23 +144,23 @@ public final class class366 { garbageValue = "525334950" ) public void method6652() { - this.field4196[0] = 1.0F; // L: 103 - this.field4196[1] = 0.0F; // L: 104 - this.field4196[2] = 0.0F; // L: 105 - this.field4196[3] = 0.0F; // L: 106 - this.field4196[4] = 0.0F; // L: 107 - this.field4196[5] = 1.0F; // L: 108 - this.field4196[6] = 0.0F; // L: 109 - this.field4196[7] = 0.0F; // L: 110 - this.field4196[8] = 0.0F; // L: 111 - this.field4196[9] = 0.0F; // L: 112 - this.field4196[10] = 1.0F; // L: 113 - this.field4196[11] = 0.0F; // L: 114 - this.field4196[12] = 0.0F; // L: 115 - this.field4196[13] = 0.0F; // L: 116 - this.field4196[14] = 0.0F; // L: 117 - this.field4196[15] = 1.0F; // L: 118 - } // L: 119 + this.field4196[0] = 1.0F; + this.field4196[1] = 0.0F; + this.field4196[2] = 0.0F; + this.field4196[3] = 0.0F; + this.field4196[4] = 0.0F; + this.field4196[5] = 1.0F; + this.field4196[6] = 0.0F; + this.field4196[7] = 0.0F; + this.field4196[8] = 0.0F; + this.field4196[9] = 0.0F; + this.field4196[10] = 1.0F; + this.field4196[11] = 0.0F; + this.field4196[12] = 0.0F; + this.field4196[13] = 0.0F; + this.field4196[14] = 0.0F; + this.field4196[15] = 1.0F; + } @ObfuscatedName("j") @ObfuscatedSignature( @@ -168,23 +168,23 @@ public final class class366 { garbageValue = "-1795899803" ) public void method6708() { - this.field4196[0] = 0.0F; // L: 122 - this.field4196[1] = 0.0F; // L: 123 - this.field4196[2] = 0.0F; // L: 124 - this.field4196[3] = 0.0F; // L: 125 - this.field4196[4] = 0.0F; // L: 126 - this.field4196[5] = 0.0F; // L: 127 - this.field4196[6] = 0.0F; // L: 128 - this.field4196[7] = 0.0F; // L: 129 - this.field4196[8] = 0.0F; // L: 130 - this.field4196[9] = 0.0F; // L: 131 - this.field4196[10] = 0.0F; // L: 132 - this.field4196[11] = 0.0F; // L: 133 - this.field4196[12] = 0.0F; // L: 134 - this.field4196[13] = 0.0F; // L: 135 - this.field4196[14] = 0.0F; // L: 136 - this.field4196[15] = 0.0F; // L: 137 - } // L: 138 + this.field4196[0] = 0.0F; + this.field4196[1] = 0.0F; + this.field4196[2] = 0.0F; + this.field4196[3] = 0.0F; + this.field4196[4] = 0.0F; + this.field4196[5] = 0.0F; + this.field4196[6] = 0.0F; + this.field4196[7] = 0.0F; + this.field4196[8] = 0.0F; + this.field4196[9] = 0.0F; + this.field4196[10] = 0.0F; + this.field4196[11] = 0.0F; + this.field4196[12] = 0.0F; + this.field4196[13] = 0.0F; + this.field4196[14] = 0.0F; + this.field4196[15] = 0.0F; + } @ObfuscatedName("w") @ObfuscatedSignature( @@ -192,8 +192,8 @@ public final class class366 { garbageValue = "-1679840989" ) public void method6654(class366 var1) { - System.arraycopy(var1.field4196, 0, this.field4196, 0, 16); // L: 141 - } // L: 142 + System.arraycopy(var1.field4196, 0, this.field4196, 0, 16); + } @ObfuscatedName("n") @ObfuscatedSignature( @@ -201,8 +201,8 @@ public final class class366 { garbageValue = "-31" ) public void method6655(float var1) { - this.method6667(var1, var1, var1); // L: 145 - } // L: 146 + this.method6667(var1, var1, var1); + } @ObfuscatedName("r") @ObfuscatedSignature( @@ -210,11 +210,11 @@ public final class class366 { garbageValue = "1410403960" ) public void method6667(float var1, float var2, float var3) { - this.method6652(); // L: 149 - this.field4196[0] = var1; // L: 150 - this.field4196[5] = var2; // L: 151 - this.field4196[10] = var3; // L: 152 - } // L: 153 + this.method6652(); + this.field4196[0] = var1; + this.field4196[5] = var2; + this.field4196[10] = var3; + } @ObfuscatedName("o") @ObfuscatedSignature( @@ -222,12 +222,12 @@ public final class class366 { garbageValue = "-15383" ) public void method6657(class366 var1) { - for (int var2 = 0; var2 < this.field4196.length; ++var2) { // L: 156 - float[] var10000 = this.field4196; // L: 157 + for (int var2 = 0; var2 < this.field4196.length; ++var2) { + float[] var10000 = this.field4196; var10000[var2] += var1.field4196[var2]; } - } // L: 159 + } @ObfuscatedName("v") @ObfuscatedSignature( @@ -235,39 +235,39 @@ public final class class366 { garbageValue = "1087473268" ) public void method6670(class366 var1) { - float var2 = this.field4196[1] * var1.field4196[4] + var1.field4196[0] * this.field4196[0] + this.field4196[2] * var1.field4196[8] + var1.field4196[12] * this.field4196[3]; // L: 162 - float var3 = var1.field4196[5] * this.field4196[1] + var1.field4196[1] * this.field4196[0] + this.field4196[2] * var1.field4196[9] + var1.field4196[13] * this.field4196[3]; // L: 163 - float var4 = var1.field4196[6] * this.field4196[1] + this.field4196[0] * var1.field4196[2] + var1.field4196[10] * this.field4196[2] + var1.field4196[14] * this.field4196[3]; // L: 164 - float var5 = var1.field4196[15] * this.field4196[3] + this.field4196[2] * var1.field4196[11] + this.field4196[1] * var1.field4196[7] + var1.field4196[3] * this.field4196[0]; // L: 165 - float var6 = this.field4196[4] * var1.field4196[0] + var1.field4196[4] * this.field4196[5] + this.field4196[6] * var1.field4196[8] + this.field4196[7] * var1.field4196[12]; // L: 166 - float var7 = var1.field4196[9] * this.field4196[6] + var1.field4196[5] * this.field4196[5] + this.field4196[4] * var1.field4196[1] + this.field4196[7] * var1.field4196[13]; // L: 167 - float var8 = this.field4196[7] * var1.field4196[14] + this.field4196[5] * var1.field4196[6] + var1.field4196[2] * this.field4196[4] + this.field4196[6] * var1.field4196[10]; // L: 168 - float var9 = this.field4196[5] * var1.field4196[7] + this.field4196[4] * var1.field4196[3] + this.field4196[6] * var1.field4196[11] + this.field4196[7] * var1.field4196[15]; // L: 169 - float var10 = var1.field4196[12] * this.field4196[11] + this.field4196[10] * var1.field4196[8] + var1.field4196[0] * this.field4196[8] + this.field4196[9] * var1.field4196[4]; // L: 170 - float var11 = var1.field4196[5] * this.field4196[9] + this.field4196[8] * var1.field4196[1] + var1.field4196[9] * this.field4196[10] + this.field4196[11] * var1.field4196[13]; // L: 171 - float var12 = var1.field4196[10] * this.field4196[10] + this.field4196[8] * var1.field4196[2] + this.field4196[9] * var1.field4196[6] + this.field4196[11] * var1.field4196[14]; // L: 172 - float var13 = this.field4196[8] * var1.field4196[3] + this.field4196[9] * var1.field4196[7] + var1.field4196[11] * this.field4196[10] + this.field4196[11] * var1.field4196[15]; // L: 173 - float var14 = var1.field4196[8] * this.field4196[14] + var1.field4196[4] * this.field4196[13] + this.field4196[12] * var1.field4196[0] + var1.field4196[12] * this.field4196[15]; // L: 174 - float var15 = var1.field4196[13] * this.field4196[15] + this.field4196[12] * var1.field4196[1] + var1.field4196[5] * this.field4196[13] + this.field4196[14] * var1.field4196[9]; // L: 175 - float var16 = this.field4196[14] * var1.field4196[10] + var1.field4196[6] * this.field4196[13] + this.field4196[12] * var1.field4196[2] + this.field4196[15] * var1.field4196[14]; // L: 176 - float var17 = var1.field4196[15] * this.field4196[15] + var1.field4196[11] * this.field4196[14] + var1.field4196[7] * this.field4196[13] + this.field4196[12] * var1.field4196[3]; // L: 177 - this.field4196[0] = var2; // L: 178 - this.field4196[1] = var3; // L: 179 - this.field4196[2] = var4; // L: 180 - this.field4196[3] = var5; // L: 181 - this.field4196[4] = var6; // L: 182 - this.field4196[5] = var7; // L: 183 - this.field4196[6] = var8; // L: 184 - this.field4196[7] = var9; // L: 185 - this.field4196[8] = var10; // L: 186 - this.field4196[9] = var11; // L: 187 - this.field4196[10] = var12; // L: 188 - this.field4196[11] = var13; // L: 189 - this.field4196[12] = var14; // L: 190 - this.field4196[13] = var15; // L: 191 - this.field4196[14] = var16; // L: 192 - this.field4196[15] = var17; // L: 193 - } // L: 194 + float var2 = this.field4196[1] * var1.field4196[4] + var1.field4196[0] * this.field4196[0] + this.field4196[2] * var1.field4196[8] + var1.field4196[12] * this.field4196[3]; + float var3 = var1.field4196[5] * this.field4196[1] + var1.field4196[1] * this.field4196[0] + this.field4196[2] * var1.field4196[9] + var1.field4196[13] * this.field4196[3]; + float var4 = var1.field4196[6] * this.field4196[1] + this.field4196[0] * var1.field4196[2] + var1.field4196[10] * this.field4196[2] + var1.field4196[14] * this.field4196[3]; + float var5 = var1.field4196[15] * this.field4196[3] + this.field4196[2] * var1.field4196[11] + this.field4196[1] * var1.field4196[7] + var1.field4196[3] * this.field4196[0]; + float var6 = this.field4196[4] * var1.field4196[0] + var1.field4196[4] * this.field4196[5] + this.field4196[6] * var1.field4196[8] + this.field4196[7] * var1.field4196[12]; + float var7 = var1.field4196[9] * this.field4196[6] + var1.field4196[5] * this.field4196[5] + this.field4196[4] * var1.field4196[1] + this.field4196[7] * var1.field4196[13]; + float var8 = this.field4196[7] * var1.field4196[14] + this.field4196[5] * var1.field4196[6] + var1.field4196[2] * this.field4196[4] + this.field4196[6] * var1.field4196[10]; + float var9 = this.field4196[5] * var1.field4196[7] + this.field4196[4] * var1.field4196[3] + this.field4196[6] * var1.field4196[11] + this.field4196[7] * var1.field4196[15]; + float var10 = var1.field4196[12] * this.field4196[11] + this.field4196[10] * var1.field4196[8] + var1.field4196[0] * this.field4196[8] + this.field4196[9] * var1.field4196[4]; + float var11 = var1.field4196[5] * this.field4196[9] + this.field4196[8] * var1.field4196[1] + var1.field4196[9] * this.field4196[10] + this.field4196[11] * var1.field4196[13]; + float var12 = var1.field4196[10] * this.field4196[10] + this.field4196[8] * var1.field4196[2] + this.field4196[9] * var1.field4196[6] + this.field4196[11] * var1.field4196[14]; + float var13 = this.field4196[8] * var1.field4196[3] + this.field4196[9] * var1.field4196[7] + var1.field4196[11] * this.field4196[10] + this.field4196[11] * var1.field4196[15]; + float var14 = var1.field4196[8] * this.field4196[14] + var1.field4196[4] * this.field4196[13] + this.field4196[12] * var1.field4196[0] + var1.field4196[12] * this.field4196[15]; + float var15 = var1.field4196[13] * this.field4196[15] + this.field4196[12] * var1.field4196[1] + var1.field4196[5] * this.field4196[13] + this.field4196[14] * var1.field4196[9]; + float var16 = this.field4196[14] * var1.field4196[10] + var1.field4196[6] * this.field4196[13] + this.field4196[12] * var1.field4196[2] + this.field4196[15] * var1.field4196[14]; + float var17 = var1.field4196[15] * this.field4196[15] + var1.field4196[11] * this.field4196[14] + var1.field4196[7] * this.field4196[13] + this.field4196[12] * var1.field4196[3]; + this.field4196[0] = var2; + this.field4196[1] = var3; + this.field4196[2] = var4; + this.field4196[3] = var5; + this.field4196[4] = var6; + this.field4196[5] = var7; + this.field4196[6] = var8; + this.field4196[7] = var9; + this.field4196[8] = var10; + this.field4196[9] = var11; + this.field4196[10] = var12; + this.field4196[11] = var13; + this.field4196[12] = var14; + this.field4196[13] = var15; + this.field4196[14] = var16; + this.field4196[15] = var17; + } @ObfuscatedName("d") @ObfuscatedSignature( @@ -275,26 +275,26 @@ public final class class366 { garbageValue = "-62" ) public void method6711(class365 var1) { - float var2 = var1.field4183 * var1.field4183; // L: 197 - float var3 = var1.field4183 * var1.field4186; // L: 198 - float var4 = var1.field4188 * var1.field4183; // L: 199 - float var5 = var1.field4183 * var1.field4187; // L: 200 - float var6 = var1.field4186 * var1.field4186; // L: 201 - float var7 = var1.field4188 * var1.field4186; // L: 202 - float var8 = var1.field4186 * var1.field4187; // L: 203 - float var9 = var1.field4188 * var1.field4188; // L: 204 - float var10 = var1.field4188 * var1.field4187; // L: 205 - float var11 = var1.field4187 * var1.field4187; // L: 206 - this.field4196[0] = var6 + var2 - var11 - var9; // L: 207 - this.field4196[1] = var7 + var7 + var5 + var5; // L: 208 - this.field4196[2] = var8 - var4 - var4 + var8; // L: 209 - this.field4196[4] = var7 + (var7 - var5 - var5); // L: 210 - this.field4196[5] = var9 + var2 - var6 - var11; // L: 211 - this.field4196[6] = var3 + var10 + var3 + var10; // L: 212 - this.field4196[8] = var8 + var4 + var8 + var4; // L: 213 - this.field4196[9] = var10 + (var10 - var3 - var3); // L: 214 - this.field4196[10] = var11 + var2 - var9 - var6; // L: 215 - } // L: 216 + float var2 = var1.field4183 * var1.field4183; + float var3 = var1.field4183 * var1.field4186; + float var4 = var1.field4188 * var1.field4183; + float var5 = var1.field4183 * var1.field4187; + float var6 = var1.field4186 * var1.field4186; + float var7 = var1.field4188 * var1.field4186; + float var8 = var1.field4186 * var1.field4187; + float var9 = var1.field4188 * var1.field4188; + float var10 = var1.field4188 * var1.field4187; + float var11 = var1.field4187 * var1.field4187; + this.field4196[0] = var6 + var2 - var11 - var9; + this.field4196[1] = var7 + var7 + var5 + var5; + this.field4196[2] = var8 - var4 - var4 + var8; + this.field4196[4] = var7 + (var7 - var5 - var5); + this.field4196[5] = var9 + var2 - var6 - var11; + this.field4196[6] = var3 + var10 + var3 + var10; + this.field4196[8] = var8 + var4 + var8 + var4; + this.field4196[9] = var10 + (var10 - var3 - var3); + this.field4196[10] = var11 + var2 - var9 - var6; + } @ObfuscatedName("h") @ObfuscatedSignature( @@ -302,23 +302,23 @@ public final class class366 { garbageValue = "-7" ) void method6713(class367 var1) { - this.field4196[0] = var1.field4197; // L: 219 - this.field4196[1] = var1.field4198; // L: 220 - this.field4196[2] = var1.field4199; // L: 221 - this.field4196[3] = 0.0F; // L: 222 - this.field4196[4] = var1.field4200; // L: 223 - this.field4196[5] = var1.field4201; // L: 224 - this.field4196[6] = var1.field4202; // L: 225 - this.field4196[7] = 0.0F; // L: 226 - this.field4196[8] = var1.field4204; // L: 227 - this.field4196[9] = var1.field4203; // L: 228 - this.field4196[10] = var1.field4205; // L: 229 - this.field4196[11] = 0.0F; // L: 230 - this.field4196[12] = var1.field4206; // L: 231 - this.field4196[13] = var1.field4207; // L: 232 - this.field4196[14] = var1.field4208; // L: 233 - this.field4196[15] = 1.0F; // L: 234 - } // L: 235 + this.field4196[0] = var1.field4197; + this.field4196[1] = var1.field4198; + this.field4196[2] = var1.field4199; + this.field4196[3] = 0.0F; + this.field4196[4] = var1.field4200; + this.field4196[5] = var1.field4201; + this.field4196[6] = var1.field4202; + this.field4196[7] = 0.0F; + this.field4196[8] = var1.field4204; + this.field4196[9] = var1.field4203; + this.field4196[10] = var1.field4205; + this.field4196[11] = 0.0F; + this.field4196[12] = var1.field4206; + this.field4196[13] = var1.field4207; + this.field4196[14] = var1.field4208; + this.field4196[15] = 1.0F; + } @ObfuscatedName("g") @ObfuscatedSignature( @@ -326,7 +326,7 @@ public final class class366 { garbageValue = "115" ) float method6679() { - return this.field4196[8] * this.field4196[3] * this.field4196[5] * this.field4196[14] + this.field4196[13] * this.field4196[8] * this.field4196[2] * this.field4196[7] + this.field4196[12] * this.field4196[2] * this.field4196[5] * this.field4196[11] + (this.field4196[15] * this.field4196[9] * this.field4196[2] * this.field4196[4] + this.field4196[6] * this.field4196[0] * this.field4196[11] * this.field4196[13] + (this.field4196[5] * this.field4196[0] * this.field4196[10] * this.field4196[15] - this.field4196[14] * this.field4196[5] * this.field4196[0] * this.field4196[11] - this.field4196[9] * this.field4196[0] * this.field4196[6] * this.field4196[15]) + this.field4196[14] * this.field4196[9] * this.field4196[7] * this.field4196[0] - this.field4196[13] * this.field4196[7] * this.field4196[0] * this.field4196[10] - this.field4196[15] * this.field4196[10] * this.field4196[4] * this.field4196[1] + this.field4196[14] * this.field4196[11] * this.field4196[1] * this.field4196[4] + this.field4196[15] * this.field4196[8] * this.field4196[6] * this.field4196[1] - this.field4196[11] * this.field4196[6] * this.field4196[1] * this.field4196[12] - this.field4196[7] * this.field4196[1] * this.field4196[8] * this.field4196[14] + this.field4196[12] * this.field4196[10] * this.field4196[1] * this.field4196[7] - this.field4196[11] * this.field4196[4] * this.field4196[2] * this.field4196[13] - this.field4196[15] * this.field4196[5] * this.field4196[2] * this.field4196[8]) - this.field4196[2] * this.field4196[7] * this.field4196[9] * this.field4196[12] - this.field4196[3] * this.field4196[4] * this.field4196[9] * this.field4196[14] + this.field4196[10] * this.field4196[3] * this.field4196[4] * this.field4196[13] - this.field4196[10] * this.field4196[5] * this.field4196[3] * this.field4196[12] - this.field4196[3] * this.field4196[6] * this.field4196[8] * this.field4196[13] + this.field4196[3] * this.field4196[6] * this.field4196[9] * this.field4196[12]; // L: 238 + return this.field4196[8] * this.field4196[3] * this.field4196[5] * this.field4196[14] + this.field4196[13] * this.field4196[8] * this.field4196[2] * this.field4196[7] + this.field4196[12] * this.field4196[2] * this.field4196[5] * this.field4196[11] + (this.field4196[15] * this.field4196[9] * this.field4196[2] * this.field4196[4] + this.field4196[6] * this.field4196[0] * this.field4196[11] * this.field4196[13] + (this.field4196[5] * this.field4196[0] * this.field4196[10] * this.field4196[15] - this.field4196[14] * this.field4196[5] * this.field4196[0] * this.field4196[11] - this.field4196[9] * this.field4196[0] * this.field4196[6] * this.field4196[15]) + this.field4196[14] * this.field4196[9] * this.field4196[7] * this.field4196[0] - this.field4196[13] * this.field4196[7] * this.field4196[0] * this.field4196[10] - this.field4196[15] * this.field4196[10] * this.field4196[4] * this.field4196[1] + this.field4196[14] * this.field4196[11] * this.field4196[1] * this.field4196[4] + this.field4196[15] * this.field4196[8] * this.field4196[6] * this.field4196[1] - this.field4196[11] * this.field4196[6] * this.field4196[1] * this.field4196[12] - this.field4196[7] * this.field4196[1] * this.field4196[8] * this.field4196[14] + this.field4196[12] * this.field4196[10] * this.field4196[1] * this.field4196[7] - this.field4196[11] * this.field4196[4] * this.field4196[2] * this.field4196[13] - this.field4196[15] * this.field4196[5] * this.field4196[2] * this.field4196[8]) - this.field4196[2] * this.field4196[7] * this.field4196[9] * this.field4196[12] - this.field4196[3] * this.field4196[4] * this.field4196[9] * this.field4196[14] + this.field4196[10] * this.field4196[3] * this.field4196[4] * this.field4196[13] - this.field4196[10] * this.field4196[5] * this.field4196[3] * this.field4196[12] - this.field4196[3] * this.field4196[6] * this.field4196[8] * this.field4196[13] + this.field4196[3] * this.field4196[6] * this.field4196[9] * this.field4196[12]; } @ObfuscatedName("e") @@ -335,40 +335,40 @@ public final class class366 { garbageValue = "817560716" ) public void method6678() { - float var1 = 1.0F / this.method6679(); // L: 242 - float var2 = var1 * (this.field4196[15] * this.field4196[5] * this.field4196[10] - this.field4196[14] * this.field4196[5] * this.field4196[11] - this.field4196[6] * this.field4196[9] * this.field4196[15] + this.field4196[13] * this.field4196[6] * this.field4196[11] + this.field4196[9] * this.field4196[7] * this.field4196[14] - this.field4196[10] * this.field4196[7] * this.field4196[13]); // L: 243 - float var3 = (this.field4196[9] * this.field4196[2] * this.field4196[15] + this.field4196[14] * this.field4196[11] * this.field4196[1] + -this.field4196[1] * this.field4196[10] * this.field4196[15] - this.field4196[13] * this.field4196[2] * this.field4196[11] - this.field4196[14] * this.field4196[9] * this.field4196[3] + this.field4196[13] * this.field4196[3] * this.field4196[10]) * var1; // L: 244 - float var4 = var1 * (this.field4196[15] * this.field4196[1] * this.field4196[6] - this.field4196[7] * this.field4196[1] * this.field4196[14] - this.field4196[2] * this.field4196[5] * this.field4196[15] + this.field4196[13] * this.field4196[7] * this.field4196[2] + this.field4196[14] * this.field4196[5] * this.field4196[3] - this.field4196[3] * this.field4196[6] * this.field4196[13]); // L: 245 - float var5 = (this.field4196[6] * this.field4196[3] * this.field4196[9] + (this.field4196[11] * this.field4196[2] * this.field4196[5] + this.field4196[10] * this.field4196[7] * this.field4196[1] + this.field4196[6] * -this.field4196[1] * this.field4196[11] - this.field4196[9] * this.field4196[7] * this.field4196[2] - this.field4196[5] * this.field4196[3] * this.field4196[10])) * var1; // L: 246 - float var6 = var1 * (this.field4196[8] * this.field4196[6] * this.field4196[15] + this.field4196[11] * this.field4196[4] * this.field4196[14] + -this.field4196[4] * this.field4196[10] * this.field4196[15] - this.field4196[6] * this.field4196[11] * this.field4196[12] - this.field4196[8] * this.field4196[7] * this.field4196[14] + this.field4196[12] * this.field4196[10] * this.field4196[7]); // L: 247 - float var7 = var1 * (this.field4196[15] * this.field4196[0] * this.field4196[10] - this.field4196[14] * this.field4196[11] * this.field4196[0] - this.field4196[15] * this.field4196[8] * this.field4196[2] + this.field4196[11] * this.field4196[2] * this.field4196[12] + this.field4196[14] * this.field4196[8] * this.field4196[3] - this.field4196[3] * this.field4196[10] * this.field4196[12]); // L: 248 - float var8 = var1 * (this.field4196[15] * this.field4196[4] * this.field4196[2] + this.field4196[0] * this.field4196[7] * this.field4196[14] + this.field4196[6] * -this.field4196[0] * this.field4196[15] - this.field4196[7] * this.field4196[2] * this.field4196[12] - this.field4196[4] * this.field4196[3] * this.field4196[14] + this.field4196[12] * this.field4196[3] * this.field4196[6]); // L: 249 - float var9 = (this.field4196[2] * this.field4196[7] * this.field4196[8] + (this.field4196[11] * this.field4196[0] * this.field4196[6] - this.field4196[10] * this.field4196[0] * this.field4196[7] - this.field4196[11] * this.field4196[2] * this.field4196[4]) + this.field4196[10] * this.field4196[4] * this.field4196[3] - this.field4196[3] * this.field4196[6] * this.field4196[8]) * var1; // L: 250 - float var10 = var1 * (this.field4196[4] * this.field4196[9] * this.field4196[15] - this.field4196[13] * this.field4196[4] * this.field4196[11] - this.field4196[15] * this.field4196[5] * this.field4196[8] + this.field4196[12] * this.field4196[5] * this.field4196[11] + this.field4196[13] * this.field4196[7] * this.field4196[8] - this.field4196[7] * this.field4196[9] * this.field4196[12]); // L: 251 - float var11 = var1 * (this.field4196[15] * this.field4196[1] * this.field4196[8] + this.field4196[13] * this.field4196[0] * this.field4196[11] + this.field4196[15] * this.field4196[9] * -this.field4196[0] - this.field4196[11] * this.field4196[1] * this.field4196[12] - this.field4196[3] * this.field4196[8] * this.field4196[13] + this.field4196[12] * this.field4196[9] * this.field4196[3]); // L: 252 - float var12 = var1 * (this.field4196[13] * this.field4196[3] * this.field4196[4] + this.field4196[0] * this.field4196[5] * this.field4196[15] - this.field4196[0] * this.field4196[7] * this.field4196[13] - this.field4196[15] * this.field4196[4] * this.field4196[1] + this.field4196[7] * this.field4196[1] * this.field4196[12] - this.field4196[12] * this.field4196[3] * this.field4196[5]); // L: 253 - float var13 = var1 * (this.field4196[11] * this.field4196[4] * this.field4196[1] + this.field4196[9] * this.field4196[0] * this.field4196[7] + this.field4196[11] * -this.field4196[0] * this.field4196[5] - this.field4196[8] * this.field4196[1] * this.field4196[7] - this.field4196[9] * this.field4196[3] * this.field4196[4] + this.field4196[8] * this.field4196[5] * this.field4196[3]); // L: 254 - float var14 = (this.field4196[12] * this.field4196[9] * this.field4196[6] + (this.field4196[5] * this.field4196[8] * this.field4196[14] + this.field4196[10] * this.field4196[4] * this.field4196[13] + this.field4196[9] * -this.field4196[4] * this.field4196[14] - this.field4196[5] * this.field4196[10] * this.field4196[12] - this.field4196[6] * this.field4196[8] * this.field4196[13])) * var1; // L: 255 - float var15 = (this.field4196[13] * this.field4196[8] * this.field4196[2] + this.field4196[12] * this.field4196[10] * this.field4196[1] + (this.field4196[9] * this.field4196[0] * this.field4196[14] - this.field4196[13] * this.field4196[0] * this.field4196[10] - this.field4196[8] * this.field4196[1] * this.field4196[14]) - this.field4196[12] * this.field4196[2] * this.field4196[9]) * var1; // L: 256 - float var16 = var1 * (this.field4196[5] * this.field4196[2] * this.field4196[12] + (this.field4196[4] * this.field4196[1] * this.field4196[14] + this.field4196[0] * this.field4196[6] * this.field4196[13] + this.field4196[5] * -this.field4196[0] * this.field4196[14] - this.field4196[12] * this.field4196[1] * this.field4196[6] - this.field4196[13] * this.field4196[4] * this.field4196[2])); // L: 257 - float var17 = (this.field4196[9] * this.field4196[2] * this.field4196[4] + this.field4196[8] * this.field4196[6] * this.field4196[1] + (this.field4196[0] * this.field4196[5] * this.field4196[10] - this.field4196[6] * this.field4196[0] * this.field4196[9] - this.field4196[10] * this.field4196[4] * this.field4196[1]) - this.field4196[8] * this.field4196[2] * this.field4196[5]) * var1; // L: 258 - this.field4196[0] = var2; // L: 259 - this.field4196[1] = var3; // L: 260 - this.field4196[2] = var4; // L: 261 - this.field4196[3] = var5; // L: 262 - this.field4196[4] = var6; // L: 263 - this.field4196[5] = var7; // L: 264 - this.field4196[6] = var8; // L: 265 - this.field4196[7] = var9; // L: 266 - this.field4196[8] = var10; // L: 267 - this.field4196[9] = var11; // L: 268 - this.field4196[10] = var12; // L: 269 - this.field4196[11] = var13; // L: 270 - this.field4196[12] = var14; // L: 271 - this.field4196[13] = var15; // L: 272 - this.field4196[14] = var16; // L: 273 - this.field4196[15] = var17; // L: 274 - } // L: 275 + float var1 = 1.0F / this.method6679(); + float var2 = var1 * (this.field4196[15] * this.field4196[5] * this.field4196[10] - this.field4196[14] * this.field4196[5] * this.field4196[11] - this.field4196[6] * this.field4196[9] * this.field4196[15] + this.field4196[13] * this.field4196[6] * this.field4196[11] + this.field4196[9] * this.field4196[7] * this.field4196[14] - this.field4196[10] * this.field4196[7] * this.field4196[13]); + float var3 = (this.field4196[9] * this.field4196[2] * this.field4196[15] + this.field4196[14] * this.field4196[11] * this.field4196[1] + -this.field4196[1] * this.field4196[10] * this.field4196[15] - this.field4196[13] * this.field4196[2] * this.field4196[11] - this.field4196[14] * this.field4196[9] * this.field4196[3] + this.field4196[13] * this.field4196[3] * this.field4196[10]) * var1; + float var4 = var1 * (this.field4196[15] * this.field4196[1] * this.field4196[6] - this.field4196[7] * this.field4196[1] * this.field4196[14] - this.field4196[2] * this.field4196[5] * this.field4196[15] + this.field4196[13] * this.field4196[7] * this.field4196[2] + this.field4196[14] * this.field4196[5] * this.field4196[3] - this.field4196[3] * this.field4196[6] * this.field4196[13]); + float var5 = (this.field4196[6] * this.field4196[3] * this.field4196[9] + (this.field4196[11] * this.field4196[2] * this.field4196[5] + this.field4196[10] * this.field4196[7] * this.field4196[1] + this.field4196[6] * -this.field4196[1] * this.field4196[11] - this.field4196[9] * this.field4196[7] * this.field4196[2] - this.field4196[5] * this.field4196[3] * this.field4196[10])) * var1; + float var6 = var1 * (this.field4196[8] * this.field4196[6] * this.field4196[15] + this.field4196[11] * this.field4196[4] * this.field4196[14] + -this.field4196[4] * this.field4196[10] * this.field4196[15] - this.field4196[6] * this.field4196[11] * this.field4196[12] - this.field4196[8] * this.field4196[7] * this.field4196[14] + this.field4196[12] * this.field4196[10] * this.field4196[7]); + float var7 = var1 * (this.field4196[15] * this.field4196[0] * this.field4196[10] - this.field4196[14] * this.field4196[11] * this.field4196[0] - this.field4196[15] * this.field4196[8] * this.field4196[2] + this.field4196[11] * this.field4196[2] * this.field4196[12] + this.field4196[14] * this.field4196[8] * this.field4196[3] - this.field4196[3] * this.field4196[10] * this.field4196[12]); + float var8 = var1 * (this.field4196[15] * this.field4196[4] * this.field4196[2] + this.field4196[0] * this.field4196[7] * this.field4196[14] + this.field4196[6] * -this.field4196[0] * this.field4196[15] - this.field4196[7] * this.field4196[2] * this.field4196[12] - this.field4196[4] * this.field4196[3] * this.field4196[14] + this.field4196[12] * this.field4196[3] * this.field4196[6]); + float var9 = (this.field4196[2] * this.field4196[7] * this.field4196[8] + (this.field4196[11] * this.field4196[0] * this.field4196[6] - this.field4196[10] * this.field4196[0] * this.field4196[7] - this.field4196[11] * this.field4196[2] * this.field4196[4]) + this.field4196[10] * this.field4196[4] * this.field4196[3] - this.field4196[3] * this.field4196[6] * this.field4196[8]) * var1; + float var10 = var1 * (this.field4196[4] * this.field4196[9] * this.field4196[15] - this.field4196[13] * this.field4196[4] * this.field4196[11] - this.field4196[15] * this.field4196[5] * this.field4196[8] + this.field4196[12] * this.field4196[5] * this.field4196[11] + this.field4196[13] * this.field4196[7] * this.field4196[8] - this.field4196[7] * this.field4196[9] * this.field4196[12]); + float var11 = var1 * (this.field4196[15] * this.field4196[1] * this.field4196[8] + this.field4196[13] * this.field4196[0] * this.field4196[11] + this.field4196[15] * this.field4196[9] * -this.field4196[0] - this.field4196[11] * this.field4196[1] * this.field4196[12] - this.field4196[3] * this.field4196[8] * this.field4196[13] + this.field4196[12] * this.field4196[9] * this.field4196[3]); + float var12 = var1 * (this.field4196[13] * this.field4196[3] * this.field4196[4] + this.field4196[0] * this.field4196[5] * this.field4196[15] - this.field4196[0] * this.field4196[7] * this.field4196[13] - this.field4196[15] * this.field4196[4] * this.field4196[1] + this.field4196[7] * this.field4196[1] * this.field4196[12] - this.field4196[12] * this.field4196[3] * this.field4196[5]); + float var13 = var1 * (this.field4196[11] * this.field4196[4] * this.field4196[1] + this.field4196[9] * this.field4196[0] * this.field4196[7] + this.field4196[11] * -this.field4196[0] * this.field4196[5] - this.field4196[8] * this.field4196[1] * this.field4196[7] - this.field4196[9] * this.field4196[3] * this.field4196[4] + this.field4196[8] * this.field4196[5] * this.field4196[3]); + float var14 = (this.field4196[12] * this.field4196[9] * this.field4196[6] + (this.field4196[5] * this.field4196[8] * this.field4196[14] + this.field4196[10] * this.field4196[4] * this.field4196[13] + this.field4196[9] * -this.field4196[4] * this.field4196[14] - this.field4196[5] * this.field4196[10] * this.field4196[12] - this.field4196[6] * this.field4196[8] * this.field4196[13])) * var1; + float var15 = (this.field4196[13] * this.field4196[8] * this.field4196[2] + this.field4196[12] * this.field4196[10] * this.field4196[1] + (this.field4196[9] * this.field4196[0] * this.field4196[14] - this.field4196[13] * this.field4196[0] * this.field4196[10] - this.field4196[8] * this.field4196[1] * this.field4196[14]) - this.field4196[12] * this.field4196[2] * this.field4196[9]) * var1; + float var16 = var1 * (this.field4196[5] * this.field4196[2] * this.field4196[12] + (this.field4196[4] * this.field4196[1] * this.field4196[14] + this.field4196[0] * this.field4196[6] * this.field4196[13] + this.field4196[5] * -this.field4196[0] * this.field4196[14] - this.field4196[12] * this.field4196[1] * this.field4196[6] - this.field4196[13] * this.field4196[4] * this.field4196[2])); + float var17 = (this.field4196[9] * this.field4196[2] * this.field4196[4] + this.field4196[8] * this.field4196[6] * this.field4196[1] + (this.field4196[0] * this.field4196[5] * this.field4196[10] - this.field4196[6] * this.field4196[0] * this.field4196[9] - this.field4196[10] * this.field4196[4] * this.field4196[1]) - this.field4196[8] * this.field4196[2] * this.field4196[5]) * var1; + this.field4196[0] = var2; + this.field4196[1] = var3; + this.field4196[2] = var4; + this.field4196[3] = var5; + this.field4196[4] = var6; + this.field4196[5] = var7; + this.field4196[6] = var8; + this.field4196[7] = var9; + this.field4196[8] = var10; + this.field4196[9] = var11; + this.field4196[10] = var12; + this.field4196[11] = var13; + this.field4196[12] = var14; + this.field4196[13] = var15; + this.field4196[14] = var16; + this.field4196[15] = var17; + } @ObfuscatedName("a") @ObfuscatedSignature( @@ -376,61 +376,61 @@ public final class class366 { garbageValue = "768" ) public float[] method6663() { - float[] var1 = new float[3]; // L: 312 - class364 var2 = new class364(this.field4196[0], this.field4196[1], this.field4196[2]); // L: 313 - class364 var3 = new class364(this.field4196[4], this.field4196[5], this.field4196[6]); // L: 314 - class364 var4 = new class364(this.field4196[8], this.field4196[9], this.field4196[10]); // L: 315 - var1[0] = var2.method6618(); // L: 316 - var1[1] = var3.method6618(); // L: 317 - var1[2] = var4.method6618(); // L: 318 - return var1; // L: 319 + float[] var1 = new float[3]; + class364 var2 = new class364(this.field4196[0], this.field4196[1], this.field4196[2]); + class364 var3 = new class364(this.field4196[4], this.field4196[5], this.field4196[6]); + class364 var4 = new class364(this.field4196[8], this.field4196[9], this.field4196[10]); + var1[0] = var2.method6618(); + var1[1] = var3.method6618(); + var1[2] = var4.method6618(); + return var1; } public int hashCode() { - boolean var1 = true; // L: 297 - byte var2 = 1; // L: 298 - int var3 = 31 * var2 + Arrays.hashCode(this.field4196); // L: 299 - return var3; // L: 300 + boolean var1 = true; + byte var2 = 1; + int var3 = 31 * var2 + Arrays.hashCode(this.field4196); + return var3; } public boolean equals(Object var1) { - if (!(var1 instanceof class366)) { // L: 305 + if (!(var1 instanceof class366)) { return false; } else { - class366 var2 = (class366)var1; // L: 306 + class366 var2 = (class366)var1; - for (int var3 = 0; var3 < 16; ++var3) { // L: 307 + for (int var3 = 0; var3 < 16; ++var3) { if (this.field4196[var3] != var2.field4196[var3]) { return false; } } - return true; // L: 308 + return true; } } public String toString() { - StringBuilder var1 = new StringBuilder(); // L: 280 - this.method6651(); // L: 281 - this.method6650(); // L: 282 + StringBuilder var1 = new StringBuilder(); + this.method6651(); + this.method6650(); - for (int var2 = 0; var2 < 4; ++var2) { // L: 283 - for (int var3 = 0; var3 < 4; ++var3) { // L: 284 + for (int var2 = 0; var2 < 4; ++var2) { + for (int var3 = 0; var3 < 4; ++var3) { if (var3 > 0) { - var1.append("\t"); // L: 285 + var1.append("\t"); } - float var4 = this.field4196[var3 + var2 * 4]; // L: 286 - if (Math.sqrt((double)(var4 * var4)) < 9.999999747378752E-5D) { // L: 287 + float var4 = this.field4196[var3 + var2 * 4]; + if (Math.sqrt((double)(var4 * var4)) < 9.999999747378752E-5D) { var4 = 0.0F; } - var1.append(var4); // L: 288 + var1.append(var4); } - var1.append("\n"); // L: 290 + var1.append("\n"); } - return var1.toString(); // L: 292 + return var1.toString(); } } diff --git a/runescape-client/src/main/java/class367.java b/runescape-client/src/main/java/class367.java index c3beadd00d..7868bc081e 100644 --- a/runescape-client/src/main/java/class367.java +++ b/runescape-client/src/main/java/class367.java @@ -30,11 +30,11 @@ public class class367 { static { new class367(); - } // L: 6 + } class367() { - this.method6739(); // L: 22 - } // L: 23 + this.method6739(); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -42,19 +42,19 @@ public class class367 { garbageValue = "-597263666" ) void method6739() { - this.field4208 = 0.0F; // L: 26 - this.field4207 = 0.0F; // L: 27 - this.field4206 = 0.0F; // L: 28 - this.field4203 = 0.0F; // L: 29 - this.field4204 = 0.0F; // L: 30 - this.field4202 = 0.0F; // L: 31 - this.field4200 = 0.0F; // L: 32 - this.field4199 = 0.0F; // L: 33 - this.field4198 = 0.0F; // L: 34 - this.field4205 = 1.0F; // L: 35 - this.field4201 = 1.0F; // L: 36 - this.field4197 = 1.0F; // L: 37 - } // L: 38 + this.field4208 = 0.0F; + this.field4207 = 0.0F; + this.field4206 = 0.0F; + this.field4203 = 0.0F; + this.field4204 = 0.0F; + this.field4202 = 0.0F; + this.field4200 = 0.0F; + this.field4199 = 0.0F; + this.field4198 = 0.0F; + this.field4205 = 1.0F; + this.field4201 = 1.0F; + this.field4197 = 1.0F; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -62,21 +62,21 @@ public class class367 { garbageValue = "-550408615" ) void method6732(float var1) { - float var2 = (float)Math.cos((double)var1); // L: 41 - float var3 = (float)Math.sin((double)var1); // L: 42 - float var4 = this.field4198; // L: 43 - float var5 = this.field4201; // L: 44 - float var6 = this.field4203; // L: 45 - float var7 = this.field4207; // L: 46 - this.field4198 = var4 * var2 - var3 * this.field4199; // L: 47 - this.field4199 = var4 * var3 + this.field4199 * var2; // L: 48 - this.field4201 = var2 * var5 - this.field4202 * var3; // L: 49 - this.field4202 = var5 * var3 + var2 * this.field4202; // L: 50 - this.field4203 = var2 * var6 - var3 * this.field4205; // L: 51 - this.field4205 = var2 * this.field4205 + var3 * var6; // L: 52 - this.field4207 = var7 * var2 - var3 * this.field4208; // L: 53 - this.field4208 = this.field4208 * var2 + var3 * var7; // L: 54 - } // L: 55 + float var2 = (float)Math.cos((double)var1); + float var3 = (float)Math.sin((double)var1); + float var4 = this.field4198; + float var5 = this.field4201; + float var6 = this.field4203; + float var7 = this.field4207; + this.field4198 = var4 * var2 - var3 * this.field4199; + this.field4199 = var4 * var3 + this.field4199 * var2; + this.field4201 = var2 * var5 - this.field4202 * var3; + this.field4202 = var5 * var3 + var2 * this.field4202; + this.field4203 = var2 * var6 - var3 * this.field4205; + this.field4205 = var2 * this.field4205 + var3 * var6; + this.field4207 = var7 * var2 - var3 * this.field4208; + this.field4208 = this.field4208 * var2 + var3 * var7; + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -84,21 +84,21 @@ public class class367 { garbageValue = "-452797463" ) void method6717(float var1) { - float var2 = (float)Math.cos((double)var1); // L: 58 - float var3 = (float)Math.sin((double)var1); // L: 59 - float var4 = this.field4197; // L: 60 - float var5 = this.field4200; // L: 61 - float var6 = this.field4204; // L: 62 - float var7 = this.field4206; // L: 63 - this.field4197 = var3 * this.field4199 + var4 * var2; // L: 64 - this.field4199 = this.field4199 * var2 - var4 * var3; // L: 65 - this.field4200 = this.field4202 * var3 + var2 * var5; // L: 66 - this.field4202 = this.field4202 * var2 - var5 * var3; // L: 67 - this.field4204 = var2 * var6 + var3 * this.field4205; // L: 68 - this.field4205 = var2 * this.field4205 - var3 * var6; // L: 69 - this.field4206 = this.field4208 * var3 + var7 * var2; // L: 70 - this.field4208 = var2 * this.field4208 - var7 * var3; // L: 71 - } // L: 72 + float var2 = (float)Math.cos((double)var1); + float var3 = (float)Math.sin((double)var1); + float var4 = this.field4197; + float var5 = this.field4200; + float var6 = this.field4204; + float var7 = this.field4206; + this.field4197 = var3 * this.field4199 + var4 * var2; + this.field4199 = this.field4199 * var2 - var4 * var3; + this.field4200 = this.field4202 * var3 + var2 * var5; + this.field4202 = this.field4202 * var2 - var5 * var3; + this.field4204 = var2 * var6 + var3 * this.field4205; + this.field4205 = var2 * this.field4205 - var3 * var6; + this.field4206 = this.field4208 * var3 + var7 * var2; + this.field4208 = var2 * this.field4208 - var7 * var3; + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -106,21 +106,21 @@ public class class367 { garbageValue = "1842275724" ) void method6718(float var1) { - float var2 = (float)Math.cos((double)var1); // L: 75 - float var3 = (float)Math.sin((double)var1); // L: 76 - float var4 = this.field4197; // L: 77 - float var5 = this.field4200; // L: 78 - float var6 = this.field4204; // L: 79 - float var7 = this.field4206; // L: 80 - this.field4197 = var2 * var4 - var3 * this.field4198; // L: 81 - this.field4198 = var3 * var4 + var2 * this.field4198; // L: 82 - this.field4200 = var5 * var2 - this.field4201 * var3; // L: 83 - this.field4201 = var2 * this.field4201 + var3 * var5; // L: 84 - this.field4204 = var6 * var2 - this.field4203 * var3; // L: 85 - this.field4203 = var3 * var6 + var2 * this.field4203; // L: 86 - this.field4206 = var7 * var2 - var3 * this.field4207; // L: 87 - this.field4207 = this.field4207 * var2 + var3 * var7; // L: 88 - } // L: 89 + float var2 = (float)Math.cos((double)var1); + float var3 = (float)Math.sin((double)var1); + float var4 = this.field4197; + float var5 = this.field4200; + float var6 = this.field4204; + float var7 = this.field4206; + this.field4197 = var2 * var4 - var3 * this.field4198; + this.field4198 = var3 * var4 + var2 * this.field4198; + this.field4200 = var5 * var2 - this.field4201 * var3; + this.field4201 = var2 * this.field4201 + var3 * var5; + this.field4204 = var6 * var2 - this.field4203 * var3; + this.field4203 = var3 * var6 + var2 * this.field4203; + this.field4206 = var7 * var2 - var3 * this.field4207; + this.field4207 = this.field4207 * var2 + var3 * var7; + } @ObfuscatedName("t") @ObfuscatedSignature( @@ -128,12 +128,12 @@ public class class367 { garbageValue = "12" ) void method6719(float var1, float var2, float var3) { - this.field4206 += var1; // L: 92 - this.field4207 += var2; // L: 93 - this.field4208 += var3; // L: 94 - } // L: 95 + this.field4206 += var1; + this.field4207 += var2; + this.field4208 += var3; + } public String toString() { - return this.field4197 + "," + this.field4200 + "," + this.field4204 + "," + this.field4206 + "\n" + this.field4198 + "," + this.field4201 + "," + this.field4203 + "," + this.field4207 + "\n" + this.field4199 + "," + this.field4202 + "," + this.field4205 + "," + this.field4208; // L: 99 + return this.field4197 + "," + this.field4200 + "," + this.field4204 + "," + this.field4206 + "\n" + this.field4198 + "," + this.field4201 + "," + this.field4203 + "," + this.field4207 + "\n" + this.field4199 + "," + this.field4202 + "," + this.field4205 + "," + this.field4208; } } diff --git a/runescape-client/src/main/java/class368.java b/runescape-client/src/main/java/class368.java index 16dd68f58c..d3519e72cc 100644 --- a/runescape-client/src/main/java/class368.java +++ b/runescape-client/src/main/java/class368.java @@ -16,9 +16,9 @@ public class class368 { int field4211; class368(float[] var1, int var2) { - this.field4212 = var1; // L: 10 - this.field4211 = var2; // L: 11 - } // L: 12 + this.field4212 = var1; + this.field4211 = var2; + } @ObfuscatedName("m") @ObfuscatedSignature( @@ -27,34 +27,34 @@ public class class368 { ) public static void method6744() { try { - File var0 = new File(class409.userHomeDirectory, "random.dat"); // L: 102 + File var0 = new File(class409.userHomeDirectory, "random.dat"); int var2; - if (var0.exists()) { // L: 103 - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); // L: 104 + if (var0.exists()) { + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); } else { label36: - for (int var1 = 0; var1 < BufferedSource.cacheSubPaths.length; ++var1) { // L: 107 - for (var2 = 0; var2 < UserComparator3.cacheParentPaths.length; ++var2) { // L: 108 - File var3 = new File(UserComparator3.cacheParentPaths[var2] + BufferedSource.cacheSubPaths[var1] + File.separatorChar + "random.dat"); // L: 109 - if (var3.exists()) { // L: 110 - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0); // L: 111 - break label36; // L: 112 + for (int var1 = 0; var1 < BufferedSource.cacheSubPaths.length; ++var1) { + for (var2 = 0; var2 < UserComparator3.cacheParentPaths.length; ++var2) { + File var3 = new File(UserComparator3.cacheParentPaths[var2] + BufferedSource.cacheSubPaths[var1] + File.separatorChar + "random.dat"); + if (var3.exists()) { + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0); + break label36; } } } } - if (JagexCache.JagexCache_randomDat == null) { // L: 117 - RandomAccessFile var4 = new RandomAccessFile(var0, "rw"); // L: 118 - var2 = var4.read(); // L: 119 - var4.seek(0L); // L: 120 - var4.write(var2); // L: 121 - var4.seek(0L); // L: 122 - var4.close(); // L: 123 - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); // L: 124 + if (JagexCache.JagexCache_randomDat == null) { + RandomAccessFile var4 = new RandomAccessFile(var0, "rw"); + var2 = var4.read(); + var4.seek(0L); + var4.write(var2); + var4.seek(0L); + var4.close(); + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); } - } catch (IOException var5) { // L: 127 + } catch (IOException var5) { } - } // L: 128 + } } diff --git a/runescape-client/src/main/java/class369.java b/runescape-client/src/main/java/class369.java index aad998685a..b47422649c 100644 --- a/runescape-client/src/main/java/class369.java +++ b/runescape-client/src/main/java/class369.java @@ -41,9 +41,9 @@ public enum class369 implements MouseWheel { final int field4219; class369(int var3, int var4) { - this.field4218 = var3; // L: 20 - this.field4219 = var4; // L: 21 - } // L: 22 + this.field4218 = var3; + this.field4219 = var4; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -52,6 +52,6 @@ public enum class369 implements MouseWheel { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field4219; // L: 26 + return this.field4219; } } diff --git a/runescape-client/src/main/java/class370.java b/runescape-client/src/main/java/class370.java index ff6f738ada..e984046d38 100644 --- a/runescape-client/src/main/java/class370.java +++ b/runescape-client/src/main/java/class370.java @@ -20,8 +20,8 @@ public class class370 implements class375 { descriptor = "(Lnl;)V" ) public class370(class371 var1) { - this(new class398(var1)); // L: 10 - } // L: 11 + this(new class398(var1)); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -38,10 +38,10 @@ public class class370 implements class375 { garbageValue = "267" ) public static int method6755(Buffer var0, String var1) { - int var2 = var0.offset; // L: 14 - byte[] var3 = class194.method3933(var1); // L: 15 - var0.writeSmartByteShort(var3.length); // L: 16 - var0.offset += class410.huffman.compress(var3, 0, var3.length, var0.array, var0.offset); // L: 17 - return var0.offset - var2; // L: 18 + int var2 = var0.offset; + byte[] var3 = class194.method3933(var1); + var0.writeSmartByteShort(var3.length); + var0.offset += class410.huffman.compress(var3, 0, var3.length, var0.array, var0.offset); + return var0.offset - var2; } } diff --git a/runescape-client/src/main/java/class371.java b/runescape-client/src/main/java/class371.java index df77c4ae14..7c8729f2ca 100644 --- a/runescape-client/src/main/java/class371.java +++ b/runescape-client/src/main/java/class371.java @@ -7,8 +7,8 @@ public abstract class class371 extends class242 implements class425 { descriptor = "(Lko;Llf;I)V" ) protected class371(StudioGame var1, Language var2, int var3) { - super(var1, var2, var3); // L: 15 - } // L: 16 + super(var1, var2, var3); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -23,7 +23,7 @@ public abstract class class371 extends class242 implements class425 { garbageValue = "-70" ) public int method6759() { - return super.field2787; // L: 19 + return super.field2787; } @ObfuscatedName("p") @@ -32,8 +32,8 @@ public abstract class class371 extends class242 implements class425 { garbageValue = "-78" ) public Object vmethod7625(int var1) { - class373 var2 = this.vmethod7209(var1); // L: 24 - return var2 != null && var2.method6780() ? var2.method6781() : null; // L: 25 26 + class373 var2 = this.vmethod7209(var1); + return var2 != null && var2.method6780() ? var2.method6781() : null; } @ObfuscatedName("m") @@ -42,30 +42,30 @@ public abstract class class371 extends class242 implements class425 { garbageValue = "-2120093804" ) public class426 method6761(Buffer var1) { - int var2 = var1.readUnsignedShort(); // L: 30 - class373 var3 = this.vmethod7209(var2); // L: 31 - class426 var4 = new class426(var2); // L: 32 - Class var5 = var3.field4226.field4446; // L: 33 - if (var5 == Integer.class) { // L: 34 + int var2 = var1.readUnsignedShort(); + class373 var3 = this.vmethod7209(var2); + class426 var4 = new class426(var2); + Class var5 = var3.field4226.field4446; + if (var5 == Integer.class) { var4.field4537 = var1.readInt(); } else if (var5 == Long.class) { - var4.field4537 = var1.readLong(); // L: 35 - } else if (var5 == String.class) { // L: 36 + var4.field4537 = var1.readLong(); + } else if (var5 == String.class) { var4.field4537 = var1.readStringCp1252NullCircumfixed(); } else { - if (!class421.class.isAssignableFrom(var5)) { // L: 37 - throw new IllegalStateException(); // L: 46 + if (!class421.class.isAssignableFrom(var5)) { + throw new IllegalStateException(); } try { - class421 var6 = (class421)var5.newInstance(); // L: 39 - var6.method7596(var1); // L: 40 - var4.field4537 = var6; // L: 41 - } catch (InstantiationException var7) { // L: 43 - } catch (IllegalAccessException var8) { // L: 44 + class421 var6 = (class421)var5.newInstance(); + var6.method7596(var1); + var4.field4537 = var6; + } catch (InstantiationException var7) { + } catch (IllegalAccessException var8) { } } - return var4; // L: 47 + return var4; } } diff --git a/runescape-client/src/main/java/class372.java b/runescape-client/src/main/java/class372.java index 2646dfb4e4..9f1bc8ba3c 100644 --- a/runescape-client/src/main/java/class372.java +++ b/runescape-client/src/main/java/class372.java @@ -5,8 +5,8 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("nv") public class class372 extends class373 { public class372(int var1) { - super(var1); // L: 7 - } // L: 8 + super(var1); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -24,66 +24,66 @@ public class class372 extends class373 { @Export("charToByteCp1252") public static byte charToByteCp1252(char var0) { byte var1; - if (var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) { // L: 12 + if (var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) { var1 = (byte)var0; - } else if (var0 == 8364) { // L: 13 + } else if (var0 == 8364) { var1 = -128; - } else if (var0 == 8218) { // L: 14 + } else if (var0 == 8218) { var1 = -126; - } else if (var0 == 402) { // L: 15 + } else if (var0 == 402) { var1 = -125; - } else if (var0 == 8222) { // L: 16 + } else if (var0 == 8222) { var1 = -124; - } else if (var0 == 8230) { // L: 17 + } else if (var0 == 8230) { var1 = -123; - } else if (var0 == 8224) { // L: 18 + } else if (var0 == 8224) { var1 = -122; - } else if (var0 == 8225) { // L: 19 + } else if (var0 == 8225) { var1 = -121; - } else if (var0 == 710) { // L: 20 + } else if (var0 == 710) { var1 = -120; - } else if (var0 == 8240) { // L: 21 + } else if (var0 == 8240) { var1 = -119; - } else if (var0 == 352) { // L: 22 + } else if (var0 == 352) { var1 = -118; - } else if (var0 == 8249) { // L: 23 + } else if (var0 == 8249) { var1 = -117; - } else if (var0 == 338) { // L: 24 + } else if (var0 == 338) { var1 = -116; - } else if (var0 == 381) { // L: 25 + } else if (var0 == 381) { var1 = -114; } else if (var0 == 8216) { - var1 = -111; // L: 26 - } else if (var0 == 8217) { // L: 27 + var1 = -111; + } else if (var0 == 8217) { var1 = -110; - } else if (var0 == 8220) { // L: 28 + } else if (var0 == 8220) { var1 = -109; - } else if (var0 == 8221) { // L: 29 + } else if (var0 == 8221) { var1 = -108; - } else if (var0 == 8226) { // L: 30 + } else if (var0 == 8226) { var1 = -107; - } else if (var0 == 8211) { // L: 31 + } else if (var0 == 8211) { var1 = -106; - } else if (var0 == 8212) { // L: 32 + } else if (var0 == 8212) { var1 = -105; - } else if (var0 == 732) { // L: 33 + } else if (var0 == 732) { var1 = -104; - } else if (var0 == 8482) { // L: 34 + } else if (var0 == 8482) { var1 = -103; - } else if (var0 == 353) { // L: 35 + } else if (var0 == 353) { var1 = -102; - } else if (var0 == 8250) { // L: 36 + } else if (var0 == 8250) { var1 = -101; - } else if (var0 == 339) { // L: 37 + } else if (var0 == 339) { var1 = -100; - } else if (var0 == 382) { // L: 38 + } else if (var0 == 382) { var1 = -98; - } else if (var0 == 376) { // L: 39 + } else if (var0 == 376) { var1 = -97; } else { - var1 = 63; // L: 40 + var1 = 63; } - return var1; // L: 41 + return var1; } } diff --git a/runescape-client/src/main/java/class373.java b/runescape-client/src/main/java/class373.java index 15618bd0e6..de3a9f1e42 100644 --- a/runescape-client/src/main/java/class373.java +++ b/runescape-client/src/main/java/class373.java @@ -10,7 +10,7 @@ public abstract class class373 implements class241 { class409 field4226; class373(int var1) { - } // L: 13 + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -26,46 +26,46 @@ public abstract class class373 implements class241 { ) public void method6778(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 17 - if (var2 == 0) { // L: 18 - return; // L: 60 + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; } - class369 var3 = (class369)class130.findEnumerated(Strings.method5508(), var2); // L: 19 - if (var3 != null) { // L: 20 - switch(var3.field4218) { // L: 21 + class369 var3 = (class369)class130.findEnumerated(Strings.method5508(), var2); + if (var3 != null) { + switch(var3.field4218) { case 1: - int var4 = var1.readUnsignedByte(); // L: 23 - int var7 = class407.field4439[var4]; // L: 26 + int var4 = var1.readUnsignedByte(); + int var7 = class407.field4439[var4]; class409 var5; - if (var7 == 1) { // L: 27 - var5 = class409.field4445; // L: 28 - } else if (var7 == 2) { // L: 31 - var5 = class409.field4449; // L: 32 - } else if (var7 == 3) { // L: 35 - var5 = class409.field4442; // L: 36 + if (var7 == 1) { + var5 = class409.field4445; + } else if (var7 == 2) { + var5 = class409.field4449; + } else if (var7 == 3) { + var5 = class409.field4442; } else { - var5 = null; // L: 39 + var5 = null; } - this.field4226 = var5; // L: 41 - if (this.field4226 != null) { // L: 42 + this.field4226 = var5; + if (this.field4226 != null) { break; } throw new IllegalStateException("Unknown ScriptVarType ID in VarType.decode: " + var4); case 2: - class295[] var6 = new class295[]{class295.field3791, class295.field3790, class295.field3789, class295.field3793}; // L: 49 - class130.findEnumerated(var6, var1.readUnsignedByte()); // L: 51 - break; // L: 52 + class295[] var6 = new class295[]{class295.field3791, class295.field3790, class295.field3789, class295.field3793}; + class130.findEnumerated(var6, var1.readUnsignedByte()); + break; case 3: - var1.readStringCp1252NullCircumfixed(); // L: 54 - break; // L: 55 + var1.readStringCp1252NullCircumfixed(); + break; default: - throw new IllegalStateException("Unrecognised VarTypeEncodingKey - " + var3); // L: 45 + throw new IllegalStateException("Unrecognised VarTypeEncodingKey - " + var3); } } else { - this.vmethod6785(var1, var2); // L: 58 + this.vmethod6785(var1, var2); } } } @@ -76,7 +76,7 @@ public abstract class class373 implements class241 { garbageValue = "255" ) boolean method6780() { - return this.field4226 != null; // L: 65 + return this.field4226 != null; } @ObfuscatedName("s") @@ -85,12 +85,12 @@ public abstract class class373 implements class241 { garbageValue = "-56" ) Object method6781() { - if (this.field4226 == class409.field4445) { // L: 69 - return 0; // L: 70 - } else if (this.field4226 == class409.field4442) { // L: 72 - return -1L; // L: 73 + if (this.field4226 == class409.field4445) { + return 0; + } else if (this.field4226 == class409.field4442) { + return -1L; } else { - return this.field4226 == class409.field4449 ? "" : null; // L: 75 76 78 + return this.field4226 == class409.field4449 ? "" : null; } } } diff --git a/runescape-client/src/main/java/class376.java b/runescape-client/src/main/java/class376.java index b843f0c1a1..f8ffb12ba5 100644 --- a/runescape-client/src/main/java/class376.java +++ b/runescape-client/src/main/java/class376.java @@ -17,13 +17,13 @@ public class class376 { String field4229; static { - field4231 = new class376("application/json"); // L: 4 - field4227 = new class376("text/plain"); // L: 5 + field4231 = new class376("application/json"); + field4227 = new class376("text/plain"); } class376(String var1) { - this.field4229 = var1; // L: 9 - } // L: 10 + this.field4229 = var1; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -31,6 +31,6 @@ public class class376 { garbageValue = "511276144" ) public String method6793() { - return this.field4229; // L: 13 + return this.field4229; } } diff --git a/runescape-client/src/main/java/class378.java b/runescape-client/src/main/java/class378.java index af31c85e70..aa1e683f81 100644 --- a/runescape-client/src/main/java/class378.java +++ b/runescape-client/src/main/java/class378.java @@ -8,14 +8,14 @@ public class class378 { static final int[] field4237; static { - field4233 = new int[16384]; // L: 8 - field4237 = new int[16384]; // L: 9 - double var0 = 3.834951969714103E-4D; // L: 12 + field4233 = new int[16384]; + field4237 = new int[16384]; + double var0 = 3.834951969714103E-4D; - for (int var2 = 0; var2 < 16384; ++var2) { // L: 13 - field4233[var2] = (int)(16384.0D * Math.sin(var0 * (double)var2)); // L: 14 - field4237[var2] = (int)(16384.0D * Math.cos((double)var2 * var0)); // L: 15 + for (int var2 = 0; var2 < 16384; ++var2) { + field4233[var2] = (int)(16384.0D * Math.sin(var0 * (double)var2)); + field4237[var2] = (int)(16384.0D * Math.cos((double)var2 * var0)); } - } // L: 17 + } } diff --git a/runescape-client/src/main/java/class379.java b/runescape-client/src/main/java/class379.java index 03cceff498..97ca58800a 100644 --- a/runescape-client/src/main/java/class379.java +++ b/runescape-client/src/main/java/class379.java @@ -16,14 +16,14 @@ public class class379 { static int cameraYaw; static { - field4238 = new int[2048]; // L: 13 - field4244 = new int[2048]; // L: 14 - double var0 = 0.0030679615757712823D; // L: 17 + field4238 = new int[2048]; + field4244 = new int[2048]; + double var0 = 0.0030679615757712823D; - for (int var2 = 0; var2 < 2048; ++var2) { // L: 18 - field4238[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2)); // L: 19 - field4244[var2] = (int)(65536.0D * Math.cos(var0 * (double)var2)); // L: 20 + for (int var2 = 0; var2 < 2048; ++var2) { + field4238[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2)); + field4244[var2] = (int)(65536.0D * Math.cos(var0 * (double)var2)); } - } // L: 22 + } } diff --git a/runescape-client/src/main/java/class384.java b/runescape-client/src/main/java/class384.java index bfc9e21593..b7c0ff9dc2 100644 --- a/runescape-client/src/main/java/class384.java +++ b/runescape-client/src/main/java/class384.java @@ -6,6 +6,6 @@ public class class384 extends Node { public long field4254; public class384(long var1) { - this.field4254 = var1; // L: 7 - } // L: 8 + this.field4254 = var1; + } } diff --git a/runescape-client/src/main/java/class398.java b/runescape-client/src/main/java/class398.java index d3145f3e23..e68c90c641 100644 --- a/runescape-client/src/main/java/class398.java +++ b/runescape-client/src/main/java/class398.java @@ -27,8 +27,8 @@ public class class398 implements class397 { descriptor = "(Lpq;)V" ) public class398(class425 var1) { - this.field4394 = var1; // L: 15 - } // L: 16 + this.field4394 = var1; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -36,14 +36,14 @@ public class class398 implements class397 { garbageValue = "233631954" ) public int vmethod7128(int var1) { - if (this.field4396 != null) { // L: 20 - class426 var2 = (class426)this.field4396.get(var1); // L: 21 + if (this.field4396 != null) { + class426 var2 = (class426)this.field4396.get(var1); if (var2 != null) { - return (Integer)var2.field4537; // L: 22 + return (Integer)var2.field4537; } } - return (Integer)this.field4394.vmethod7625(var1); // L: 24 + return (Integer)this.field4394.vmethod7625(var1); } @ObfuscatedName("b") @@ -52,21 +52,21 @@ public class class398 implements class397 { garbageValue = "3016419" ) public void vmethod7129(int var1, Object var2) { - if (this.field4396 == null) { // L: 29 - this.field4396 = new HashMap(); // L: 30 - this.field4396.put(var1, new class426(var1, var2)); // L: 31 + if (this.field4396 == null) { + this.field4396 = new HashMap(); + this.field4396.put(var1, new class426(var1, var2)); } else { - class426 var3 = (class426)this.field4396.get(var1); // L: 34 + class426 var3 = (class426)this.field4396.get(var1); if (var3 == null) { - this.field4396.put(var1, new class426(var1, var2)); // L: 35 + this.field4396.put(var1, new class426(var1, var2)); } else { - var3.field4537 = var2; // L: 36 + var3.field4537 = var2; } } - } // L: 38 + } public Iterator iterator() { - return this.field4396 == null ? Collections.emptyList().iterator() : this.field4396.values().iterator(); // L: 42 43 + return this.field4396 == null ? Collections.emptyList().iterator() : this.field4396.values().iterator(); } } diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index 388e1e54e3..24f2b63c2b 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -27,20 +27,20 @@ public final class class4 { garbageValue = "96" ) static IndexedSprite method22(AbstractArchive var0, int var1, int var2) { - if (!class147.method3009(var0, var1, var2)) { // L: 23 + if (!class147.method3009(var0, var1, var2)) { return null; } else { - IndexedSprite var4 = new IndexedSprite(); // L: 26 - var4.width = class432.SpriteBuffer_spriteWidth; // L: 27 - var4.height = class432.SpriteBuffer_spriteHeight; // L: 28 - var4.xOffset = class141.SpriteBuffer_xOffsets[0]; // L: 29 - var4.yOffset = RouteStrategy.SpriteBuffer_yOffsets[0]; // L: 30 - var4.subWidth = class432.SpriteBuffer_spriteWidths[0]; // L: 31 - var4.subHeight = class330.SpriteBuffer_spriteHeights[0]; // L: 32 - var4.palette = class432.SpriteBuffer_spritePalette; // L: 33 - var4.pixels = class369.SpriteBuffer_pixels[0]; // L: 34 - UserComparator3.method2529(); // L: 35 - return var4; // L: 38 + IndexedSprite var4 = new IndexedSprite(); + var4.width = class432.SpriteBuffer_spriteWidth; + var4.height = class432.SpriteBuffer_spriteHeight; + var4.xOffset = class141.SpriteBuffer_xOffsets[0]; + var4.yOffset = RouteStrategy.SpriteBuffer_yOffsets[0]; + var4.subWidth = class432.SpriteBuffer_spriteWidths[0]; + var4.subHeight = class330.SpriteBuffer_spriteHeights[0]; + var4.palette = class432.SpriteBuffer_spritePalette; + var4.pixels = class369.SpriteBuffer_pixels[0]; + UserComparator3.method2529(); + return var4; } } @@ -51,24 +51,24 @@ public final class class4 { ) @Export("loadClassFromDescriptor") static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { - if (var0.equals("B")) { // L: 212 + if (var0.equals("B")) { return Byte.TYPE; - } else if (var0.equals("I")) { // L: 213 + } else if (var0.equals("I")) { return Integer.TYPE; - } else if (var0.equals("S")) { // L: 214 + } else if (var0.equals("S")) { return Short.TYPE; - } else if (var0.equals("J")) { // L: 215 + } else if (var0.equals("J")) { return Long.TYPE; } else if (var0.equals("Z")) { - return Boolean.TYPE; // L: 216 - } else if (var0.equals("F")) { // L: 217 + return Boolean.TYPE; + } else if (var0.equals("F")) { return Float.TYPE; - } else if (var0.equals("D")) { // L: 218 + } else if (var0.equals("D")) { return Double.TYPE; - } else if (var0.equals("C")) { // L: 219 + } else if (var0.equals("C")) { return Character.TYPE; } else { - return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); // L: 220 221 + return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); } } @@ -78,27 +78,27 @@ public final class class4 { garbageValue = "1064743606" ) static int method20(int var0, Script var1, boolean var2) { - Widget var3 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 1264 - if (var0 == ScriptOpcodes.IF_GETX) { // L: 1265 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.x; // L: 1266 - return 1; // L: 1267 - } else if (var0 == ScriptOpcodes.IF_GETY) { // L: 1269 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.y; // L: 1270 - return 1; // L: 1271 - } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { // L: 1273 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.width; // L: 1274 - return 1; // L: 1275 - } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { // L: 1277 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.height; // L: 1278 - return 1; // L: 1279 - } else if (var0 == ScriptOpcodes.IF_GETHIDE) { // L: 1281 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1282 - return 1; // L: 1283 - } else if (var0 == ScriptOpcodes.IF_GETLAYER) { // L: 1285 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.parentId; // L: 1286 - return 1; // L: 1287 + Widget var3 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); + if (var0 == ScriptOpcodes.IF_GETX) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.x; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETY) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.y; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.width; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.height; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETHIDE) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETLAYER) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.parentId; + return 1; } else { - return 2; // L: 1289 + return 2; } } @@ -108,41 +108,41 @@ public final class class4 { garbageValue = "863629415" ) public static final PcmPlayer method29(TaskHandler var0, int var1, int var2) { - if (class339.field4058 == 0) { // L: 49 + if (class339.field4058 == 0) { throw new IllegalStateException(); - } else if (var1 >= 0 && var1 < 2) { // L: 50 - if (var2 < 256) { // L: 51 + } else if (var1 >= 0 && var1 < 2) { + if (var2 < 256) { var2 = 256; } try { - PcmPlayer var3 = class11.pcmPlayerProvider.player(); // L: 53 - var3.samples = new int[256 * (SpriteMask.PcmPlayer_stereo ? 2 : 1)]; // L: 54 - var3.field298 = var2; // L: 55 - var3.init(); // L: 56 - var3.capacity = (var2 & -1024) + 1024; // L: 57 - if (var3.capacity > 16384) { // L: 58 + PcmPlayer var3 = class11.pcmPlayerProvider.player(); + var3.samples = new int[256 * (SpriteMask.PcmPlayer_stereo ? 2 : 1)]; + var3.field298 = var2; + var3.init(); + var3.capacity = (var2 & -1024) + 1024; + if (var3.capacity > 16384) { var3.capacity = 16384; } - var3.open(var3.capacity); // L: 59 - if (UserComparator10.field1339 > 0 && PcmPlayer.soundSystem == null) { // L: 60 - PcmPlayer.soundSystem = new SoundSystem(); // L: 61 - PcmPlayer.soundSystemExecutor = Executors.newScheduledThreadPool(1); // L: 62 - PcmPlayer.soundSystemExecutor.scheduleAtFixedRate(PcmPlayer.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); // L: 63 + var3.open(var3.capacity); + if (UserComparator10.field1339 > 0 && PcmPlayer.soundSystem == null) { + PcmPlayer.soundSystem = new SoundSystem(); + PcmPlayer.soundSystemExecutor = Executors.newScheduledThreadPool(1); + PcmPlayer.soundSystemExecutor.scheduleAtFixedRate(PcmPlayer.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); } - if (PcmPlayer.soundSystem != null) { // L: 65 - if (PcmPlayer.soundSystem.players[var1] != null) { // L: 66 + if (PcmPlayer.soundSystem != null) { + if (PcmPlayer.soundSystem.players[var1] != null) { throw new IllegalArgumentException(); } - PcmPlayer.soundSystem.players[var1] = var3; // L: 67 + PcmPlayer.soundSystem.players[var1] = var3; } - return var3; // L: 69 - } catch (Throwable var4) { // L: 71 - return new PcmPlayer(); // L: 72 + return var3; + } catch (Throwable var4) { + return new PcmPlayer(); } } else { throw new IllegalArgumentException(); @@ -155,53 +155,53 @@ public final class class4 { garbageValue = "-2142198504" ) static int method27(int var0, Script var1, boolean var2) { - if (var0 != 7000 && var0 != 7005 && var0 != 7010 && var0 != 7015 && var0 != 7020 && var0 != 7025 && var0 != 7030 && var0 != 7035) { // L: 4337 - if (var0 != 7001 && var0 != 7002 && var0 != 7011 && var0 != 7012 && var0 != 7021 && var0 != 7022) { // L: 4341 - if (var0 != 7003 && var0 != 7013 && var0 != 7023) { // L: 4345 - if (var0 != 7006 && var0 != 7007 && var0 != 7016 && var0 != 7017 && var0 != 7026 && var0 != 7027) { // L: 4349 - if (var0 != 7008 && var0 != 7018 && var0 != 7028) { // L: 4353 - if (var0 != 7031 && var0 != 7032) { // L: 4357 - if (var0 == 7033) { // L: 4362 - --class13.Interpreter_stringStackSize; // L: 4363 - return 1; // L: 4364 - } else if (var0 != 7036 && var0 != 7037) { // L: 4366 - if (var0 == 7038) { // L: 4370 - --IsaacCipher.Interpreter_intStackSize; // L: 4371 - return 1; // L: 4372 - } else if (var0 != 7004 && var0 != 7009 && var0 != 7014 && var0 != 7019 && var0 != 7024 && var0 != 7029 && var0 != 7034 && var0 != 7039) { // L: 4374 - return 2; // L: 4378 + if (var0 != 7000 && var0 != 7005 && var0 != 7010 && var0 != 7015 && var0 != 7020 && var0 != 7025 && var0 != 7030 && var0 != 7035) { + if (var0 != 7001 && var0 != 7002 && var0 != 7011 && var0 != 7012 && var0 != 7021 && var0 != 7022) { + if (var0 != 7003 && var0 != 7013 && var0 != 7023) { + if (var0 != 7006 && var0 != 7007 && var0 != 7016 && var0 != 7017 && var0 != 7026 && var0 != 7027) { + if (var0 != 7008 && var0 != 7018 && var0 != 7028) { + if (var0 != 7031 && var0 != 7032) { + if (var0 == 7033) { + --class13.Interpreter_stringStackSize; + return 1; + } else if (var0 != 7036 && var0 != 7037) { + if (var0 == 7038) { + --IsaacCipher.Interpreter_intStackSize; + return 1; + } else if (var0 != 7004 && var0 != 7009 && var0 != 7014 && var0 != 7019 && var0 != 7024 && var0 != 7029 && var0 != 7034 && var0 != 7039) { + return 2; } else { - --IsaacCipher.Interpreter_intStackSize; // L: 4375 - return 1; // L: 4376 + --IsaacCipher.Interpreter_intStackSize; + return 1; } } else { - IsaacCipher.Interpreter_intStackSize -= 2; // L: 4367 - return 1; // L: 4368 + IsaacCipher.Interpreter_intStackSize -= 2; + return 1; } } else { - --class13.Interpreter_stringStackSize; // L: 4358 - --IsaacCipher.Interpreter_intStackSize; // L: 4359 - return 1; // L: 4360 + --class13.Interpreter_stringStackSize; + --IsaacCipher.Interpreter_intStackSize; + return 1; } } else { - --IsaacCipher.Interpreter_intStackSize; // L: 4354 - return 1; // L: 4355 + --IsaacCipher.Interpreter_intStackSize; + return 1; } } else { - IsaacCipher.Interpreter_intStackSize -= 2; // L: 4350 - return 1; // L: 4351 + IsaacCipher.Interpreter_intStackSize -= 2; + return 1; } } else { - IsaacCipher.Interpreter_intStackSize -= 2; // L: 4346 - return 1; // L: 4347 + IsaacCipher.Interpreter_intStackSize -= 2; + return 1; } } else { - IsaacCipher.Interpreter_intStackSize -= 3; // L: 4342 - return 1; // L: 4343 + IsaacCipher.Interpreter_intStackSize -= 3; + return 1; } } else { - IsaacCipher.Interpreter_intStackSize -= 5; // L: 4338 - return 1; // L: 4339 + IsaacCipher.Interpreter_intStackSize -= 5; + return 1; } } @@ -211,37 +211,37 @@ public final class class4 { garbageValue = "-85" ) static final void method26(PendingSpawn var0) { - long var1 = 0L; // L: 7958 - int var3 = -1; // L: 7959 - int var4 = 0; // L: 7960 - int var5 = 0; // L: 7961 - if (var0.type == 0) { // L: 7962 + long var1 = 0L; + int var3 = -1; + int var4 = 0; + int var5 = 0; + if (var0.type == 0) { var1 = class7.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); } - if (var0.type == 1) { // L: 7963 + if (var0.type == 1) { var1 = class7.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); } - if (var0.type == 2) { // L: 7964 + if (var0.type == 2) { var1 = class7.scene.getGameObjectTag(var0.plane, var0.x, var0.y); } if (var0.type == 3) { - var1 = class7.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); // L: 7965 + var1 = class7.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); } - if (0L != var1) { // L: 7966 - int var6 = class7.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); // L: 7967 - var3 = PacketWriter.Entity_unpackID(var1); // L: 7968 - var4 = var6 & 31; // L: 7969 - var5 = var6 >> 6 & 3; // L: 7970 + if (0L != var1) { + int var6 = class7.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); + var3 = PacketWriter.Entity_unpackID(var1); + var4 = var6 & 31; + var5 = var6 >> 6 & 3; } - var0.objectId = var3; // L: 7972 - var0.field1080 = var4; // L: 7973 - var0.field1087 = var5; // L: 7974 - } // L: 7975 + var0.objectId = var3; + var0.field1080 = var4; + var0.field1087 = var5; + } @ObfuscatedName("ij") @ObfuscatedSignature( @@ -249,75 +249,75 @@ public final class class4 { garbageValue = "955034020" ) static final void method25() { - int var0 = ModeWhere.menuX; // L: 8818 - int var1 = BufferedSink.menuY; // L: 8819 - int var2 = GameObject.menuWidth; // L: 8820 - int var3 = UserComparator3.menuHeight; // L: 8821 - int var4 = 6116423; // L: 8822 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, var4); // L: 8823 - Rasterizer2D.Rasterizer2D_fillRectangle(var0 + 1, var1 + 1, var2 - 2, 16, 0); // L: 8824 - Rasterizer2D.Rasterizer2D_drawRectangle(var0 + 1, var1 + 18, var2 - 2, var3 - 19, 0); // L: 8825 - class136.fontBold12.draw("Choose Option", var0 + 3, var1 + 14, var4, -1); // L: 8826 - int var5 = MouseHandler.MouseHandler_x; // L: 8827 - int var6 = MouseHandler.MouseHandler_y; // L: 8828 + int var0 = ModeWhere.menuX; + int var1 = BufferedSink.menuY; + int var2 = GameObject.menuWidth; + int var3 = UserComparator3.menuHeight; + int var4 = 6116423; + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, var4); + Rasterizer2D.Rasterizer2D_fillRectangle(var0 + 1, var1 + 1, var2 - 2, 16, 0); + Rasterizer2D.Rasterizer2D_drawRectangle(var0 + 1, var1 + 18, var2 - 2, var3 - 19, 0); + class136.fontBold12.draw("Choose Option", var0 + 3, var1 + 14, var4, -1); + int var5 = MouseHandler.MouseHandler_x; + int var6 = MouseHandler.MouseHandler_y; int var7; int var8; int var9; - for (var7 = 0; var7 < Client.menuOptionsCount; ++var7) { // L: 8829 - var8 = (Client.menuOptionsCount - 1 - var7) * 15 + var1 + 31; // L: 8830 - var9 = 16777215; // L: 8831 - if (var5 > var0 && var5 < var2 + var0 && var6 > var8 - 13 && var6 < var8 + 3) { // L: 8832 + for (var7 = 0; var7 < Client.menuOptionsCount; ++var7) { + var8 = (Client.menuOptionsCount - 1 - var7) * 15 + var1 + 31; + var9 = 16777215; + if (var5 > var0 && var5 < var2 + var0 && var6 > var8 - 13 && var6 < var8 + 3) { var9 = 16776960; } - Font var12 = class136.fontBold12; // L: 8833 + Font var12 = class136.fontBold12; String var13; - if (var7 < 0) { // L: 8836 - var13 = ""; // L: 8837 - } else if (Client.menuTargets[var7].length() > 0) { // L: 8840 + if (var7 < 0) { + var13 = ""; + } else if (Client.menuTargets[var7].length() > 0) { var13 = Client.menuActions[var7] + " " + Client.menuTargets[var7]; } else { - var13 = Client.menuActions[var7]; // L: 8841 + var13 = Client.menuActions[var7]; } - var12.draw(var13, var0 + 3, var8, var9, 0); // L: 8843 + var12.draw(var13, var0 + 3, var8, var9, 0); } - var7 = ModeWhere.menuX; // L: 8845 - var8 = BufferedSink.menuY; // L: 8846 - var9 = GameObject.menuWidth; // L: 8847 - int var10 = UserComparator3.menuHeight; // L: 8848 + var7 = ModeWhere.menuX; + var8 = BufferedSink.menuY; + var9 = GameObject.menuWidth; + int var10 = UserComparator3.menuHeight; - for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { // L: 8850 - if (Client.rootWidgetXs[var11] + Client.rootWidgetWidths[var11] > var7 && Client.rootWidgetXs[var11] < var9 + var7 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var8 + var10) { // L: 8851 + for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { + if (Client.rootWidgetXs[var11] + Client.rootWidgetWidths[var11] > var7 && Client.rootWidgetXs[var11] < var9 + var7 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var8 + var10) { Client.field686[var11] = true; } } - } // L: 8854 + } @ObfuscatedName("kg") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-5742457" + garbageValue = "985561327" ) static final void method28() { - PacketBufferNode var0 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2898, Client.packetWriter.isaacCipher); // L: 12251 - Client.packetWriter.addNode(var0); // L: 12252 - Interpreter.field816 = true; // L: 12253 + PacketBufferNode var0 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2898, Client.packetWriter.isaacCipher); + Client.packetWriter.addNode(var0); + Interpreter.field816 = true; - for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { // L: 12254 - if (var1.type == 0 || var1.type == 3) { // L: 12255 + for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { + if (var1.type == 0 || var1.type == 3) { class10.closeInterface(var1, true); } } - if (Client.meslayerContinueWidget != null) { // L: 12257 - SecureRandomCallable.invalidateWidget(Client.meslayerContinueWidget); // L: 12258 - Client.meslayerContinueWidget = null; // L: 12259 + if (Client.meslayerContinueWidget != null) { + SecureRandomCallable.invalidateWidget(Client.meslayerContinueWidget); + Client.meslayerContinueWidget = null; } - Interpreter.field816 = false; // L: 12261 - } // L: 12262 + Interpreter.field816 = false; + } } diff --git a/runescape-client/src/main/java/class400.java b/runescape-client/src/main/java/class400.java index 8acbf7697b..11cf003467 100644 --- a/runescape-client/src/main/java/class400.java +++ b/runescape-client/src/main/java/class400.java @@ -9,7 +9,7 @@ public class class400 { static final char[] field4410; static { - field4411 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; // L: 8 + field4411 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; field4410 = new char[]{'[', ']', '#'}; } @@ -19,23 +19,23 @@ public class class400 { garbageValue = "980232052" ) public static int method7147(byte[] var0, int var1, CharSequence var2) { - int var3 = var2.length(); // L: 9 - int var4 = var1; // L: 10 + int var3 = var2.length(); + int var4 = var1; - for (int var5 = 0; var5 < var3; ++var5) { // L: 11 - char var6 = var2.charAt(var5); // L: 12 - if (var6 <= 127) { // L: 13 - var0[var4++] = (byte)var6; // L: 14 - } else if (var6 <= 2047) { // L: 16 - var0[var4++] = (byte)(192 | var6 >> 6); // L: 17 - var0[var4++] = (byte)(128 | var6 & '?'); // L: 18 + for (int var5 = 0; var5 < var3; ++var5) { + char var6 = var2.charAt(var5); + if (var6 <= 127) { + var0[var4++] = (byte)var6; + } else if (var6 <= 2047) { + var0[var4++] = (byte)(192 | var6 >> 6); + var0[var4++] = (byte)(128 | var6 & '?'); } else { - var0[var4++] = (byte)(224 | var6 >> '\f'); // L: 21 - var0[var4++] = (byte)(128 | var6 >> 6 & 63); // L: 22 - var0[var4++] = (byte)(128 | var6 & '?'); // L: 23 + var0[var4++] = (byte)(224 | var6 >> '\f'); + var0[var4++] = (byte)(128 | var6 >> 6 & 63); + var0[var4++] = (byte)(128 | var6 & '?'); } } - return var4 - var1; // L: 26 + return var4 - var1; } } diff --git a/runescape-client/src/main/java/class403.java b/runescape-client/src/main/java/class403.java index b1fa9995d4..1c1e24df71 100644 --- a/runescape-client/src/main/java/class403.java +++ b/runescape-client/src/main/java/class403.java @@ -20,20 +20,20 @@ class class403 implements Iterator { descriptor = "(Loo;)V" ) class403(class404 var1) { - this.this$0 = var1; // L: 51 + this.this$0 = var1; } public void remove() { - throw new UnsupportedOperationException(); // L: 69 + throw new UnsupportedOperationException(); } public Object next() { - int var1 = ++this.field4432 - 1; // L: 61 - class372 var2 = (class372)this.this$0.field4436.get((long)var1); // L: 62 - return var2 != null ? var2 : this.this$0.method7215(var1); // L: 63 64 + int var1 = ++this.field4432 - 1; + class372 var2 = (class372)this.this$0.field4436.get((long)var1); + return var2 != null ? var2 : this.this$0.method7215(var1); } public boolean hasNext() { - return this.field4432 < this.this$0.method6759(); // L: 56 + return this.field4432 < this.this$0.method6759(); } } diff --git a/runescape-client/src/main/java/class404.java b/runescape-client/src/main/java/class404.java index 4118ae3689..920c5683bc 100644 --- a/runescape-client/src/main/java/class404.java +++ b/runescape-client/src/main/java/class404.java @@ -26,11 +26,11 @@ public class class404 extends class371 implements class244 { descriptor = "(Lko;ILlf;Lku;)V" ) public class404(StudioGame var1, int var2, Language var3, AbstractArchive var4) { - super(var1, var3, var4 != null ? var4.getGroupFileCount(var2) : 0); // L: 19 - this.field4436 = new DemotingHashTable(64); // L: 15 - this.field4435 = var4; // L: 20 - this.field4437 = var2; // L: 21 - } // L: 22 + super(var1, var3, var4 != null ? var4.getGroupFileCount(var2) : 0); + this.field4436 = new DemotingHashTable(64); + this.field4435 = var4; + this.field4437 = var2; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -38,14 +38,14 @@ public class class404 extends class371 implements class244 { garbageValue = "1453466959" ) protected class373 vmethod7209(int var1) { - synchronized(this.field4436) { // L: 26 - class372 var2 = (class372)this.field4436.get((long)var1); // L: 27 - if (var2 == null) { // L: 28 - var2 = this.method7215(var1); // L: 29 - this.field4436.method4958(var2, (long)var1); // L: 30 + synchronized(this.field4436) { + class372 var2 = (class372)this.field4436.get((long)var1); + if (var2 == null) { + var2 = this.method7215(var1); + this.field4436.method4958(var2, (long)var1); } - return var2; // L: 33 + return var2; } } @@ -55,13 +55,13 @@ public class class404 extends class371 implements class244 { garbageValue = "277242473" ) class372 method7215(int var1) { - byte[] var2 = this.field4435.takeFile(this.field4437, var1); // L: 37 - class372 var3 = new class372(var1); // L: 38 - if (var2 != null) { // L: 39 + byte[] var2 = this.field4435.takeFile(this.field4437, var1); + class372 var3 = new class372(var1); + if (var2 != null) { var3.method6778(new Buffer(var2)); } - return var3; // L: 40 + return var3; } @ObfuscatedName("a") @@ -70,13 +70,13 @@ public class class404 extends class371 implements class244 { garbageValue = "-1968440370" ) public void method7216() { - synchronized(this.field4436) { // L: 44 - this.field4436.clear(); // L: 45 + synchronized(this.field4436) { + this.field4436.clear(); } - } // L: 47 + } public Iterator iterator() { - return new class403(this); // L: 51 + return new class403(this); } @ObfuscatedName("p") @@ -86,6 +86,6 @@ public class class404 extends class371 implements class244 { ) @Export("Widget_unpackTargetMask") public static int Widget_unpackTargetMask(int var0) { - return var0 >> 11 & 63; // L: 17 + return var0 >> 11 & 63; } } diff --git a/runescape-client/src/main/java/class406.java b/runescape-client/src/main/java/class406.java index 08718dc63d..5840b65409 100644 --- a/runescape-client/src/main/java/class406.java +++ b/runescape-client/src/main/java/class406.java @@ -9,8 +9,8 @@ final class class406 implements class405 { garbageValue = "246575309" ) public void vmethod7273(Object var1, Buffer var2) { - this.method7229((Integer)var1, var2); // L: 21 - } // L: 22 + this.method7229((Integer)var1, var2); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -18,7 +18,7 @@ final class class406 implements class405 { garbageValue = "3" ) public Object vmethod7271(Buffer var1) { - return var1.readInt(); // L: 17 + return var1.readInt(); } @ObfuscatedName("j") @@ -27,6 +27,6 @@ final class class406 implements class405 { garbageValue = "2131045712" ) void method7229(Integer var1, Buffer var2) { - var2.writeInt(var1); // L: 12 - } // L: 13 + var2.writeInt(var1); + } } diff --git a/runescape-client/src/main/java/class407.java b/runescape-client/src/main/java/class407.java index 12da001b8d..a9f7e0bf46 100644 --- a/runescape-client/src/main/java/class407.java +++ b/runescape-client/src/main/java/class407.java @@ -6,6 +6,6 @@ public class class407 { public static final int[] field4439; static { - field4439 = 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 + field4439 = 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}; } } diff --git a/runescape-client/src/main/java/class408.java b/runescape-client/src/main/java/class408.java index e4de978754..ddf1dc9742 100644 --- a/runescape-client/src/main/java/class408.java +++ b/runescape-client/src/main/java/class408.java @@ -18,8 +18,8 @@ final class class408 implements class405 { garbageValue = "246575309" ) public void vmethod7273(Object var1, Buffer var2) { - this.method7238((Long)var1, var2); // L: 35 - } // L: 36 + this.method7238((Long)var1, var2); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -27,7 +27,7 @@ final class class408 implements class405 { garbageValue = "3" ) public Object vmethod7271(Buffer var1) { - return var1.readLong(); // L: 31 + return var1.readLong(); } @ObfuscatedName("j") @@ -36,6 +36,6 @@ final class class408 implements class405 { garbageValue = "-1540315910" ) void method7238(Long var1, Buffer var2) { - var2.writeLong(var1); // L: 26 - } // L: 27 + var2.writeLong(var1); + } } diff --git a/runescape-client/src/main/java/class409.java b/runescape-client/src/main/java/class409.java index 4b1d001a3a..04fed53ffc 100644 --- a/runescape-client/src/main/java/class409.java +++ b/runescape-client/src/main/java/class409.java @@ -42,20 +42,20 @@ public class class409 implements MouseWheel { final class405 field4447; static { - field4445 = new class409(1, 0, Integer.class, new class406()); // L: 10 - field4442 = new class409(0, 1, Long.class, new class408()); // L: 24 - field4449 = new class409(2, 2, String.class, new class410()); // L: 38 + field4445 = new class409(1, 0, Integer.class, new class406()); + field4442 = new class409(0, 1, Long.class, new class408()); + field4449 = new class409(2, 2, String.class, new class410()); } @ObfuscatedSignature( descriptor = "(IILjava/lang/Class;Loq;)V" ) class409(int var1, int var2, Class var3, class405 var4) { - this.field4444 = var1; // L: 58 - this.field4452 = var2; // L: 59 - this.field4446 = var3; // L: 60 - this.field4447 = var4; // L: 61 - } // L: 62 + this.field4444 = var1; + this.field4452 = var2; + this.field4446 = var3; + this.field4447 = var4; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -64,7 +64,7 @@ public class class409 implements MouseWheel { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field4452; // L: 96 + return this.field4452; } @ObfuscatedName("n") @@ -73,7 +73,7 @@ public class class409 implements MouseWheel { garbageValue = "2103066470" ) public Object method7250(Buffer var1) { - return this.field4447.vmethod7271(var1); // L: 100 + return this.field4447.vmethod7271(var1); } @ObfuscatedName("c") @@ -82,17 +82,17 @@ public class class409 implements MouseWheel { garbageValue = "85005333" ) public static class409 method7247(Class var0) { - class409[] var1 = new class409[]{field4442, field4449, field4445}; // L: 68 - class409[] var2 = var1; // L: 70 + class409[] var1 = new class409[]{field4442, field4449, field4445}; + class409[] var2 = var1; - for (int var3 = 0; var3 < var2.length; ++var3) { // L: 71 - class409 var4 = var2[var3]; // L: 72 - if (var4.field4446 == var0) { // L: 74 + for (int var3 = 0; var3 < var2.length; ++var3) { + class409 var4 = var2[var3]; + if (var4.field4446 == var0) { return var4; } } - return null; // L: 78 + return null; } @ObfuscatedName("p") @@ -101,9 +101,9 @@ public class class409 implements MouseWheel { garbageValue = "-1411483047" ) public static void method7255(Object var0, Buffer var1) { - class405 var2 = method7248(var0.getClass()); // L: 83 - var2.vmethod7273(var0, var1); // L: 84 - } // L: 85 + class405 var2 = method7248(var0.getClass()); + var2.vmethod7273(var0, var1); + } @ObfuscatedName("w") @ObfuscatedSignature( @@ -111,11 +111,11 @@ public class class409 implements MouseWheel { garbageValue = "-693782319" ) static class405 method7248(Class var0) { - class409 var1 = method7247(var0); // L: 89 + class409 var1 = method7247(var0); if (var1 == null) { - throw new IllegalArgumentException(); // L: 90 + throw new IllegalArgumentException(); } else { - return var1.field4447; // L: 91 + return var1.field4447; } } @@ -125,12 +125,12 @@ public class class409 implements MouseWheel { garbageValue = "10" ) static void method7269(SequenceDefinition var0, int var1, int var2, int var3) { - if (Client.soundEffectCount < 50 && SecureRandomFuture.clientPreferences.areaSoundEffectsVolume != 0) { // L: 4303 - if (var0.soundEffects != null && var1 < var0.soundEffects.length) { // L: 4304 - class315.method5816(var0.soundEffects[var1], var2, var3); // L: 4305 + if (Client.soundEffectCount < 50 && SecureRandomFuture.clientPreferences.areaSoundEffectsVolume != 0) { + if (var0.soundEffects != null && var1 < var0.soundEffects.length) { + class315.method5816(var0.soundEffects[var1], var2, var3); } } - } // L: 4306 + } @ObfuscatedName("kv") @ObfuscatedSignature( @@ -139,24 +139,24 @@ public class class409 implements MouseWheel { ) @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: 12416 - if (var6 > 4225 && var6 < 90000) { // L: 12417 - int var7 = Client.camAngleY & 2047; // L: 12418 - int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 12419 - int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 12420 - int var10 = var9 * var2 + var3 * var8 >> 16; // L: 12421 - int var11 = var3 * var9 - var8 * var2 >> 16; // L: 12422 - double var12 = Math.atan2((double)var10, (double)var11); // L: 12423 - int var14 = var5.width / 2 - 25; // L: 12424 - int var15 = (int)(Math.sin(var12) * (double)var14); // L: 12425 - int var16 = (int)(Math.cos(var12) * (double)var14); // L: 12426 - byte var17 = 20; // L: 12427 - PcmPlayer.redHintArrowSprite.method7807(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); // L: 12428 + int var6 = var3 * var3 + var2 * var2; + if (var6 > 4225 && var6 < 90000) { + int var7 = Client.camAngleY & 2047; + int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; + int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; + int var10 = var9 * var2 + var3 * var8 >> 16; + int var11 = var3 * var9 - var8 * var2 >> 16; + double var12 = Math.atan2((double)var10, (double)var11); + int var14 = var5.width / 2 - 25; + int var15 = (int)(Math.sin(var12) * (double)var14); + int var16 = (int)(Math.cos(var12) * (double)var14); + byte var17 = 20; + PcmPlayer.redHintArrowSprite.method7807(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); } else { - ArchiveDisk.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); // L: 12430 + ArchiveDisk.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); } - } // L: 12431 + } @ObfuscatedName("lw") @ObfuscatedSignature( @@ -164,8 +164,8 @@ public class class409 implements MouseWheel { garbageValue = "968032727" ) static final void method7267() { - Client.field671 = Client.cycleCntr; // L: 12472 - } // L: 12473 + Client.field671 = Client.cycleCntr; + } @ObfuscatedName("li") @ObfuscatedSignature( @@ -174,11 +174,11 @@ public class class409 implements MouseWheel { ) @Export("clanKickUser") static final void clanKickUser(String var0) { - if (Players.friendsChat != null) { // L: 12486 - PacketBufferNode var1 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2828, Client.packetWriter.isaacCipher); // L: 12487 - var1.packetBuffer.writeByte(class116.stringCp1252NullTerminatedByteSize(var0)); // L: 12488 - var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 12489 - Client.packetWriter.addNode(var1); // L: 12490 + if (Players.friendsChat != null) { + PacketBufferNode var1 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2828, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(class116.stringCp1252NullTerminatedByteSize(var0)); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); } - } // L: 12491 + } } diff --git a/runescape-client/src/main/java/class410.java b/runescape-client/src/main/java/class410.java index 1445b1ed7d..c79a974bd7 100644 --- a/runescape-client/src/main/java/class410.java +++ b/runescape-client/src/main/java/class410.java @@ -17,8 +17,8 @@ final class class410 implements class405 { garbageValue = "246575309" ) public void vmethod7273(Object var1, Buffer var2) { - this.method7275((String)var1, var2); // L: 49 - } // L: 50 + this.method7275((String)var1, var2); + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -26,7 +26,7 @@ final class class410 implements class405 { garbageValue = "3" ) public Object vmethod7271(Buffer var1) { - return var1.readStringCp1252NullTerminated(); // L: 45 + return var1.readStringCp1252NullTerminated(); } @ObfuscatedName("j") @@ -35,8 +35,8 @@ final class class410 implements class405 { garbageValue = "1797008189" ) void method7275(String var1, Buffer var2) { - var2.writeStringCp1252NullTerminated(var1); // L: 40 - } // L: 41 + var2.writeStringCp1252NullTerminated(var1); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -45,17 +45,17 @@ final class class410 implements class405 { ) @Export("getScript") static Script getScript(int var0) { - Script var1 = (Script)Script.Script_cached.get((long)var0); // L: 26 - if (var1 != null) { // L: 27 + Script var1 = (Script)Script.Script_cached.get((long)var0); + if (var1 != null) { return var1; } else { - byte[] var2 = TaskHandler.archive12.takeFile(var0, 0); // L: 28 - if (var2 == null) { // L: 29 - return null; // L: 30 + byte[] var2 = TaskHandler.archive12.takeFile(var0, 0); + if (var2 == null) { + return null; } else { - var1 = class145.newScript(var2); // L: 32 - Script.Script_cached.put(var1, (long)var0); // L: 33 - return var1; // L: 34 + var1 = class145.newScript(var2); + Script.Script_cached.put(var1, (long)var0); + return var1; } } } diff --git a/runescape-client/src/main/java/class411.java b/runescape-client/src/main/java/class411.java index 2113a363c1..2d85d7776c 100644 --- a/runescape-client/src/main/java/class411.java +++ b/runescape-client/src/main/java/class411.java @@ -5,9 +5,9 @@ public final class class411 { @ObfuscatedName("b") static final void method7280(long var0) { try { - Thread.sleep(var0); // L: 20 - } catch (InterruptedException var3) { // L: 22 + Thread.sleep(var0); + } catch (InterruptedException var3) { } - } // L: 23 + } } diff --git a/runescape-client/src/main/java/class412.java b/runescape-client/src/main/java/class412.java index 76ffa5772c..9cd4c5bb68 100644 --- a/runescape-client/src/main/java/class412.java +++ b/runescape-client/src/main/java/class412.java @@ -9,35 +9,35 @@ public class class412 { garbageValue = "103250498" ) public static String method7287(String var0) { - int var1 = var0.length(); // L: 156 - char[] var2 = new char[var1]; // L: 157 - byte var3 = 2; // L: 158 + int var1 = var0.length(); + char[] var2 = new char[var1]; + byte var3 = 2; - for (int var4 = 0; var4 < var1; ++var4) { // L: 159 - char var5 = var0.charAt(var4); // L: 160 - if (var3 == 0) { // L: 161 + for (int var4 = 0; var4 < var1; ++var4) { + char var5 = var0.charAt(var4); + if (var3 == 0) { var5 = Character.toLowerCase(var5); - } else if (var3 == 2 || Character.isUpperCase(var5)) { // L: 162 + } else if (var3 == 2 || Character.isUpperCase(var5)) { var5 = HealthBar.method2313(var5); } - if (Character.isLetter(var5)) { // L: 163 + if (Character.isLetter(var5)) { var3 = 0; - } else if (var5 != '.' && var5 != '?' && var5 != '!') { // L: 164 - if (Character.isSpaceChar(var5)) { // L: 165 - if (var3 != 2) { // L: 166 + } else if (var5 != '.' && var5 != '?' && var5 != '!') { + if (Character.isSpaceChar(var5)) { + if (var3 != 2) { var3 = 1; } } else { - var3 = 1; // L: 168 + var3 = 1; } } else { var3 = 2; } - var2[var4] = var5; // L: 169 + var2[var4] = var5; } - return new String(var2); // L: 171 + return new String(var2); } } diff --git a/runescape-client/src/main/java/class422.java b/runescape-client/src/main/java/class422.java index 112f9802f6..80149bc93b 100644 --- a/runescape-client/src/main/java/class422.java +++ b/runescape-client/src/main/java/class422.java @@ -47,18 +47,18 @@ public class class422 implements MouseWheel { final int field4530; static { - field4523 = new class422(5, 0); // L: 8 - field4524 = new class422(4, 2); // L: 9 - field4528 = new class422(0, 5); // L: 10 - field4526 = new class422(1, 6); // L: 11 - field4525 = new class422(2, 7); // L: 12 - field4527 = new class422(3, 8); // L: 13 + field4523 = new class422(5, 0); + field4524 = new class422(4, 2); + field4528 = new class422(0, 5); + field4526 = new class422(1, 6); + field4525 = new class422(2, 7); + field4527 = new class422(3, 8); } class422(int var1, int var2) { - this.field4529 = var1; // L: 18 - this.field4530 = var2; // L: 19 - } // L: 20 + this.field4529 = var1; + this.field4530 = var2; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -66,7 +66,7 @@ public class class422 implements MouseWheel { garbageValue = "3" ) public boolean method7605() { - return this == field4524; // L: 28 + return this == field4524; } @ObfuscatedName("b") @@ -76,6 +76,6 @@ public class class422 implements MouseWheel { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field4530; // L: 24 + return this.field4530; } } diff --git a/runescape-client/src/main/java/class426.java b/runescape-client/src/main/java/class426.java index b1a40ba881..a3d907a822 100644 --- a/runescape-client/src/main/java/class426.java +++ b/runescape-client/src/main/java/class426.java @@ -12,29 +12,29 @@ public class class426 { public Object field4537; public class426(int var1) { - this.field4539 = var1; // L: 8 - } // L: 9 + this.field4539 = var1; + } public class426(int var1, Object var2) { - this.field4539 = var1; // L: 12 - this.field4537 = var2; // L: 13 - } // L: 14 + this.field4539 = var1; + this.field4537 = var2; + } public int hashCode() { - return super.hashCode(); // L: 18 + return super.hashCode(); } public boolean equals(Object var1) { - if (!(var1 instanceof class426)) { // L: 23 + if (!(var1 instanceof class426)) { return false; } else { - class426 var2 = (class426)var1; // L: 24 - if (var2.field4537 == null && this.field4537 != null) { // L: 25 + class426 var2 = (class426)var1; + if (var2.field4537 == null && this.field4537 != null) { return false; - } else if (this.field4537 == null && var2.field4537 != null) { // L: 26 + } else if (this.field4537 == null && var2.field4537 != null) { return false; } else { - return this.field4539 == var2.field4539 && var2.field4537.equals(this.field4537); // L: 27 + return this.field4539 == var2.field4539 && var2.field4537.equals(this.field4537); } } } diff --git a/runescape-client/src/main/java/FillMode.java b/runescape-client/src/main/java/class429.java similarity index 76% rename from runescape-client/src/main/java/FillMode.java rename to runescape-client/src/main/java/class429.java index 78a019533a..d0c1d94ca3 100644 --- a/runescape-client/src/main/java/FillMode.java +++ b/runescape-client/src/main/java/class429.java @@ -1,12 +1,10 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("pg") -@Implements("FillMode") -public enum FillMode implements MouseWheel { +public enum class429 implements MouseWheel { @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "Lpg;" @@ -35,10 +33,10 @@ public enum FillMode implements MouseWheel { ) final int field4551; - FillMode(int var3, int var4) { - this.field4554 = var3; // L: 19 - this.field4551 = var4; // L: 20 - } // L: 21 + class429(int var3, int var4) { + this.field4554 = var3; + this.field4551 = var4; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -47,6 +45,6 @@ public enum FillMode implements MouseWheel { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field4551; // L: 25 + return this.field4551; } } diff --git a/runescape-client/src/main/java/class5.java b/runescape-client/src/main/java/class5.java index 8317964147..80c72585e4 100644 --- a/runescape-client/src/main/java/class5.java +++ b/runescape-client/src/main/java/class5.java @@ -13,68 +13,68 @@ public class class5 implements class2 { descriptor = "(Ln;)V" ) class5(class8 var1) { - this.field14 = this.method36(); // L: 14 - } // L: 15 + this.field14 = this.method36(); + } @ObfuscatedName("c") boolean method32(int var1, String var2, long var3) { - byte[] var5 = this.method35(var2, var3); // L: 18 - return method40(var5) >= var1; // L: 19 + byte[] var5 = this.method35(var2, var3); + return method40(var5) >= var1; } @ObfuscatedName("m") byte[] method35(String var1, long var2) { - StringBuilder var4 = new StringBuilder(); // L: 56 - var4.append(var1).append(Long.toHexString(var2)); // L: 57 - this.field14.reset(); // L: 58 + StringBuilder var4 = new StringBuilder(); + var4.append(var1).append(Long.toHexString(var2)); + this.field14.reset(); try { - this.field14.update(var4.toString().getBytes("UTF-8")); // L: 60 - } catch (UnsupportedEncodingException var6) { // L: 62 - var6.printStackTrace(); // L: 63 + this.field14.update(var4.toString().getBytes("UTF-8")); + } catch (UnsupportedEncodingException var6) { + var6.printStackTrace(); } - return this.field14.digest(); // L: 65 + return this.field14.digest(); } @ObfuscatedName("t") MessageDigest method36() { try { - return MessageDigest.getInstance("SHA-256"); // L: 70 - } catch (NoSuchAlgorithmException var2) { // L: 72 - var2.printStackTrace(); // L: 73 - return null; // L: 74 + return MessageDigest.getInstance("SHA-256"); + } catch (NoSuchAlgorithmException var2) { + var2.printStackTrace(); + return null; } } @ObfuscatedName("b") static int method40(byte[] var0) { - int var1 = 0; // L: 23 - byte[] var2 = var0; // L: 25 + int var1 = 0; + byte[] var2 = var0; - for (int var3 = 0; var3 < var2.length; ++var3) { // L: 26 - byte var4 = var2[var3]; // L: 27 - int var5 = method33(var4); // L: 29 - var1 += var5; // L: 30 - if (var5 != 8) { // L: 31 + for (int var3 = 0; var3 < var2.length; ++var3) { + byte var4 = var2[var3]; + int var5 = method33(var4); + var1 += var5; + if (var5 != 8) { break; } } - return var1; // L: 37 + return var1; } @ObfuscatedName("p") static int method33(byte var0) { - int var1 = 0; // L: 41 - if (var0 == 0) { // L: 42 - var1 = 8; // L: 43 + int var1 = 0; + if (var0 == 0) { + var1 = 8; } else { - for (int var2 = var0 & 255; (var2 & 128) == 0; var2 <<= 1) { // L: 46 47 49 - ++var1; // L: 48 + for (int var2 = var0 & 255; (var2 & 128) == 0; var2 <<= 1) { + ++var1; } } - return var1; // L: 52 + return var1; } } diff --git a/runescape-client/src/main/java/class6.java b/runescape-client/src/main/java/class6.java index fb3c85a3ac..dbc8b3f82a 100644 --- a/runescape-client/src/main/java/class6.java +++ b/runescape-client/src/main/java/class6.java @@ -30,9 +30,9 @@ public enum class6 implements MouseWheel { final int field17; class6(int var3, int var4) { - this.field16 = var3; // L: 16 - this.field17 = var4; // L: 17 - } // L: 18 + this.field16 = var3; + this.field17 = var4; + } @ObfuscatedName("b") @ObfuscatedSignature( @@ -41,7 +41,7 @@ public enum class6 implements MouseWheel { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field17; // L: 22 + return this.field17; } @ObfuscatedName("b") @@ -51,7 +51,7 @@ public enum class6 implements MouseWheel { ) @Export("SpriteBuffer_getSprite") public static SpritePixels SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { - return !class147.method3009(var0, var1, var2) ? null : class124.method2754(); // L: 42 43 + return !class147.method3009(var0, var1, var2) ? null : class124.method2754(); } @ObfuscatedName("g") @@ -60,11 +60,11 @@ public enum class6 implements MouseWheel { garbageValue = "-760591386" ) static final void method55(String var0) { - PacketBufferNode var1 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2905, Client.packetWriter.isaacCipher); // L: 183 - var1.packetBuffer.writeByte(class116.stringCp1252NullTerminatedByteSize(var0)); // L: 184 - var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 185 - Client.packetWriter.addNode(var1); // L: 186 - } // L: 187 + PacketBufferNode var1 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2905, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(class116.stringCp1252NullTerminatedByteSize(var0)); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); + } @ObfuscatedName("g") @ObfuscatedSignature( @@ -72,23 +72,23 @@ public enum class6 implements MouseWheel { garbageValue = "-1352378176" ) static int method56(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; // L: 1182 - if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { // L: 1183 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.itemId; // L: 1184 - return 1; // L: 1185 - } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { // L: 1187 - if (var3.itemId != -1) { // L: 1188 + Widget var3 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; + if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.itemId; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { + if (var3.itemId != -1) { Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.itemQuantity; } else { - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1189 + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; } - return 1; // L: 1190 - } else if (var0 == ScriptOpcodes.CC_GETID) { // L: 1192 - Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.childIndex; // L: 1193 - return 1; // L: 1194 + return 1; + } else if (var0 == ScriptOpcodes.CC_GETID) { + Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.childIndex; + return 1; } else { - return 2; // L: 1196 + return 2; } } @@ -98,61 +98,61 @@ public enum class6 implements MouseWheel { garbageValue = "124" ) static final void method50(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var8 = var6 - 334; // L: 6094 - if (var8 < 0) { // L: 6095 + int var8 = var6 - 334; + if (var8 < 0) { var8 = 0; - } else if (var8 > 100) { // L: 6096 + } else if (var8 > 100) { var8 = 100; } - int var9 = (Client.zoomWidth - Client.zoomHeight) * var8 / 100 + Client.zoomHeight; // L: 6097 - int var7 = var5 * var9 / 256; // L: 6098 - var8 = 2048 - var3 & 2047; // L: 6101 - var9 = 2048 - var4 & 2047; // L: 6102 - int var10 = 0; // L: 6103 - int var11 = 0; // L: 6104 - int var12 = var7; // L: 6105 + int var9 = (Client.zoomWidth - Client.zoomHeight) * var8 / 100 + Client.zoomHeight; + int var7 = var5 * var9 / 256; + var8 = 2048 - var3 & 2047; + var9 = 2048 - var4 & 2047; + int var10 = 0; + int var11 = 0; + int var12 = var7; int var13; int var14; int var15; - if (var8 != 0) { // L: 6106 - var13 = Rasterizer3D.Rasterizer3D_sine[var8]; // L: 6107 - var14 = Rasterizer3D.Rasterizer3D_cosine[var8]; // L: 6108 - var15 = var14 * var11 - var7 * var13 >> 16; // L: 6109 - var12 = var7 * var14 + var13 * var11 >> 16; // L: 6110 - var11 = var15; // L: 6111 + if (var8 != 0) { + var13 = Rasterizer3D.Rasterizer3D_sine[var8]; + var14 = Rasterizer3D.Rasterizer3D_cosine[var8]; + var15 = var14 * var11 - var7 * var13 >> 16; + var12 = var7 * var14 + var13 * var11 >> 16; + var11 = var15; } - if (var9 != 0) { // L: 6113 - var13 = Rasterizer3D.Rasterizer3D_sine[var9]; // L: 6114 - var14 = Rasterizer3D.Rasterizer3D_cosine[var9]; // L: 6115 - var15 = var10 * var14 + var12 * var13 >> 16; // L: 6116 - var12 = var14 * var12 - var10 * var13 >> 16; // L: 6117 - var10 = var15; // L: 6118 + if (var9 != 0) { + var13 = Rasterizer3D.Rasterizer3D_sine[var9]; + var14 = Rasterizer3D.Rasterizer3D_cosine[var9]; + var15 = var10 * var14 + var12 * var13 >> 16; + var12 = var14 * var12 - var10 * var13 >> 16; + var10 = var15; } - if (Client.isCameraLocked) { // L: 6120 - class127.field1498 = var0 - var10; // L: 6121 - class117.field1433 = var1 - var11; // L: 6122 - class33.field243 = var2 - var12; // L: 6123 - class142.field1615 = var3; // L: 6124 - ApproximateRouteStrategy.field460 = var4; // L: 6125 + if (Client.isCameraLocked) { + class127.field1498 = var0 - var10; + class117.field1433 = var1 - var11; + class33.field243 = var2 - var12; + class142.field1615 = var3; + ApproximateRouteStrategy.field460 = var4; } else { - UserComparator7.cameraX = var0 - var10; // L: 6128 - AbstractByteArrayCopier.cameraY = var1 - var11; // L: 6129 - UserComparator10.cameraZ = var2 - var12; // L: 6130 - UserComparator7.cameraPitch = var3; // L: 6131 - class379.cameraYaw = var4; // L: 6132 + UserComparator7.cameraX = var0 - var10; + AbstractByteArrayCopier.cameraY = var1 - var11; + UserComparator10.cameraZ = var2 - var12; + UserComparator7.cameraPitch = var3; + class379.cameraYaw = var4; } - if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (class7.oculusOrbFocalPointX >> 7 != class340.localPlayer.x >> 7 || Actor.oculusOrbFocalPointY >> 7 != class340.localPlayer.y >> 7)) { // L: 6134 6135 - var13 = class340.localPlayer.plane; // L: 6136 - var14 = (class7.oculusOrbFocalPointX >> 7) + class131.baseX; // L: 6137 - var15 = (Actor.oculusOrbFocalPointY >> 7) + TileItem.baseY; // L: 6138 - BuddyRankComparator.method2547(var14, var15, var13, true); // L: 6139 + if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (class7.oculusOrbFocalPointX >> 7 != class340.localPlayer.x >> 7 || Actor.oculusOrbFocalPointY >> 7 != class340.localPlayer.y >> 7)) { + var13 = class340.localPlayer.plane; + var14 = (class7.oculusOrbFocalPointX >> 7) + class131.baseX; + var15 = (Actor.oculusOrbFocalPointY >> 7) + TileItem.baseY; + BuddyRankComparator.method2547(var14, var15, var13, true); } - } // L: 6142 + } @ObfuscatedName("lh") @ObfuscatedSignature( @@ -160,18 +160,18 @@ public enum class6 implements MouseWheel { garbageValue = "-2023788755" ) static final void method48(int var0, int var1, boolean var2) { - if (Client.currentClanChannels[var0] != null) { // L: 12539 - if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method2990()) { // L: 12540 - ClanChannelMember var3 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); // L: 12541 - PacketWriter var4 = Client.packetWriter; // L: 12542 - PacketBufferNode var5 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2903, var4.isaacCipher); // L: 12543 - var5.packetBuffer.writeByte(4 + class116.stringCp1252NullTerminatedByteSize(var3.username.getName())); // L: 12544 - var5.packetBuffer.writeByte(var0); // L: 12545 - var5.packetBuffer.writeShort(var1); // L: 12546 - var5.packetBuffer.writeBoolean(var2); // L: 12547 - var5.packetBuffer.writeStringCp1252NullTerminated(var3.username.getName()); // L: 12548 - var4.addNode(var5); // L: 12549 + if (Client.currentClanChannels[var0] != null) { + if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method2990()) { + ClanChannelMember var3 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); + PacketWriter var4 = Client.packetWriter; + PacketBufferNode var5 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2903, var4.isaacCipher); + var5.packetBuffer.writeByte(4 + class116.stringCp1252NullTerminatedByteSize(var3.username.getName())); + var5.packetBuffer.writeByte(var0); + var5.packetBuffer.writeShort(var1); + var5.packetBuffer.writeBoolean(var2); + var5.packetBuffer.writeStringCp1252NullTerminated(var3.username.getName()); + var4.addNode(var5); } } - } // L: 12550 + } } diff --git a/runescape-client/src/main/java/class65.java b/runescape-client/src/main/java/class65.java index 02a1e75f06..54b360adc0 100644 --- a/runescape-client/src/main/java/class65.java +++ b/runescape-client/src/main/java/class65.java @@ -10,8 +10,8 @@ public class class65 { static final BigInteger field842; static { - field841 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); // L: 20 - field842 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); // L: 21 + field841 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); + field842 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); } @ObfuscatedName("s") @@ -20,228 +20,228 @@ public class class65 { garbageValue = "-2002121485" ) static final void method1957(PacketBuffer var0, int var1, Player var2, int var3) { - byte var4 = class185.field2119.field2121; // L: 451 + byte var4 = class185.field2119.field2121; int var5; int var6; int var8; int var9; int var12; - if ((var3 & 4) != 0) { // L: 452 - var5 = var0.readUnsignedByte(); // L: 453 + if ((var3 & 4) != 0) { + var5 = var0.readUnsignedByte(); int var7; int var10; int var16; - if (var5 > 0) { // L: 454 - for (var6 = 0; var6 < var5; ++var6) { // L: 455 - var8 = -1; // L: 457 - var9 = -1; // L: 458 - var10 = -1; // L: 459 - var7 = var0.readUShortSmart(); // L: 460 - if (var7 == 32767) { // L: 461 - var7 = var0.readUShortSmart(); // L: 462 - var9 = var0.readUShortSmart(); // L: 463 - var8 = var0.readUShortSmart(); // L: 464 - var10 = var0.readUShortSmart(); // L: 465 - } else if (var7 != 32766) { // L: 467 - var9 = var0.readUShortSmart(); // L: 468 + if (var5 > 0) { + for (var6 = 0; var6 < var5; ++var6) { + var8 = -1; + var9 = -1; + var10 = -1; + var7 = var0.readUShortSmart(); + if (var7 == 32767) { + var7 = var0.readUShortSmart(); + var9 = var0.readUShortSmart(); + var8 = var0.readUShortSmart(); + var10 = var0.readUShortSmart(); + } else if (var7 != 32766) { + var9 = var0.readUShortSmart(); } else { - var7 = -1; // L: 470 + var7 = -1; } - var16 = var0.readUShortSmart(); // L: 471 - var2.addHitSplat(var7, var9, var8, var10, Client.cycle, var16); // L: 472 + var16 = var0.readUShortSmart(); + var2.addHitSplat(var7, var9, var8, var10, Client.cycle, var16); } } - var6 = var0.method7520(); // L: 475 - if (var6 > 0) { // L: 476 - for (var7 = 0; var7 < var6; ++var7) { // L: 477 - var8 = var0.readUShortSmart(); // L: 478 - var9 = var0.readUShortSmart(); // L: 479 - if (var9 != 32767) { // L: 480 - var10 = var0.readUShortSmart(); // L: 481 - var16 = var0.method7392(); // L: 482 - var12 = var9 > 0 ? var0.method7394() : var16; // L: 483 - var2.addHealthBar(var8, Client.cycle, var9, var10, var16, var12); // L: 484 + var6 = var0.method7520(); + if (var6 > 0) { + for (var7 = 0; var7 < var6; ++var7) { + var8 = var0.readUShortSmart(); + var9 = var0.readUShortSmart(); + if (var9 != 32767) { + var10 = var0.readUShortSmart(); + var16 = var0.method7392(); + var12 = var9 > 0 ? var0.method7394() : var16; + var2.addHealthBar(var8, Client.cycle, var9, var10, var16, var12); } else { - var2.removeHealthBar(var8); // L: 486 + var2.removeHealthBar(var8); } } } } - if ((var3 & 8192) != 0) { // L: 490 - var4 = var0.readByte(); // L: 491 + if ((var3 & 8192) != 0) { + var4 = var0.readByte(); } - if ((var3 & 16384) != 0) { // L: 493 - var2.field1132 = var0.method7396(); // L: 494 - var2.field1134 = var0.method7396(); // L: 495 - var2.field1133 = var0.method7397(); // L: 496 - var2.field1135 = var0.method7397(); // L: 497 - var2.field1136 = var0.method7403() + Client.cycle; // L: 498 - var2.field1157 = var0.method7403() + Client.cycle; // L: 499 - var2.field1138 = var0.method7499(); // L: 500 - if (var2.field1055) { // L: 501 - var2.field1132 += var2.tileX; // L: 502 - var2.field1134 += var2.tileY; // L: 503 - var2.field1133 += var2.tileX; // L: 504 - var2.field1135 += var2.tileY; // L: 505 - var2.pathLength = 0; // L: 506 + if ((var3 & 16384) != 0) { + var2.field1132 = var0.method7396(); + var2.field1134 = var0.method7396(); + var2.field1133 = var0.method7397(); + var2.field1135 = var0.method7397(); + var2.field1136 = var0.method7403() + Client.cycle; + var2.field1157 = var0.method7403() + Client.cycle; + var2.field1138 = var0.method7499(); + if (var2.field1055) { + var2.field1132 += var2.tileX; + var2.field1134 += var2.tileY; + var2.field1133 += var2.tileX; + var2.field1135 += var2.tileY; + var2.pathLength = 0; } else { - var2.field1132 += var2.pathX[0]; // L: 509 - var2.field1134 += var2.pathY[0]; // L: 510 - var2.field1133 += var2.pathX[0]; // L: 511 - var2.field1135 += var2.pathY[0]; // L: 512 - var2.pathLength = 1; // L: 513 + var2.field1132 += var2.pathX[0]; + var2.field1134 += var2.pathY[0]; + var2.field1133 += var2.pathX[0]; + var2.field1135 += var2.pathY[0]; + var2.pathLength = 1; } - var2.field1098 = 0; // L: 515 + var2.field1098 = 0; } - if ((var3 & 128) != 0) { // L: 517 - var2.targetIndex = var0.method7403(); // L: 518 - if (var2.targetIndex == 65535) { // L: 519 + if ((var3 & 128) != 0) { + var2.targetIndex = var0.method7403(); + if (var2.targetIndex == 65535) { var2.targetIndex = -1; } } - if ((var3 & 1) != 0) { // L: 521 - var5 = var0.readUnsignedByte(); // L: 522 - byte[] var13 = new byte[var5]; // L: 523 - Buffer var14 = new Buffer(var13); // L: 524 - var0.method7413(var13, 0, var5); // L: 525 - Players.field1248[var1] = var14; // L: 526 - var2.read(var14); // L: 527 + if ((var3 & 1) != 0) { + var5 = var0.readUnsignedByte(); + byte[] var13 = new byte[var5]; + Buffer var14 = new Buffer(var13); + var0.method7413(var13, 0, var5); + Players.field1248[var1] = var14; + var2.read(var14); } - if ((var3 & 256) != 0) { // L: 529 - for (var5 = 0; var5 < 3; ++var5) { // L: 530 + if ((var3 & 256) != 0) { + for (var5 = 0; var5 < 3; ++var5) { var2.actions[var5] = var0.readStringCp1252NullTerminated(); } } - if ((var3 & 32) != 0) { // L: 532 - var5 = var0.readUnsignedShort(); // L: 533 - PlayerType var19 = (PlayerType)class130.findEnumerated(SpotAnimationDefinition.PlayerType_values(), var0.method7520()); // L: 534 - boolean var17 = var0.method7394() == 1; // L: 535 - var8 = var0.readUnsignedByte(); // L: 536 - var9 = var0.offset; // L: 537 - if (var2.username != null && var2.appearance != null) { // L: 538 - boolean var18 = false; // L: 539 - if (var19.isUser && GameEngine.friendSystem.isIgnored(var2.username)) { // L: 540 541 + if ((var3 & 32) != 0) { + var5 = var0.readUnsignedShort(); + PlayerType var19 = (PlayerType)class130.findEnumerated(SpotAnimationDefinition.PlayerType_values(), var0.method7520()); + boolean var17 = var0.method7394() == 1; + var8 = var0.readUnsignedByte(); + var9 = var0.offset; + if (var2.username != null && var2.appearance != null) { + boolean var18 = false; + if (var19.isUser && GameEngine.friendSystem.isIgnored(var2.username)) { var18 = true; } - if (!var18 && Client.field590 == 0 && !var2.isHidden) { // L: 543 - Players.field1257.offset = 0; // L: 544 - var0.readBytes(Players.field1257.array, 0, var8); // L: 545 - Players.field1257.offset = 0; // L: 546 - String var11 = AbstractFont.escapeBrackets(class412.method7287(SequenceDefinition.method3689(Players.field1257))); // L: 547 - var2.overheadText = var11.trim(); // L: 548 - var2.overheadTextColor = var5 >> 8; // L: 549 - var2.overheadTextEffect = var5 & 255; // L: 550 - var2.overheadTextCyclesRemaining = 150; // L: 551 - var2.isAutoChatting = var17; // L: 552 - var2.field1114 = var2 != class340.localPlayer && var19.isUser && "" != Client.field645 && var11.toLowerCase().indexOf(Client.field645) == -1; // L: 553 - if (var19.isPrivileged) { // L: 555 + if (!var18 && Client.field590 == 0 && !var2.isHidden) { + Players.field1257.offset = 0; + var0.readBytes(Players.field1257.array, 0, var8); + Players.field1257.offset = 0; + String var11 = AbstractFont.escapeBrackets(class412.method7287(SequenceDefinition.method3689(Players.field1257))); + var2.overheadText = var11.trim(); + var2.overheadTextColor = var5 >> 8; + var2.overheadTextEffect = var5 & 255; + var2.overheadTextCyclesRemaining = 150; + var2.isAutoChatting = var17; + var2.field1114 = var2 != class340.localPlayer && var19.isUser && "" != Client.field645 && var11.toLowerCase().indexOf(Client.field645) == -1; + if (var19.isPrivileged) { var12 = var17 ? 91 : 1; } else { - var12 = var17 ? 90 : 2; // L: 556 + var12 = var17 ? 90 : 2; } - if (var19.modIcon != -1) { // L: 557 + if (var19.modIcon != -1) { class194.addGameMessage(var12, class221.method4705(var19.modIcon) + var2.username.getName(), var11); } else { - class194.addGameMessage(var12, var2.username.getName(), var11); // L: 558 + class194.addGameMessage(var12, var2.username.getName(), var11); } } } - var0.offset = var9 + var8; // L: 561 + var0.offset = var9 + var8; } - if ((var3 & 2) != 0) { // L: 563 - var5 = var0.method7499(); // L: 564 - if (var5 == 65535) { // L: 565 + if ((var3 & 2) != 0) { + var5 = var0.method7499(); + if (var5 == 65535) { var5 = -1; } - var6 = var0.method7520(); // L: 566 - class125.performPlayerAnimation(var2, var5, var6); // L: 567 + var6 = var0.method7520(); + class125.performPlayerAnimation(var2, var5, var6); } - if ((var3 & 1024) != 0) { // L: 569 - class185[] var15 = Players.field1246; // L: 570 - class185[] var21 = new class185[]{class185.field2120, class185.field2123, class185.field2122, class185.field2119}; // L: 574 - var15[var1] = (class185)class130.findEnumerated(var21, var0.method7465()); // L: 576 + if ((var3 & 1024) != 0) { + class185[] var15 = Players.field1246; + class185[] var21 = new class185[]{class185.field2120, class185.field2123, class185.field2122, class185.field2119}; + var15[var1] = (class185)class130.findEnumerated(var21, var0.method7465()); } - if ((var3 & 2048) != 0) { // L: 578 - var2.spotAnimation = var0.method7499(); // L: 579 - var5 = var0.method7412(); // L: 580 - var2.field1131 = var5 >> 16; // L: 581 - var2.field1130 = (var5 & 65535) + Client.cycle; // L: 582 - var2.spotAnimationFrame = 0; // L: 583 - var2.spotAnimationFrameCycle = 0; // L: 584 - if (var2.field1130 > Client.cycle) { // L: 585 + if ((var3 & 2048) != 0) { + var2.spotAnimation = var0.method7499(); + var5 = var0.method7412(); + var2.field1131 = var5 >> 16; + var2.field1130 = (var5 & 65535) + Client.cycle; + var2.spotAnimationFrame = 0; + var2.spotAnimationFrameCycle = 0; + if (var2.field1130 > Client.cycle) { var2.spotAnimationFrame = -1; } - if (var2.spotAnimation == 65535) { // L: 586 + if (var2.spotAnimation == 65535) { var2.spotAnimation = -1; } } - if ((var3 & 512) != 0) { // L: 588 - var2.field1141 = Client.cycle + var0.method7403(); // L: 589 - var2.field1140 = Client.cycle + var0.method7499(); // L: 590 - var2.field1143 = var0.readByte(); // L: 591 - var2.field1144 = var0.method7397(); // L: 592 - var2.field1095 = var0.readByte(); // L: 593 - var2.field1146 = (byte)var0.readUnsignedByte(); // L: 594 + if ((var3 & 512) != 0) { + var2.field1141 = Client.cycle + var0.method7403(); + var2.field1140 = Client.cycle + var0.method7499(); + var2.field1143 = var0.readByte(); + var2.field1144 = var0.method7397(); + var2.field1095 = var0.readByte(); + var2.field1146 = (byte)var0.readUnsignedByte(); } - if ((var3 & 64) != 0) { // L: 596 - var2.field1122 = var0.method7401(); // L: 597 - if (var2.pathLength == 0) { // L: 598 - var2.orientation = var2.field1122; // L: 599 - var2.field1122 = -1; // L: 600 + if ((var3 & 64) != 0) { + var2.field1122 = var0.method7401(); + if (var2.pathLength == 0) { + var2.orientation = var2.field1122; + var2.field1122 = -1; } } - 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 - class194.addGameMessage(2, var2.username.getName(), var2.overheadText); // L: 607 - } else if (var2 == class340.localPlayer) { // L: 609 - class194.addGameMessage(2, var2.username.getName(), var2.overheadText); // L: 610 + if ((var3 & 8) != 0) { + var2.overheadText = var0.readStringCp1252NullTerminated(); + if (var2.overheadText.charAt(0) == '~') { + var2.overheadText = var2.overheadText.substring(1); + class194.addGameMessage(2, var2.username.getName(), var2.overheadText); + } else if (var2 == class340.localPlayer) { + class194.addGameMessage(2, var2.username.getName(), var2.overheadText); } - var2.isAutoChatting = false; // L: 612 - var2.overheadTextColor = 0; // L: 613 - var2.overheadTextEffect = 0; // L: 614 - var2.overheadTextCyclesRemaining = 150; // L: 615 + var2.isAutoChatting = false; + var2.overheadTextColor = 0; + var2.overheadTextEffect = 0; + var2.overheadTextCyclesRemaining = 150; } - if (var2.field1055) { // L: 617 - if (var4 == 127) { // L: 618 + if (var2.field1055) { + if (var4 == 127) { var2.resetPath(var2.tileX, var2.tileY); } else { class185 var22; - if (var4 != class185.field2119.field2121) { // L: 621 - class185[] var20 = new class185[]{class185.field2120, class185.field2123, class185.field2122, class185.field2119}; // L: 624 - var22 = (class185)class130.findEnumerated(var20, var4); // L: 626 + if (var4 != class185.field2119.field2121) { + class185[] var20 = new class185[]{class185.field2120, class185.field2123, class185.field2122, class185.field2119}; + var22 = (class185)class130.findEnumerated(var20, var4); } else { - var22 = Players.field1246[var1]; // L: 628 + var22 = Players.field1246[var1]; } - var2.method2175(var2.tileX, var2.tileY, var22); // L: 629 + var2.method2175(var2.tileX, var2.tileY, var22); } } - } // L: 633 + } @ObfuscatedName("fx") @ObfuscatedSignature( @@ -249,18 +249,18 @@ public class class65 { garbageValue = "843672691" ) static final void method1958() { - if (SoundSystem.ClanChat_inClanChat) { // L: 4368 - if (Players.friendsChat != null) { // L: 4369 - Players.friendsChat.sort(); // L: 4370 + if (SoundSystem.ClanChat_inClanChat) { + if (Players.friendsChat != null) { + Players.friendsChat.sort(); } - for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 4373 - Player var1 = Client.players[Players.Players_indices[var0]]; // L: 4374 - var1.clearIsInFriendsChat(); // L: 4375 + for (int var0 = 0; var0 < Players.Players_count; ++var0) { + Player var1 = Client.players[Players.Players_indices[var0]]; + var1.clearIsInFriendsChat(); } - SoundSystem.ClanChat_inClanChat = false; // L: 4378 + SoundSystem.ClanChat_inClanChat = false; } - } // L: 4380 + } } diff --git a/runescape-client/src/main/java/class67.java b/runescape-client/src/main/java/class67.java index 300400df60..383f530442 100644 --- a/runescape-client/src/main/java/class67.java +++ b/runescape-client/src/main/java/class67.java @@ -11,8 +11,8 @@ public class class67 { static final BigInteger field857; static { - field856 = new BigInteger("10001", 16); // L: 6 - field857 = new BigInteger("959194ea8a966b960e862427e497e246718ecc7e76f242845673d52b62df19f52fa6fb93c8d9c5129b95747f8ca61fb059fa44297c08c6f5cc6cca99e8d39fc8f0faa58e58d1ca99e861439d01158c14880260b09ace07d25862f6d14e2db785c3016567101e927e4b2513e0b8a0f275ccf60c6a689af387a64b2b82a313d8dd", 16); // L: 7 + field856 = new BigInteger("10001", 16); + field857 = new BigInteger("959194ea8a966b960e862427e497e246718ecc7e76f242845673d52b62df19f52fa6fb93c8d9c5129b95747f8ca61fb059fa44297c08c6f5cc6cca99e8d39fc8f0faa58e58d1ca99e861439d01158c14880260b09ace07d25862f6d14e2db785c3016567101e927e4b2513e0b8a0f275ccf60c6a689af387a64b2b82a313d8dd", 16); } @ObfuscatedName("j") @@ -22,17 +22,17 @@ public class class67 { ) @Export("Login_promptCredentials") static void Login_promptCredentials(boolean var0) { - Login.Login_response1 = ""; // L: 1037 - Login.Login_response2 = "Enter your username/email & password."; // L: 1038 - Login.Login_response3 = ""; // L: 1039 - PlayerType.method5521(2); // L: 1040 - if (var0) { // L: 1041 + Login.Login_response1 = ""; + Login.Login_response2 = "Enter your username/email & password."; + Login.Login_response3 = ""; + PlayerType.method5521(2); + if (var0) { Login.Login_password = ""; } - HealthBar.method2311(); // L: 1042 - WorldMapID.method4805(); // L: 1043 - } // L: 1044 + HealthBar.method2311(); + WorldMapID.method4805(); + } @ObfuscatedName("af") @ObfuscatedSignature( @@ -40,6 +40,6 @@ public class class67 { garbageValue = "-67" ) static int method1962(int var0) { - return (int)((Math.log((double)var0) / Interpreter.field814 - 7.0D) * 256.0D); // L: 3631 + return (int)((Math.log((double)var0) / Interpreter.field814 - 7.0D) * 256.0D); } } diff --git a/runescape-client/src/main/java/class7.java b/runescape-client/src/main/java/class7.java index babd0b9a24..1eef307577 100644 --- a/runescape-client/src/main/java/class7.java +++ b/runescape-client/src/main/java/class7.java @@ -39,11 +39,11 @@ public class class7 { descriptor = "(Lpi;Lm;)V" ) public class7(Buffer var1, class3 var2) { - this.field30 = Executors.newSingleThreadExecutor(); // L: 10 - this.field25 = var1; // L: 16 - this.field26 = var2; // L: 17 - this.method62(); // L: 18 - } // L: 19 + this.field30 = Executors.newSingleThreadExecutor(); + this.field25 = var1; + this.field26 = var2; + this.method62(); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -51,7 +51,7 @@ public class class7 { garbageValue = "-1426679915" ) public boolean method61() { - return this.field31.isDone(); // L: 22 + return this.field31.isDone(); } @ObfuscatedName("b") @@ -60,9 +60,9 @@ public class class7 { garbageValue = "-1411495708" ) public void method65() { - this.field30.shutdown(); // L: 26 - this.field30 = null; // L: 27 - } // L: 28 + this.field30.shutdown(); + this.field30 = null; + } @ObfuscatedName("p") @ObfuscatedSignature( @@ -71,9 +71,9 @@ public class class7 { ) public Buffer method75() { try { - return (Buffer)this.field31.get(); // L: 32 - } catch (Exception var2) { // L: 34 - return null; // L: 35 + return (Buffer)this.field31.get(); + } catch (Exception var2) { + return null; } } @@ -83,8 +83,8 @@ public class class7 { garbageValue = "1868135636" ) void method62() { - this.field31 = this.field30.submit(new class1(this, this.field25, this.field26)); // L: 40 - } // L: 41 + this.field31 = this.field30.submit(new class1(this, this.field25, this.field26)); + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -92,7 +92,7 @@ public class class7 { garbageValue = "1979711764" ) static class117[] method74() { - return new class117[]{class117.field1425, class117.field1444, class117.field1430, class117.field1427, class117.field1428, class117.field1429, class117.field1442, class117.field1431, class117.field1432, class117.field1424, class117.field1434, class117.field1435, class117.field1436, class117.field1437, class117.field1438, class117.field1439, class117.field1440}; // L: 68 + return new class117[]{class117.field1425, class117.field1444, class117.field1430, class117.field1427, class117.field1428, class117.field1429, class117.field1442, class117.field1431, class117.field1432, class117.field1424, class117.field1434, class117.field1435, class117.field1436, class117.field1437, class117.field1438, class117.field1439, class117.field1440}; } @ObfuscatedName("jw") @@ -101,19 +101,19 @@ public class class7 { garbageValue = "1826034348" ) static String method60(String var0, Widget var1) { - if (var0.indexOf("%") != -1) { // L: 10882 - for (int var2 = 1; var2 <= 5; ++var2) { // L: 10883 + if (var0.indexOf("%") != -1) { + for (int var2 = 1; var2 <= 5; ++var2) { while (true) { - int var3 = var0.indexOf("%" + var2); // L: 10885 - if (var3 == -1) { // L: 10886 + int var3 = var0.indexOf("%" + var2); + if (var3 == -1) { break; } - var0 = var0.substring(0, var3) + class1.method11(class28.method442(var1, var2 - 1)) + var0.substring(var3 + 2); // L: 10887 + var0 = var0.substring(0, var3) + class1.method11(class28.method442(var1, var2 - 1)) + var0.substring(var3 + 2); } } } - return var0; // L: 10891 + return var0; } } diff --git a/runescape-client/src/main/java/class78.java b/runescape-client/src/main/java/class78.java index 850330c247..b6dce37140 100644 --- a/runescape-client/src/main/java/class78.java +++ b/runescape-client/src/main/java/class78.java @@ -18,7 +18,7 @@ public class class78 { ) @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: 44 45 + return var0 >= 0 && var0 < WorldMapElement.WorldMapElement_cached.length && WorldMapElement.WorldMapElement_cached[var0] != null ? WorldMapElement.WorldMapElement_cached[var0] : new WorldMapElement(var0); } @ObfuscatedName("c") @@ -28,18 +28,18 @@ public class class78 { ) @Export("getInvDefinition") public static InvDefinition getInvDefinition(int var0) { - InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); // L: 17 - if (var1 != null) { // L: 18 + InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); + if (var1 != null) { return var1; } else { - byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); // L: 19 - var1 = new InvDefinition(); // L: 20 - if (var2 != null) { // L: 21 + byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); + var1 = new InvDefinition(); + if (var2 != null) { var1.decode(new Buffer(var2)); } - InvDefinition.InvDefinition_cached.put(var1, (long)var0); // L: 22 - return var1; // L: 23 + InvDefinition.InvDefinition_cached.put(var1, (long)var0); + return var1; } } @@ -49,12 +49,12 @@ public class class78 { garbageValue = "21" ) public static int[] method2140() { - int[] var0 = new int[KeyHandler.field140]; // L: 251 + int[] var0 = new int[KeyHandler.field140]; - for (int var1 = 0; var1 < KeyHandler.field140; ++var1) { // L: 252 - var0[var1] = KeyHandler.field139[var1]; // L: 253 + for (int var1 = 0; var1 < KeyHandler.field140; ++var1) { + var0[var1] = KeyHandler.field139[var1]; } - return var0; // L: 255 + return var0; } } diff --git a/runescape-client/src/main/java/class8.java b/runescape-client/src/main/java/class8.java index dd5524db18..495fef44e8 100644 --- a/runescape-client/src/main/java/class8.java +++ b/runescape-client/src/main/java/class8.java @@ -14,22 +14,22 @@ public class class8 { descriptor = "(Lpi;)V" ) class8(Buffer var1) { - this(var1.readUnsignedByte(), var1.readUnsignedByte(), var1.readStringCp1252NullTerminated()); // L: 19 - } // L: 20 + this(var1.readUnsignedByte(), var1.readUnsignedByte(), var1.readStringCp1252NullTerminated()); + } class8(int var1, int var2, String var3) { - this.field33 = var1; // L: 13 - this.field32 = var2; // L: 14 - this.field34 = var3; // L: 15 - } // L: 16 + this.field33 = var1; + this.field32 = var2; + this.field34 = var3; + } @ObfuscatedName("c") String method76() { - return Integer.toHexString(this.field33) + Integer.toHexString(this.field32) + this.field34; // L: 23 + return Integer.toHexString(this.field33) + Integer.toHexString(this.field32) + this.field34; } @ObfuscatedName("b") int method78() { - return this.field32; // L: 27 + return this.field32; } } diff --git a/runescape-client/src/main/java/class87.java b/runescape-client/src/main/java/class87.java index f530f55fdf..b965b404ea 100644 --- a/runescape-client/src/main/java/class87.java +++ b/runescape-client/src/main/java/class87.java @@ -24,6 +24,6 @@ public class class87 { garbageValue = "-2105253553" ) static class121[] method2281() { - return new class121[]{class121.field1465, class121.field1461, class121.field1459, class121.field1462, class121.field1463, class121.field1464, class121.field1469, class121.field1466, class121.field1467}; // L: 101 + return new class121[]{class121.field1465, class121.field1461, class121.field1459, class121.field1462, class121.field1463, class121.field1464, class121.field1469, class121.field1466, class121.field1467}; } } diff --git a/runescape-client/src/main/java/class9.java b/runescape-client/src/main/java/class9.java index 67785f4cd1..0c1bbcdc52 100644 --- a/runescape-client/src/main/java/class9.java +++ b/runescape-client/src/main/java/class9.java @@ -49,19 +49,19 @@ public class class9 implements MouseWheel { boolean field43; static { - field37 = new class9(0, "POST", true, true); // L: 6 - field36 = new class9(1, "GET", true, false); // L: 7 - field44 = new class9(2, "PUT", false, true); // L: 8 - field38 = new class9(3, "PATCH", false, true); // L: 9 - field39 = new class9(4, "DELETE", false, true); // L: 10 + field37 = new class9(0, "POST", true, true); + field36 = new class9(1, "GET", true, false); + field44 = new class9(2, "PUT", false, true); + field38 = new class9(3, "PATCH", false, true); + field39 = new class9(4, "DELETE", false, true); } class9(int var1, String var2, boolean var3, boolean var4) { - this.field45 = var1; // L: 17 - this.field35 = var2; // L: 18 - this.field42 = var3; // L: 19 - this.field43 = var4; // L: 20 - } // L: 21 + this.field45 = var1; + this.field35 = var2; + this.field42 = var3; + this.field43 = var4; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -69,7 +69,7 @@ public class class9 implements MouseWheel { garbageValue = "17" ) boolean method85() { - return this.field42; // L: 24 + return this.field42; } @ObfuscatedName("b") @@ -79,7 +79,7 @@ public class class9 implements MouseWheel { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field45; // L: 37 + return this.field45; } @ObfuscatedName("p") @@ -88,7 +88,7 @@ public class class9 implements MouseWheel { garbageValue = "1278274271" ) String method100() { - return this.field35; // L: 28 + return this.field35; } @ObfuscatedName("w") @@ -97,7 +97,7 @@ public class class9 implements MouseWheel { garbageValue = "-1849660708" ) boolean method86() { - return this.field43; // L: 32 + return this.field43; } @ObfuscatedName("gz") @@ -106,9 +106,9 @@ public class class9 implements MouseWheel { garbageValue = "29" ) static void method88() { - if (Client.renderSelf) { // L: 5441 - Buddy.addPlayerToScene(class340.localPlayer, false); // L: 5442 + if (Client.renderSelf) { + Buddy.addPlayerToScene(class340.localPlayer, false); } - } // L: 5444 + } } diff --git a/runescape-client/src/main/java/class91.java b/runescape-client/src/main/java/class91.java index 7bb04d106e..2da463c22e 100644 --- a/runescape-client/src/main/java/class91.java +++ b/runescape-client/src/main/java/class91.java @@ -25,39 +25,39 @@ public class class91 { ) public static void method2336() { try { - if (class260.musicPlayerStatus == 1) { // L: 68 - int var0 = class260.midiPcmStream.method5073(); // L: 69 - if (var0 > 0 && class260.midiPcmStream.isReady()) { // L: 70 - var0 -= class260.pcmSampleLength; // L: 71 - if (var0 < 0) { // L: 72 + if (class260.musicPlayerStatus == 1) { + int var0 = class260.midiPcmStream.method5073(); + if (var0 > 0 && class260.midiPcmStream.isReady()) { + var0 -= class260.pcmSampleLength; + if (var0 < 0) { var0 = 0; } - class260.midiPcmStream.setPcmStreamVolume(var0); // L: 73 - return; // L: 74 + class260.midiPcmStream.setPcmStreamVolume(var0); + return; } - class260.midiPcmStream.clear(); // L: 76 - class260.midiPcmStream.removeAll(); // L: 77 - if (class124.musicTrackArchive != null) { // L: 78 + class260.midiPcmStream.clear(); + class260.midiPcmStream.removeAll(); + if (class124.musicTrackArchive != null) { class260.musicPlayerStatus = 2; } else { - class260.musicPlayerStatus = 0; // L: 79 + class260.musicPlayerStatus = 0; } - class21.musicTrack = null; // L: 80 - class257.soundCache = null; // L: 81 + class21.musicTrack = null; + class257.soundCache = null; } - } catch (Exception var2) { // L: 84 - var2.printStackTrace(); // L: 85 - class260.midiPcmStream.clear(); // L: 86 - class260.musicPlayerStatus = 0; // L: 87 - class21.musicTrack = null; // L: 88 - class257.soundCache = null; // L: 89 - class124.musicTrackArchive = null; // L: 90 + } catch (Exception var2) { + var2.printStackTrace(); + class260.midiPcmStream.clear(); + class260.musicPlayerStatus = 0; + class21.musicTrack = null; + class257.soundCache = null; + class124.musicTrackArchive = null; } - } // L: 92 + } @ObfuscatedName("d") @ObfuscatedSignature( @@ -65,7 +65,7 @@ public class class91 { garbageValue = "1433534225" ) static final int method2332() { - return ViewportMouse.ViewportMouse_x; // L: 104 + return ViewportMouse.ViewportMouse_x; } @ObfuscatedName("gv") @@ -74,29 +74,29 @@ public class class91 { garbageValue = "848366237" ) static final void method2337() { - int[] var0 = Players.Players_indices; // L: 4484 + int[] var0 = Players.Players_indices; int var1; - for (var1 = 0; var1 < Players.Players_count; ++var1) { // L: 4485 - Player var4 = Client.players[var0[var1]]; // L: 4486 - if (var4 != null && var4.overheadTextCyclesRemaining > 0) { // L: 4487 - --var4.overheadTextCyclesRemaining; // L: 4488 - if (var4.overheadTextCyclesRemaining == 0) { // L: 4489 + for (var1 = 0; var1 < Players.Players_count; ++var1) { + Player var4 = Client.players[var0[var1]]; + if (var4 != null && var4.overheadTextCyclesRemaining > 0) { + --var4.overheadTextCyclesRemaining; + if (var4.overheadTextCyclesRemaining == 0) { var4.overheadText = null; } } } - for (var1 = 0; var1 < Client.npcCount; ++var1) { // L: 4492 - int var2 = Client.npcIndices[var1]; // L: 4493 - NPC var3 = Client.npcs[var2]; // L: 4494 - if (var3 != null && var3.overheadTextCyclesRemaining > 0) { // L: 4495 - --var3.overheadTextCyclesRemaining; // L: 4496 - if (var3.overheadTextCyclesRemaining == 0) { // L: 4497 + for (var1 = 0; var1 < Client.npcCount; ++var1) { + int var2 = Client.npcIndices[var1]; + NPC var3 = Client.npcs[var2]; + if (var3 != null && var3.overheadTextCyclesRemaining > 0) { + --var3.overheadTextCyclesRemaining; + if (var3.overheadTextCyclesRemaining == 0) { var3.overheadText = null; } } } - } // L: 4500 + } } diff --git a/runescape-client/src/main/java/class92.java b/runescape-client/src/main/java/class92.java index 6b032b70bd..a7bf8c4551 100644 --- a/runescape-client/src/main/java/class92.java +++ b/runescape-client/src/main/java/class92.java @@ -27,11 +27,11 @@ public class class92 { int field1225; class92(int var1, int var2, int var3, int var4) { - this.field1228 = var1; // L: 10 - this.field1226 = var2; // L: 11 - this.field1227 = var3; // L: 12 - this.field1225 = var4; // L: 13 - } // L: 14 + this.field1228 = var1; + this.field1226 = var2; + this.field1227 = var3; + this.field1225 = var4; + } @ObfuscatedName("c") @ObfuscatedSignature( @@ -39,7 +39,7 @@ public class class92 { garbageValue = "-1997278841" ) int method2340() { - return this.field1228; // L: 17 + return this.field1228; } @ObfuscatedName("b") @@ -48,7 +48,7 @@ public class class92 { garbageValue = "953113161" ) int method2339() { - return this.field1226; // L: 21 + return this.field1226; } @ObfuscatedName("p") @@ -57,7 +57,7 @@ public class class92 { garbageValue = "100" ) int method2341() { - return this.field1227; // L: 25 + return this.field1227; } @ObfuscatedName("m") @@ -66,7 +66,7 @@ public class class92 { garbageValue = "-97" ) int method2348() { - return this.field1225; // L: 29 + return this.field1225; } @ObfuscatedName("m") @@ -75,12 +75,12 @@ public class class92 { garbageValue = "-1922947006" ) public static String method2353(CharSequence var0) { - String var1 = GraphicsDefaults.base37DecodeLong(ChatChannel.method2054(var0)); // L: 75 - if (var1 == null) { // L: 76 + String var1 = GraphicsDefaults.base37DecodeLong(ChatChannel.method2054(var0)); + if (var1 == null) { var1 = ""; } - return var1; // L: 77 + return var1; } @ObfuscatedName("jx") @@ -90,32 +90,32 @@ public class class92 { ) @Export("resizeInterface") static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) { - for (int var5 = 0; var5 < var0.length; ++var5) { // L: 10940 - Widget var6 = var0[var5]; // L: 10941 - if (var6 != null && var6.parentId == var1) { // L: 10942 10943 - class29.alignWidgetSize(var6, var2, var3, var4); // L: 10944 - MouseHandler.alignWidgetPosition(var6, var2, var3); // L: 10945 - if (var6.scrollX > var6.scrollWidth - var6.width) { // L: 10946 + for (int var5 = 0; var5 < var0.length; ++var5) { + Widget var6 = var0[var5]; + if (var6 != null && var6.parentId == var1) { + class29.alignWidgetSize(var6, var2, var3, var4); + MouseHandler.alignWidgetPosition(var6, var2, var3); + if (var6.scrollX > var6.scrollWidth - var6.width) { var6.scrollX = var6.scrollWidth - var6.width; } - if (var6.scrollX < 0) { // L: 10947 + if (var6.scrollX < 0) { var6.scrollX = 0; } - if (var6.scrollY > var6.scrollHeight - var6.height) { // L: 10948 + if (var6.scrollY > var6.scrollHeight - var6.height) { var6.scrollY = var6.scrollHeight - var6.height; } - if (var6.scrollY < 0) { // L: 10949 + if (var6.scrollY < 0) { var6.scrollY = 0; } - if (var6.type == 0) { // L: 10950 + if (var6.type == 0) { class115.revalidateWidgetScroll(var0, var6, var4); } } } - } // L: 10952 + } }